feat: add terminal access in multi select roles i

arunjaindev · arunjaindev · commit 80bf204ee3da · 2024-10-10T19:04:37.000+05:30
n devtron and helm apps
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.5.0",
+        "@devtron-labs/devtron-fe-common-lib": "0.5.0-beta-2",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissionDetail.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissionDetail.tsx
@@ -15,8 +15,8 @@
  */
 
 /* eslint-disable jsx-a11y/label-has-associated-control */
+import { ACCESS_TYPE_MAP } from '@devtron-labs/devtron-fe-common-lib'
 import { ReactComponent as AddIcon } from '../../../../../../assets/icons/ic-add.svg'
-import { ACCESS_TYPE_MAP } from '../../../../../../config'
 import { usePermissionConfiguration } from '../PermissionConfigurationForm'
 import DirectPermission from './DirectPermission'
 import { getPermissionDetailRowClass } from './utils'
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissions.component.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissions.component.tsx
@@ -25,9 +25,10 @@ import {
     TabGroup,
     useAsync,
     useMainContext,
+    ACCESS_TYPE_MAP,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { EntityTypes, ActionTypes } from '../../../constants'
-import { ACCESS_TYPE_MAP, HELM_APP_UNASSIGNED_PROJECT, SELECT_ALL_VALUE, SERVER_MODE } from '../../../../../../config'
+import { HELM_APP_UNASSIGNED_PROJECT, SELECT_ALL_VALUE, SERVER_MODE } from '../../../../../../config'
 import { importComponentFromFELibrary, mapByKey } from '../../../../../../components/common'
 import K8sPermissions from '../K8sObjectPermissions/K8sPermissions.component'
 import { apiGroupAll } from '../K8sObjectPermissions/utils'
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/DirectPermission.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/DirectPermission.tsx
@@ -23,12 +23,13 @@ import {
     getIsRequestAborted,
     LoadingIndicator,
     ReactSelectInputAction,
+    ACCESS_TYPE_MAP,
 } from '@devtron-labs/devtron-fe-common-lib'
 import Select, { components } from 'react-select'
 import Tippy from '@tippyjs/react'
 import { sortBySelected, importComponentFromFELibrary } from '../../../../../../components/common'
 import { getAllWorkflowsForAppNames } from '../../../../../../services/service'
-import { ACCESS_TYPE_MAP, HELM_APP_UNASSIGNED_PROJECT, SELECT_ALL_VALUE } from '../../../../../../config'
+import { HELM_APP_UNASSIGNED_PROJECT, SELECT_ALL_VALUE } from '../../../../../../config'
 import { ReactComponent as TrashIcon } from '../../../../../../assets/icons/ic-delete-interactive.svg'
 import { GroupHeading, Option as singleOption } from '../../../../../../components/v2/common/ReactSelect.utils'
 import { useAuthorizationContext } from '../../../AuthorizationProvider'
@@ -37,6 +38,7 @@ import {
     authorizationSelectStyles,
     EntityTypes,
     ARTIFACT_PROMOTER_ACTION,
+    TERMINAL_EXEC_ACTION,
 } from '../../../constants'
 import { AppOption, ClusterValueContainer, ProjectValueContainer, ValueContainer, WorkflowGroupHeading } from './common'
 import {
@@ -80,6 +82,7 @@ const DirectPermission = ({
     const multiRole = permission.action.value.split(',')
     const doesConfigApproverRoleExist = multiRole.includes(CONFIG_APPROVER_ACTION.value)
     const doesArtifactPromoterRoleExist = multiRole.includes(ARTIFACT_PROMOTER_ACTION.value)
+    const doesTerminalAccessRoleExist = multiRole.includes(TERMINAL_EXEC_ACTION.value)
 
     const primaryActionRoleIndex = getPrimaryRoleIndex(multiRole, [
         CONFIG_APPROVER_ACTION.value,
@@ -91,6 +94,7 @@ const DirectPermission = ({
         value: multiRole[primaryActionRoleIndex],
         configApprover: doesConfigApproverRoleExist || permission.action.configApprover,
         artifactPromoter: doesArtifactPromoterRoleExist || permission.action.artifactPromoter,
+        terminalExec: doesTerminalAccessRoleExist || permission.action.terminalExec,
     }
 
     const [openMenu, setOpenMenu] = useState<DirectPermissionFieldName | ''>('')
@@ -131,6 +135,9 @@ const DirectPermission = ({
         }
     }
 
+    const getSelectedRolesDisplay = (selectedPermissions: string[]) =>
+        selectedPermissions.filter((selectedVal) => !!selectedVal).join(', ')
+
     const metaRolesForAccessType = _getMetaRolesForAccessType()
     const listForAccessType = getListForAccessType(permission.accessType)
 
@@ -175,10 +182,18 @@ const DirectPermission = ({
                     ...props,
                 }}
             >
-                {value === SELECT_ALL_VALUE ? 'Admin' : metaRolesForAccessType[value].value}
-                {ApproverPermission &&
-                    (permission.approver || primaryActionRole.configApprover || primaryActionRole.artifactPromoter) &&
-                    ', Approver'}
+                {getSelectedRolesDisplay([
+                    value === SELECT_ALL_VALUE ? 'Admin' : metaRolesForAccessType[value].value,
+                    ...(ApproverPermission
+                        ? [
+                              (permission.approver ||
+                                  primaryActionRole.configApprover ||
+                                  primaryActionRole.artifactPromoter) &&
+                                  'Approver',
+                              primaryActionRole.terminalExec && 'Terminal',
+                          ]
+                        : []),
+                ])}
                 {React.cloneElement(children[1])}
             </components.ValueContainer>
         )
@@ -195,19 +210,23 @@ const DirectPermission = ({
     const RoleMenuList = (props) => (
         <components.MenuList {...props}>
             {props.children}
-            {ApproverPermission && permission.accessType === ACCESS_TYPE_MAP.DEVTRON_APPS && (
-                <ApproverPermission
-                    optionProps={props}
-                    approver={permission.approver}
-                    configApprover={primaryActionRole.configApprover}
-                    artifactPromoter={primaryActionRole.artifactPromoter}
-                    handleDirectPermissionChange={(...rest) => {
-                        props.selectOption(props.selectProps.value)
-                        handleDirectPermissionChange(...rest)
-                    }}
-                    formatOptionLabel={formatOptionLabel}
-                />
-            )}
+            {ApproverPermission &&
+                (permission.accessType === ACCESS_TYPE_MAP.DEVTRON_APPS ||
+                    permission.accessType === ACCESS_TYPE_MAP.HELM_APPS) && (
+                    <ApproverPermission
+                        optionProps={props}
+                        approver={permission.approver}
+                        configApprover={primaryActionRole.configApprover}
+                        artifactPromoter={primaryActionRole.artifactPromoter}
+                        terminalExec={primaryActionRole.terminalExec}
+                        handleDirectPermissionChange={(...rest) => {
+                            props.selectOption(props.selectProps.value)
+                            handleDirectPermissionChange(...rest)
+                        }}
+                        formatOptionLabel={formatOptionLabel}
+                        accessType={permission.accessType}
+                    />
+                )}
         </components.MenuList>
     )
 
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/constants.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/constants.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { ACCESS_TYPE_MAP, SELECT_ALL_VALUE } from '../../../../../../config'
+import { ACCESS_TYPE_MAP } from '@devtron-labs/devtron-fe-common-lib'
+import { SELECT_ALL_VALUE } from '../../../../../../config'
 import { ActionTypes, authorizationSelectStyles, EntityTypes } from '../../../constants'
 import { getDefaultStatusAndTimeout } from '../../../libUtils'
 import { DirectPermissionsRoleFilter } from '../../../types'
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/types.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/types.ts
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-import { ServerError } from '@devtron-labs/devtron-fe-common-lib'
+import { ServerError, ACCESS_TYPE_MAP } from '@devtron-labs/devtron-fe-common-lib'
 import { JobList } from '../../../../../../components/Jobs/Types'
-import { ACCESS_TYPE_MAP } from '../../../../../../config'
 import { DirectPermissionsRoleFilter } from '../../../types'
 
 type AppsList = Map<number, { loading: boolean; result: { id: number; name: string }[]; error: ServerError }>
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/utils.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/utils.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { OptionType } from '@devtron-labs/devtron-fe-common-lib'
+import { OptionType, ACCESS_TYPE_MAP } from '@devtron-labs/devtron-fe-common-lib'
 import { DEFAULT_ENV } from '../../../../../../components/app/details/triggerView/Constants'
 import { createClusterEnvGroup } from '../../../../../../components/common'
-import { ACCESS_TYPE_MAP, SELECT_ALL_VALUE, SERVER_MODE } from '../../../../../../config'
+import { SELECT_ALL_VALUE, SERVER_MODE } from '../../../../../../config'
 import { EntityTypes } from '../../../constants'
 import { ALL_EXISTING_AND_FUTURE_ENVIRONMENTS_VALUE } from './constants'
 import { DirectPermissionRow } from './types'
diff --git a/src/Pages/GlobalConfigurations/Authorization/constants.ts b/src/Pages/GlobalConfigurations/Authorization/constants.ts
@@ -100,3 +100,4 @@ export const authorizationSelectStyles = {
 export const IMAGE_APPROVER_ACTION = importComponentFromFELibrary('IMAGE_APPROVER_ACTION', {}, 'function')
 export const CONFIG_APPROVER_ACTION = importComponentFromFELibrary('CONFIG_APPROVER_ACTION', {}, 'function')
 export const ARTIFACT_PROMOTER_ACTION = importComponentFromFELibrary('ARTIFACT_PROMOTER_ACTION', {}, 'function')
+export const TERMINAL_EXEC_ACTION = importComponentFromFELibrary('TERMINAL_EXEC_ACTION', {}, 'function')
diff --git a/src/Pages/GlobalConfigurations/Authorization/types.ts b/src/Pages/GlobalConfigurations/Authorization/types.ts
@@ -24,8 +24,9 @@ import {
     UserRoleGroup,
     UserGroupType,
     UserGroupDTO,
+    ACCESS_TYPE_MAP,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { ACCESS_TYPE_MAP, SERVER_MODE } from '../../../config'
+import { SERVER_MODE } from '../../../config'
 import { ActionTypes, EntityTypes, PermissionType, UserRoleType } from './constants'
 
 export interface UserAndGroupPermissionsWrapProps {
@@ -258,6 +259,7 @@ export interface DirectPermissionsRoleFilter extends RoleFilter, PermissionStatu
         value: string
         configApprover?: boolean
         artifactPromoter?: boolean
+        terminalExec?: boolean
     }
     accessType: ACCESS_TYPE_MAP.DEVTRON_APPS | ACCESS_TYPE_MAP.HELM_APPS | ACCESS_TYPE_MAP.JOBS
     workflow?: OptionType[]
diff --git a/src/Pages/GlobalConfigurations/Authorization/utils.ts b/src/Pages/GlobalConfigurations/Authorization/utils.ts
@@ -23,15 +23,10 @@ import {
     ToastVariantType,
     UserStatus,
     UserStatusDto,
+    ACCESS_TYPE_MAP,
     ZERO_TIME_STRING,
 } from '@devtron-labs/devtron-fe-common-lib'
-import {
-    ACCESS_TYPE_MAP,
-    Moment12HourFormat,
-    REQUIRED_FIELDS_MISSING,
-    SELECT_ALL_VALUE,
-    SERVER_MODE,
-} from '../../../config'
+import { Moment12HourFormat, REQUIRED_FIELDS_MISSING, SELECT_ALL_VALUE, SERVER_MODE } from '../../../config'
 import {
     APIRoleFilter,
     APIRoleFilterDto,
@@ -55,6 +50,7 @@ import {
     EntityTypes,
     PermissionType,
     ViewChartGroupPermission,
+    TERMINAL_EXEC_ACTION,
 } from './constants'
 import { AppIdWorkflowNamesMapping } from '../../../services/service.types'
 import { ALL_EXISTING_AND_FUTURE_ENVIRONMENTS_VALUE } from './Shared/components/AppPermissions/constants'
@@ -270,6 +266,9 @@ const getPermissionActionValue = (permission: DirectPermissionsRoleFilter) => {
     if (permission.action.artifactPromoter) {
         labels.push(ARTIFACT_PROMOTER_ACTION.value)
     }
+    if (permission.action.terminalExec) {
+        labels.push(TERMINAL_EXEC_ACTION.value)
+    }
 
     return labels.join(',')
 }
@@ -405,7 +404,7 @@ export const isDirectPermissionFormComplete = (directPermission, setDirectPermis
 }
 
 const isRoleCustom = (roleValue: string) =>
-    [CONFIG_APPROVER_ACTION.value, ARTIFACT_PROMOTER_ACTION.value].includes(roleValue)
+    [CONFIG_APPROVER_ACTION.value, ARTIFACT_PROMOTER_ACTION.value, TERMINAL_EXEC_ACTION.value].includes(roleValue)
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function parseData(dataList: any[], entity: string, accessType?: string) {
@@ -416,7 +415,7 @@ export function parseData(dataList: any[], entity: string, accessType?: string)
                     (role) => role.accessType === ACCESS_TYPE_MAP.DEVTRON_APPS && !isRoleCustom(role.value),
                 )
             }
-            return dataList.filter((role) => role.accessType === ACCESS_TYPE_MAP.HELM_APPS)
+            return dataList.filter((role) => role.accessType === ACCESS_TYPE_MAP.HELM_APPS && !isRoleCustom(role.value))
 
         case EntityTypes.CLUSTER:
         case EntityTypes.CHART_GROUP:
diff --git a/src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx b/src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx
@@ -31,8 +31,8 @@ import {
     ComponentSizeType,
     ToastVariantType,
     ToastManager,
+    ACCESS_TYPE_MAP,
 } from '@devtron-labs/devtron-fe-common-lib'
-import ReactSelect, { components } from 'react-select'
 import { useParams } from 'react-router-dom'
 import Tippy from '@tippyjs/react'
 import { ReactComponent as Close } from '../../../assets/icons/ic-close.svg'
@@ -44,12 +44,11 @@ import { ReactComponent as PlayButton } from '../../../assets/icons/ic-play.svg'
 import { ReactComponent as ICCopy } from '../../../assets/icons/ic-copy.svg'
 import { ReactComponent as Tag } from '../../../assets/icons/ic-tag.svg'
 import './webhookDetails.scss'
-import { Option } from '../../v2/common/ReactSelect.utils'
 import {
     getUserRole,
     createOrUpdateUser,
 } from '../../../Pages/GlobalConfigurations/Authorization/authorization.service'
-import { ACCESS_TYPE_MAP, DOCUMENTATION, MODES, SERVER_MODE, WEBHOOK_NO_API_TOKEN_ERROR } from '../../../config'
+import { DOCUMENTATION, MODES, SERVER_MODE, WEBHOOK_NO_API_TOKEN_ERROR } from '../../../config'
 import { createGeneratedAPIToken } from '../../../Pages/GlobalConfigurations/Authorization/APITokens/service'
 import {
     CURL_PREFIX,
diff --git a/src/config/constants.ts b/src/config/constants.ts
@@ -474,12 +474,6 @@ export enum SERVER_MODE {
 
 export type SERVER_MODE_TYPE = keyof typeof SERVER_MODE
 
-export enum ACCESS_TYPE_MAP {
-    DEVTRON_APPS = 'devtron-app', // devtron app work flow
-    HELM_APPS = 'helm-app', // helm app work flow
-    JOBS = '', // Empty string is intentional since there is no bifurcation in jobs as of now
-}
-
 export enum APP_TYPE {
     HELM_CHART = 'helm-chart',
     DEVTRON_APPS = 'app',
diff --git a/src/index.tsx b/src/index.tsx
@@ -144,7 +144,7 @@ if (!window || !window._env_) {
         ENABLE_RESOURCE_SCAN: false,
         FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: false,
         ENABLE_RESOURCE_SCAN_V2: false,
-        HIDE_RELEASES: true,
+        HIDE_RELEASES: false,
         HIDE_RESOURCE_WATCHER: true,
         ORGANIZATION_NAME: '',
         FEATURE_EXTERNAL_FLUX_CD_ENABLE: false,
diff --git a/src/services/service.ts b/src/services/service.ts
@@ -28,15 +28,15 @@ import {
     getUrlWithSearchParams,
     ROUTES,
     SERVER_MODE,
+    ACCESS_TYPE_MAP,
+    ModuleNameMap,
 } from '@devtron-labs/devtron-fe-common-lib'
-import moment from 'moment'
-import { ACCESS_TYPE_MAP, ModuleNameMap, Routes } from '../config'
+import { Routes } from '../config'
 import {
     CDPipelines,
     AppListMin,
     ProjectFilteredApps,
     AppOtherEnvironment,
-    LastExecutionMinResponseType,
     ClusterEnvironmentDetailList,
     ClusterListResponse,
     LoginCountType,
diff --git a/src/services/service.types.ts b/src/services/service.types.ts
@@ -106,17 +106,6 @@ export interface AllWorkflows extends ResponseType {
     result?: AppIdWorkflowNamesMapping
 }
 
-export interface LastExecutionMinResponseType {
-    code: number
-    status: string
-    result: {
-        lastExecution: string
-        imageScanDeployInfoId: number
-        severityCount: SeverityCount
-        scanned: boolean
-    }
-}
-
 export interface HostURLConfig {
     id: number
     key: string
diff --git a/vite.config.mts b/vite.config.mts
@@ -29,7 +29,7 @@ import { VitePWA } from 'vite-plugin-pwa'
 import tsconfigPaths from 'vite-tsconfig-paths'
 
 const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";`
-const TARGET_URL = 'https://preview.devtron.ai/'
+const TARGET_URL = 'https://devtron-ent-1.devtron.info/'
 
 function reactVirtualized(): PluginOption {
     return {
diff --git a/yarn.lock b/yarn.lock
@@ -1346,10 +1346,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/devtron-fe-common-lib@0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.5.0.tgz#7612c7d2cbfcfe929b77af9df47a857f89fc53bc"
-  integrity sha512-mizeADwh3AaGTaLE+2dLj+gPYFfwnc6mB4lyXZ9jCp39r29lJPy9+9l+5gdWpOeMkGSlBToQoMOpOTySDxbLUg==
+"@devtron-labs/devtron-fe-common-lib@0.5.0-beta-2":
+  version "0.5.0-beta-2"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.5.0-beta-2.tgz#d02d9913c2b95d6f5adde74989f77cf9e45a593b"
+  integrity sha512-Nwf6giogguBqYJ/BAqjICrhDg2Kjac4Da7P2gljQTwiCBtfq0plb0skXJldSeTrWVHRvoTkB+asZPyWAUcIVLw==
   dependencies:
     "@types/react-dates" "^21.8.6"
     ansi_up "^5.2.1"
