Merge branch 'develop' of github.com:devtron-labs/dashboard into feat/pipeline-deploy-config-diff-revamp

RohitRaj011 · RohitRaj011 · commit 32c11559bc6c · 2024-10-17T16:08:23.000+05:30
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,11 @@ import {
     TabGroup,
     useAsync,
     useMainContext,
+    ACCESS_TYPE_MAP,
+    EntityTypes,
 } 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 { ActionTypes } from '../../../constants'
+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,20 +23,22 @@ import {
     getIsRequestAborted,
     LoadingIndicator,
     ReactSelectInputAction,
+    ACCESS_TYPE_MAP,
+    EntityTypes,
 } 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'
 import {
     CONFIG_APPROVER_ACTION,
     authorizationSelectStyles,
-    EntityTypes,
     ARTIFACT_PROMOTER_ACTION,
+    TERMINAL_EXEC_ACTION,
 } from '../../../constants'
 import { AppOption, ClusterValueContainer, ProjectValueContainer, ValueContainer, WorkflowGroupHeading } from './common'
 import {
@@ -80,17 +82,20 @@ 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,
         ARTIFACT_PROMOTER_ACTION.value,
+        TERMINAL_EXEC_ACTION.value,
     ])
 
     const primaryActionRole = {
         label: multiRole[primaryActionRoleIndex],
         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 +136,9 @@ const DirectPermission = ({
         }
     }
 
+    const getSelectedRolesDisplay = (selectedPermissions: string[]) =>
+        selectedPermissions.filter((selectedVal) => !!selectedVal).join(', ')
+
     const metaRolesForAccessType = _getMetaRolesForAccessType()
     const listForAccessType = getListForAccessType(permission.accessType)
 
@@ -175,10 +183,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 +211,24 @@ 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}
+                        customRoles={customRoles}
+                    />
+                )}
         </components.MenuList>
     )
 
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/common.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/common.tsx
@@ -16,12 +16,11 @@
 
 /* eslint-disable react/destructuring-assignment */
 /* eslint-disable react/prop-types */
-import { Checkbox, CHECKBOX_VALUE, noop } from '@devtron-labs/devtron-fe-common-lib'
+import { Checkbox, CHECKBOX_VALUE, noop, EntityTypes } from '@devtron-labs/devtron-fe-common-lib'
 import React from 'react'
 import { components } from 'react-select'
 import { GroupHeading } from '../../../../../../components/v2/common/ReactSelect.utils'
 import { SELECT_ALL_VALUE } from '../../../../../../config'
-import { EntityTypes } from '../../../constants'
 import { ALL_EXISTING_AND_FUTURE_ENVIRONMENTS_VALUE, DirectPermissionFieldName } from './constants'
 
 export const WorkflowGroupHeading = (props) => <GroupHeading {...props} hideClusterName />
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/constants.ts b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/constants.ts
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import { ACCESS_TYPE_MAP, SELECT_ALL_VALUE } from '../../../../../../config'
-import { ActionTypes, authorizationSelectStyles, EntityTypes } from '../../../constants'
+import { ACCESS_TYPE_MAP, EntityTypes } from '@devtron-labs/devtron-fe-common-lib'
+import { SELECT_ALL_VALUE } from '../../../../../../config'
+import { ActionTypes, authorizationSelectStyles } 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,11 +14,10 @@
  * limitations under the License.
  */
 
-import { OptionType } from '@devtron-labs/devtron-fe-common-lib'
+import { OptionType, ACCESS_TYPE_MAP, EntityTypes } 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 { EntityTypes } from '../../../constants'
+import { SELECT_ALL_VALUE, SERVER_MODE } from '../../../../../../config'
 import { ALL_EXISTING_AND_FUTURE_ENVIRONMENTS_VALUE } from './constants'
 import { DirectPermissionRow } from './types'
 
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sListItemCard.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/K8sListItemCard.tsx
@@ -28,6 +28,7 @@ import {
     OptionType,
     LoadingIndicator,
     GVKType,
+    EntityTypes,
 } from '@devtron-labs/devtron-fe-common-lib'
 import CreatableSelect from 'react-select/creatable'
 import Tippy from '@tippyjs/react'
@@ -56,7 +57,7 @@ import { ReactComponent as InfoIcon } from '../../../../../../assets/icons/info-
 import { formatResourceKindOptionLabel, k8sRoleSelectionStyle, multiSelectAllState } from './utils'
 import { useAuthorizationContext } from '../../../AuthorizationProvider'
 import { parseData } from '../../../utils'
-import { authorizationSelectStyles, ALL_NAMESPACE, EntityTypes } from '../../../constants'
+import { authorizationSelectStyles, ALL_NAMESPACE } from '../../../constants'
 import { K8sPermissionActionType, K8S_PERMISSION_INFO_MESSAGE, resourceSelectStyles } from './constants'
 import { SELECT_ALL_VALUE } from '../../../../../../config'
 import { K8sItemCardLoadingState, K8sListItemCardType } from './types'
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/utils.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/K8sObjectPermissions/utils.tsx
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { ReactSelectInputAction } from '@devtron-labs/devtron-fe-common-lib'
+import { ReactSelectInputAction, EntityTypes } from '@devtron-labs/devtron-fe-common-lib'
 import { SELECT_ALL_VALUE } from '../../../../../../config'
