diff --git a/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx b/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx index 3f646989d..741f3ff51 100644 --- a/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx +++ b/web/src/pages/SpaceAccessControl/AddNewMember/AddNewMember.tsx @@ -28,9 +28,8 @@ import { useMembershipAdd, useMembershipUpdate } from 'services/code' -import { getErrorMessage, LIST_FETCHING_LIMIT } from 'utils/Utils' +import { getErrorMessage, LIST_FETCHING_LIMIT, roleStringKeyMap } from 'utils/Utils' import { useModalHook } from 'hooks/useModalHook' -import { roleStringKeyMap } from '../SpaceAccessControl' const roles = ['reader', 'executor', 'contributor', 'space_owner'] as const diff --git a/web/src/pages/SpaceAccessControl/SpaceAccessControl.tsx b/web/src/pages/SpaceAccessControl/SpaceAccessControl.tsx index 13cd3c363..b69d4ef69 100644 --- a/web/src/pages/SpaceAccessControl/SpaceAccessControl.tsx +++ b/web/src/pages/SpaceAccessControl/SpaceAccessControl.tsx @@ -19,25 +19,16 @@ import { Avatar, Button, ButtonVariation, Container, Layout, Page, TableV2, Text import { Color, FontVariation } from '@harnessio/design-system' import type { CellProps, Column } from 'react-table' -import { StringKeys, useStrings } from 'framework/strings' +import { useStrings } from 'framework/strings' import { useConfirmAct } from 'hooks/useConfirmAction' import { useGetSpaceParam } from 'hooks/useGetSpaceParam' -import { EnumMembershipRole, TypesMembershipUser, useMembershipDelete, useMembershipList } from 'services/code' -import { getErrorMessage } from 'utils/Utils' +import { TypesMembershipUser, useMembershipDelete, useMembershipList } from 'services/code' +import { getErrorMessage, roleStringKeyMap } from 'utils/Utils' import { LoadingSpinner } from 'components/LoadingSpinner/LoadingSpinner' import { OptionsMenuButton } from 'components/OptionsMenuButton/OptionsMenuButton' - import useAddNewMember from './AddNewMember/AddNewMember' - import css from './SpaceAccessControl.module.scss' -export const roleStringKeyMap: Record = { - contributor: 'contributor', - executor: 'executor', - reader: 'reader', - space_owner: 'owner' -} - const SpaceAccessControl = () => { const { getString } = useStrings() const { showError, showSuccess } = useToaster() diff --git a/web/src/utils/Utils.ts b/web/src/utils/Utils.ts index be8cbd4b5..620c7b9c7 100644 --- a/web/src/utils/Utils.ts +++ b/web/src/utils/Utils.ts @@ -31,9 +31,11 @@ import type { TypesLabelValue, TypesPullReq, TypesOwnerEvaluation, - TypesPrincipalInfo + TypesPrincipalInfo, + EnumMembershipRole } from 'services/code' import { PullReqReviewDecision } from 'pages/PullRequest/PullRequestUtils' +import type { StringKeys } from 'framework/strings' export enum ACCESS_MODES { VIEW, @@ -1114,3 +1116,10 @@ export const replaceMentionEmailWithId = ( [x: string]: TypesPrincipalInfo } ) => input.replace(/@\[(\S+@\S+\.\S+)\]/g, (match, email) => (emailMap[email] ? `@[${emailMap[email].id}]` : match)) + +export const roleStringKeyMap: Record = { + contributor: 'contributor', + executor: 'executor', + reader: 'reader', + space_owner: 'owner' +}