Skip to content

Commit

Permalink
change permission mode to get target workspaces when duplicate
Browse files Browse the repository at this point in the history
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
  • Loading branch information
yuye-aws committed Sep 20, 2023
1 parent fc3606a commit c67c3da
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/core/public/workspace/workspaces_service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type WorkspaceMenuRenderFn = ({
observables: WorkspaceObservables;
}) => JSX.Element | null;

type WorkspaceObject = WorkspaceAttribute & { readonly?: boolean };
type WorkspaceObject = WorkspaceAttribute & { libraryReadonly?: boolean };
export interface WorkspaceObservables {
currentWorkspaceId$: BehaviorSubject<string>;
currentWorkspace$: BehaviorSubject<WorkspaceObject | null>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export class SavedObjectsDuplicateModal extends React.Component<Props, State> {
getTargetWorkspaces = () => {
const { workspaces } = this.props;
const workspaceList = workspaces.workspaceList$.value;
return workspaceList.filter((workspace) => !workspace.readonly);
return workspaceList.filter((workspace) => !workspace.libraryReadonly);
};

duplicateSavedObjects = async (savedObjects: SavedObjectWithMetadata[]) => {
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/workspace/public/workspace_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export class WorkspaceClient {
if (result?.success) {
const resultWithWritePermission = await this.list({
perPage: 999,
permissionModes: [WorkspacePermissionMode.Management, WorkspacePermissionMode.LibraryWrite],
permissionModes: [WorkspacePermissionMode.LibraryWrite],
});
if (resultWithWritePermission?.success) {
const workspaceIdsWithWritePermission = resultWithWritePermission.result.workspaces.map(
Expand All @@ -122,7 +122,7 @@ export class WorkspaceClient {
let workspaces = result.result.workspaces;
workspaces = result.result.workspaces.map((workspace: WorkspaceAttribute) => ({
...workspace,
readonly: !workspaceIdsWithWritePermission.includes(workspace.id),
libraryReadonly: !workspaceIdsWithWritePermission.includes(workspace.id),
}));
this.workspaces.workspaceList$.next(workspaces);
}
Expand Down

0 comments on commit c67c3da

Please sign in to comment.