feat: move user permission enum and types to common-lib

arunjaindev · arunjaindev · commit a0ca58b78a76 · 2024-10-14T11:27:08.000+05:30
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-beta-2",
+        "@devtron-labs/devtron-fe-common-lib": "0.5.0-beta-4",
         "@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/AppPermissions.component.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/AppPermissions.component.tsx
@@ -26,8 +26,9 @@ import {
     useAsync,
     useMainContext,
     ACCESS_TYPE_MAP,
+    EntityTypes,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { EntityTypes, ActionTypes } from '../../../constants'
+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'
diff --git a/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/DirectPermission.tsx b/src/Pages/GlobalConfigurations/Authorization/Shared/components/AppPermissions/DirectPermission.tsx
@@ -24,6 +24,7 @@ import {
     LoadingIndicator,
     ReactSelectInputAction,
     ACCESS_TYPE_MAP,
+    EntityTypes,
 } from '@devtron-labs/devtron-fe-common-lib'
 import Select, { components } from 'react-select'
 import Tippy from '@tippyjs/react'
@@ -36,7 +37,6 @@ import { useAuthorizationContext } from '../../../AuthorizationProvider'
 import {
     CONFIG_APPROVER_ACTION,
     authorizationSelectStyles,
-    EntityTypes,
     ARTIFACT_PROMOTER_ACTION,
     TERMINAL_EXEC_ACTION,
 } from '../../../constants'
@@ -225,6 +225,7 @@ const DirectPermission = ({
                         }}
                         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,9 +14,9 @@
  * limitations under the License.
  */
 
-import { ACCESS_TYPE_MAP } from '@devtron-labs/devtron-fe-common-lib'
+import { ACCESS_TYPE_MAP, EntityTypes } from '@devtron-labs/devtron-fe-common-lib'
 import { SELECT_ALL_VALUE } from '../../../../../../config'
-import { ActionTypes, authorizationSelectStyles, EntityTypes } from '../../../constants'
+import { ActionTypes, authorizationSelectStyles } from '../../../constants'
 import { getDefaultStatusAndTimeout } from '../../../libUtils'
 import { DirectPermissionsRoleFilter } from '../../../types'
 
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, ACCESS_TYPE_MAP } 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 { 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/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',
diff --git a/src/Pages/GlobalConfigurations/Authorization/types.ts b/src/Pages/GlobalConfigurations/Authorization/types.ts
@@ -25,9 +25,11 @@ import {
     UserGroupType,
     UserGroupDTO,
     ACCESS_TYPE_MAP,
+    EntityTypes,
+    CustomRoleAndMeta,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { SERVER_MODE } from '../../../config'
-import { ActionTypes, EntityTypes, PermissionType, UserRoleType } from './constants'
+import { ActionTypes, PermissionType, UserRoleType } from './constants'
 
 export interface UserAndGroupPermissionsWrapProps {
     children: ReactNode
@@ -196,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
diff --git a/src/Pages/GlobalConfigurations/Authorization/utils.ts b/src/Pages/GlobalConfigurations/Authorization/utils.ts
@@ -25,16 +25,17 @@ import {
     UserStatusDto,
     ACCESS_TYPE_MAP,
     ZERO_TIME_STRING,
+    EntityTypes,
+    CustomRoleAndMeta,
+    CustomRoles,
+    MetaPossibleRoles,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { Moment12HourFormat, REQUIRED_FIELDS_MISSING, SELECT_ALL_VALUE, SERVER_MODE } from '../../../config'
 import {
     APIRoleFilter,
     APIRoleFilterDto,
     CreateUserPermissionPayloadParams,
-    CustomRoleAndMeta,
-    CustomRoles,
     DirectPermissionsRoleFilter,
-    MetaPossibleRoles,
     PermissionGroup,
     PermissionGroupDto,
     User,
@@ -47,7 +48,6 @@ import {
     CONFIG_APPROVER_ACTION,
     ARTIFACT_PROMOTER_ACTION,
     ActionTypes,
-    EntityTypes,
     PermissionType,
     ViewChartGroupPermission,
     TERMINAL_EXEC_ACTION,
diff --git a/src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx b/src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx
@@ -32,6 +32,7 @@ import {
     ToastVariantType,
     ToastManager,
     ACCESS_TYPE_MAP,
+    EntityTypes,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { useParams } from 'react-router-dom'
 import Tippy from '@tippyjs/react'
@@ -63,7 +64,7 @@ import { executeWebhookAPI, getExternalCIConfig, getWebhookAPITokenList } from '
 import { GENERATE_TOKEN_NAME_VALIDATION } from '../../../config/constantMessaging'
 import { createUserPermissionPayload } from '../../../Pages/GlobalConfigurations/Authorization/utils'
 import { ChartGroupPermissionsFilter } from '../../../Pages/GlobalConfigurations/Authorization/types'
-import { ActionTypes, EntityTypes, PermissionType } from '../../../Pages/GlobalConfigurations/Authorization/constants'
+import { ActionTypes, PermissionType } from '../../../Pages/GlobalConfigurations/Authorization/constants'
 import {
     getDefaultStatusAndTimeout,
     getDefaultUserStatusAndTimeout,
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-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==
+"@devtron-labs/devtron-fe-common-lib@0.5.0-beta-4":
+  version "0.5.0-beta-4"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.5.0-beta-4.tgz#4ae0b0386015e0663c0d13e15afbbbfa49294f03"
+  integrity sha512-O9MkGfzhz1mQlg8lkq9DOvKmmrl/HU78ZyHjFz/Dom3wLx1ELYYk9Mp5gWttbmpoAl/VvqWdPdq2/YsV/rbRWQ==
   dependencies:
     "@types/react-dates" "^21.8.6"
     ansi_up "^5.2.1"
