Skip to content

Commit

Permalink
feat: update read / write to library_read / library_write
Browse files Browse the repository at this point in the history
Signed-off-by: Lin Wang <wonglam@amazon.com>
  • Loading branch information
wanglam committed Aug 8, 2023
1 parent f27ebdb commit 6de5b29
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/core/server/workspaces/routes/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import { IWorkspaceDBImpl, WorkspaceRoutePermissionItem } from '../types';
const WORKSPACES_API_BASE_URL = '/api/workspaces';

const workspacePermissionMode = schema.oneOf([
schema.literal(PermissionMode.Read),
schema.literal(PermissionMode.Write),
schema.literal(PermissionMode.LibraryRead),
schema.literal(PermissionMode.LibraryWrite),
schema.literal(PermissionMode.Management),
]);

Expand Down
4 changes: 3 additions & 1 deletion src/core/server/workspaces/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,7 @@ export type IResponse<T> =
};

export type WorkspaceRoutePermissionItem = {
modes: Array<PermissionMode.Read | PermissionMode.Write | PermissionMode.Management>;
modes: Array<
PermissionMode.LibraryRead | PermissionMode.LibraryWrite | PermissionMode.Management
>;
} & ({ type: 'user'; userId: string } | { type: 'group'; group: string });
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ export type WorkspacePermissionSetting = (
userId?: string;
group?: string;
modes: Array<
| WorkspacePermissionMode.Read
| WorkspacePermissionMode.Write
| WorkspacePermissionMode.LibraryRead
| WorkspacePermissionMode.LibraryWrite
| WorkspacePermissionMode.Management
>;
};

const permissionModeOptions = [
{
id: WorkspacePermissionMode.Read,
id: WorkspacePermissionMode.LibraryRead,
label: 'View',
iconType: 'eye',
},
{
id: WorkspacePermissionMode.Write,
id: WorkspacePermissionMode.LibraryWrite,
label: 'Edit',
iconType: 'pencil',
},
Expand All @@ -58,11 +58,11 @@ const permissionTypeOptions = [
const isWorkspacePermissionMode = (
test: string
): test is
| WorkspacePermissionMode.Read
| WorkspacePermissionMode.Write
| WorkspacePermissionMode.LibraryRead
| WorkspacePermissionMode.LibraryWrite
| WorkspacePermissionMode.Management =>
test === WorkspacePermissionMode.Read ||
test === WorkspacePermissionMode.Write ||
test === WorkspacePermissionMode.LibraryRead ||
test === WorkspacePermissionMode.LibraryWrite ||
test === WorkspacePermissionMode.Management;

interface WorkspacePermissionSettingInputProps {
Expand All @@ -72,8 +72,8 @@ interface WorkspacePermissionSettingInputProps {
userId?: string;
group?: string;
modes?: Array<
| WorkspacePermissionMode.Read
| WorkspacePermissionMode.Write
| WorkspacePermissionMode.LibraryRead
| WorkspacePermissionMode.LibraryWrite
| WorkspacePermissionMode.Management
>;
onTypeChange: (type: 'user' | 'group', index: number) => void;
Expand All @@ -86,8 +86,8 @@ interface WorkspacePermissionSettingInputProps {
) => void;
onPermissionModesChange: (
WorkspacePermissionMode: Array<
| WorkspacePermissionMode.Read
| WorkspacePermissionMode.Write
| WorkspacePermissionMode.LibraryRead
| WorkspacePermissionMode.LibraryWrite
| WorkspacePermissionMode.Management
>,
index: number
Expand All @@ -113,8 +113,10 @@ const WorkspacePermissionSettingInput = ({
);
const permissionModesIdToSelectMap = useMemo(
() => ({
[WorkspacePermissionMode.Read]: !!modes?.includes(WorkspacePermissionMode.Read),
[WorkspacePermissionMode.Write]: !!modes?.includes(WorkspacePermissionMode.Write),
[WorkspacePermissionMode.LibraryRead]: !!modes?.includes(WorkspacePermissionMode.LibraryRead),
[WorkspacePermissionMode.LibraryWrite]: !!modes?.includes(
WorkspacePermissionMode.LibraryWrite
),
[WorkspacePermissionMode.Management]: !!modes?.includes(WorkspacePermissionMode.Management),
}),
[modes]
Expand Down

0 comments on commit 6de5b29

Please sign in to comment.