From 54a94924ba7aef24dd80fa7db49febf6d57ffdf6 Mon Sep 17 00:00:00 2001 From: yuye-aws Date: Mon, 30 Oct 2023 15:52:54 +0800 Subject: [PATCH] fix yarn start error Signed-off-by: yuye-aws --- src/plugins/workspace/common/constants.ts | 20 ---------------- .../workspace/common/permission/constants.ts | 24 +++++++++++++++++++ .../components/workspace_creator/utils.ts | 5 +++- .../workspace_permission_setting_panel.tsx | 12 +++++++--- 4 files changed, 37 insertions(+), 24 deletions(-) create mode 100644 src/plugins/workspace/common/permission/constants.ts diff --git a/src/plugins/workspace/common/constants.ts b/src/plugins/workspace/common/constants.ts index 1a1efa2870d0..ef0821c88619 100644 --- a/src/plugins/workspace/common/constants.ts +++ b/src/plugins/workspace/common/constants.ts @@ -3,8 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { WorkspacePermissionMode } from '../../../core/public'; - export const WORKSPACE_CREATE_APP_ID = 'workspace_create'; export const WORKSPACE_LIST_APP_ID = 'workspace_list'; export const WORKSPACE_UPDATE_APP_ID = 'workspace_update'; @@ -21,21 +19,3 @@ export const PATHS = { export const WORKSPACE_OP_TYPE_CREATE = 'create'; export const WORKSPACE_OP_TYPE_UPDATE = 'update'; export const WORKSPACE_SAVED_OBJECTS_CLIENT_WRAPPER_ID = 'workspace'; - -export enum PermissionModeId { - Read = 'read', - ReadAndWrite = 'read+write', - Admin = 'admin', -} - -export const OptionIdToWorkspacePermissionModesMap: Record< - PermissionModeId, - WorkspacePermissionMode[] -> = { - [PermissionModeId.Read]: [WorkspacePermissionMode.LibraryRead, WorkspacePermissionMode.Read], - [PermissionModeId.ReadAndWrite]: [ - WorkspacePermissionMode.LibraryWrite, - WorkspacePermissionMode.Read, - ], - [PermissionModeId.Admin]: [WorkspacePermissionMode.LibraryWrite, WorkspacePermissionMode.Write], -}; diff --git a/src/plugins/workspace/common/permission/constants.ts b/src/plugins/workspace/common/permission/constants.ts new file mode 100644 index 000000000000..8f7913853c5b --- /dev/null +++ b/src/plugins/workspace/common/permission/constants.ts @@ -0,0 +1,24 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + */ + +import { WorkspacePermissionMode } from '../../../../core/public'; + +export enum PermissionModeId { + Read = 'read', + ReadAndWrite = 'read+write', + Admin = 'admin', +} + +export const OptionIdToWorkspacePermissionModesMap: Record< + PermissionModeId, + WorkspacePermissionMode[] +> = { + [PermissionModeId.Read]: [WorkspacePermissionMode.LibraryRead, WorkspacePermissionMode.Read], + [PermissionModeId.ReadAndWrite]: [ + WorkspacePermissionMode.LibraryWrite, + WorkspacePermissionMode.Read, + ], + [PermissionModeId.Admin]: [WorkspacePermissionMode.LibraryWrite, WorkspacePermissionMode.Write], +}; diff --git a/src/plugins/workspace/public/components/workspace_creator/utils.ts b/src/plugins/workspace/public/components/workspace_creator/utils.ts index cdea021fb397..9e1a04a3c46c 100644 --- a/src/plugins/workspace/public/components/workspace_creator/utils.ts +++ b/src/plugins/workspace/public/components/workspace_creator/utils.ts @@ -6,7 +6,10 @@ import { i18n } from '@osd/i18n'; import { PublicAppInfo, WorkspacePermissionMode } from '../../../../../core/public'; import { featureMatchesConfig } from '../../utils'; -import { OptionIdToWorkspacePermissionModesMap, PermissionModeId } from '../../../common/constants'; +import { + OptionIdToWorkspacePermissionModesMap, + PermissionModeId, +} from '../../../common/permission/constants'; import { PermissionEditingData, WorkspaceFormEditingData, diff --git a/src/plugins/workspace/public/components/workspace_creator/workspace_permission_setting_panel.tsx b/src/plugins/workspace/public/components/workspace_creator/workspace_permission_setting_panel.tsx index e7c3240a1f1a..eaaaec7f1ba6 100644 --- a/src/plugins/workspace/public/components/workspace_creator/workspace_permission_setting_panel.tsx +++ b/src/plugins/workspace/public/components/workspace_creator/workspace_permission_setting_panel.tsx @@ -17,7 +17,10 @@ import { } from '@elastic/eui'; import { i18n } from '@osd/i18n'; import { WorkspacePermissionMode } from '../../../../../core/public'; -import { PermissionModeId, OptionIdToWorkspacePermissionModesMap } from '../../../common/constants'; +import { + PermissionModeId, + OptionIdToWorkspacePermissionModesMap, +} from '../../../common/permission/constants'; import { WorkspacePermissionItemType, PermissionEditingData } from './types'; import { getPermissionModeId } from './utils'; @@ -98,8 +101,11 @@ const WorkspacePermissionSettingInput = ({ const handlePermissionModeOptionChange = useCallback( (changedId: string) => { - if (OptionIdToWorkspacePermissionModesMap[changedId]) { - onPermissionModesChange([...OptionIdToWorkspacePermissionModesMap[changedId]], index); + if (OptionIdToWorkspacePermissionModesMap[changedId as PermissionModeId]) { + onPermissionModesChange( + [...OptionIdToWorkspacePermissionModesMap[changedId as PermissionModeId]], + index + ); } }, [index, onPermissionModesChange]