-import { ActionTypes, ACTION_LABEL, EntityTypes, authorizationSelectStyles } from '../../../constants'
+import { ActionTypes, ACTION_LABEL, authorizationSelectStyles } from '../../../constants'
 import { K8sPermissionFilter } from '../../../types'
 import { getDefaultStatusAndTimeout } from '../../../libUtils'
 import { K8S_EMPTY_GROUP } from '../../../../../../components/ResourceBrowser/Constants'
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/PermissionConfigurationFormProvider.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/PermissionConfigurationForm/PermissionConfigurationFormProvider.tsx
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { UserStatus } from '@devtron-labs/devtron-fe-common-lib'
+import { UserStatus, EntityTypes } from '@devtron-labs/devtron-fe-common-lib'
 import React, { createContext, ReactNode, useContext, useEffect, useMemo, useRef, useState } from 'react'
 import { importComponentFromFELibrary } from '../../../../../../components/common'
-import { ActionTypes, EntityTypes, PermissionType } from '../../../constants'
+import { ActionTypes, PermissionType } from '../../../constants'
 import { getDefaultStatusAndTimeout } from '../../../libUtils'
 import {
     ChartGroupPermissionsFilter,
diff --git a/src/Pages/GlobalConfigurations/Authorization/authorization.service.ts b/src/Pages/GlobalConfigurations/Authorization/authorization.service.ts
@@ -26,10 +26,10 @@ import {
     trash,
     UserListFilterParams,
     UserStatus,
+    CustomRoles,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { Routes } from '../../../config'
 import {
-    CustomRoles,
     PermissionGroup,
     PermissionGroupBulkDeletePayload,
     PermissionGroupCreateOrUpdatePayload,
diff --git a/src/Pages/GlobalConfigurations/Authorization/constants.ts b/src/Pages/GlobalConfigurations/Authorization/constants.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { getCommonSelectStyle } from '@devtron-labs/devtron-fe-common-lib'
+import { getCommonSelectStyle, EntityTypes } from '@devtron-labs/devtron-fe-common-lib'
 import { SELECT_ALL_VALUE } from '../../../config'
 import { APIRoleFilter } from './types'
 import { getDefaultStatusAndTimeout } from './libUtils'
@@ -34,16 +34,6 @@ export const PERMISSION_TYPE_LABEL_MAP: Record<PermissionType, string> = {
     [PermissionType.SUPER_ADMIN]: 'Super admin permission',
 } as const
 
-export enum EntityTypes {
-    CHART_GROUP = 'chart-group',
-    DIRECT = 'apps',
-    JOB = 'jobs',
-    DOCKER = 'docker',
-    GIT = 'git',
-    CLUSTER = 'cluster',
-    NOTIFICATION = 'notification',
-}
-
 export enum ActionTypes {
     MANAGER = 'manager',
     ADMIN = 'admin',
@@ -100,3 +90,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,9 +24,12 @@ import {
     UserRoleGroup,
     UserGroupType,
     UserGroupDTO,
+    ACCESS_TYPE_MAP,
+    EntityTypes,
+    CustomRoleAndMeta,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { ACCESS_TYPE_MAP, SERVER_MODE } from '../../../config'
-import { ActionTypes, EntityTypes, PermissionType, UserRoleType } from './constants'
+import { SERVER_MODE } from '../../../config'
+import { ActionTypes, PermissionType, UserRoleType } from './constants'
 
 export interface UserAndGroupPermissionsWrapProps {
     children: ReactNode
@@ -195,31 +198,6 @@ export type PermissionGroupBulkDeletePayload =
           filterConfig: Pick<BaseFilterQueryParams<unknown>, 'searchKey'>
       }
 
-export interface CustomRoles {
-    id: number
-    roleName: string
-    roleDisplayName: string
-    roleDescription: string
-    entity: EntityTypes
-    accessType: ACCESS_TYPE_MAP.DEVTRON_APPS | ACCESS_TYPE_MAP.HELM_APPS
-}
-
-export type MetaPossibleRoles = Record<
-    CustomRoles['roleName'],
-    {
-        value: CustomRoles['roleDisplayName']
-        description: CustomRoles['roleDescription']
-    }
->
-
-export interface CustomRoleAndMeta {
-    customRoles: CustomRoles[]
-    possibleRolesMeta: MetaPossibleRoles
-    possibleRolesMetaForHelm: MetaPossibleRoles
-    possibleRolesMetaForCluster: MetaPossibleRoles
-    possibleRolesMetaForJob: MetaPossibleRoles
-}
-
 export interface AuthorizationContextProps {
     customRoles: CustomRoleAndMeta
     isAutoAssignFlowEnabled: boolean
@@ -258,6 +236,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
diff --git a/src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx b/src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx
diff --git a/src/config/constants.ts b/src/config/constants.ts
diff --git a/src/services/service.ts b/src/services/service.ts
diff --git a/src/services/service.types.ts b/src/services/service.types.ts
