change workspace prop to currentWorkspace in SavedObjectsDuplicateModal

Signed-off-by: yuye-aws <[email protected]>
ruanyl · Sep 14, 2023 · 40f1d39 · 40f1d39
1 parent feb091c
commit 40f1d39
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/plugins/dashboard/public/application/utils/get_nav_actions.tsx b/src/plugins/dashboard/public/application/utils/get_nav_actions.tsx
@@ -202,14 +202,15 @@ export const getNavActions = (
       });
     };
 
+    const currentWorkspace = workspaces.currentWorkspace$.value;
     const dashboardSavedObject = (savedDashboard || {}) as SavedObjectWithMetadata;
     dashboardSavedObject.meta = { title: savedDashboard.title };
 
     const duplicateModal = (
       <SavedObjectsDuplicateModal
         duplicateMode={DuplicateMode.Selected}
         selectedSavedObjects={[dashboardSavedObject]}
-        workspaces={workspaces}
+        currentWorkspace={currentWorkspace}
         getDuplicateWorkspaces={getDuplicateWorkspaces}
         onDuplicate={onDuplicate}
         onClose={() => {}}

diff --git a/...objects_management/public/management_section/objects_table/components/duplicate_modal.tsx b/...objects_management/public/management_section/objects_table/components/duplicate_modal.tsx
@@ -31,7 +31,7 @@ import {
   EuiCallOut,
   EuiText,
 } from '@elastic/eui';
-import { WorkspaceAttribute, WorkspaceStart } from 'opensearch-dashboards/public';
+import { WorkspaceAttribute } from 'opensearch-dashboards/public';
 import { i18n } from '@osd/i18n';
 import { SavedObjectWithMetadata } from '../../../types';
 import { getSavedObjectLabel } from '../../../lib';
@@ -41,16 +41,16 @@ import { SAVED_OBJECT_TYPE_WORKSPACE } from '../../../constants';
 type WorkspaceOption = EuiComboBoxOptionOption<WorkspaceAttribute>;
 
 interface Props {
-  workspaces: WorkspaceStart;
   onDuplicate: (
     savedObjects: SavedObjectWithMetadata[],
     includeReferencesDeep: boolean,
     targetWorkspace: string
   ) => Promise<void>;
   onClose: () => void;
   duplicateMode: DuplicateMode;
-  getDuplicateWorkspaces: () => Promise<WorkspaceAttribute[]>;
+  currentWorkspace: WorkspaceAttribute | null;
   selectedSavedObjects: SavedObjectWithMetadata[];
+  getDuplicateWorkspaces: () => Promise<WorkspaceAttribute[]>;
 }
 
 interface State {
@@ -101,9 +101,8 @@ export class SavedObjectsDuplicateModal extends React.Component<Props, State> {
   };
 
   async componentDidMount() {
-    const { workspaces, getDuplicateWorkspaces } = this.props;
+    const { currentWorkspace, getDuplicateWorkspaces } = this.props;
     const workspaceList = await getDuplicateWorkspaces();
-    const currentWorkspace = workspaces.currentWorkspace$.value;
     const currentWorkspaceName = currentWorkspace?.name;
 
     // current workspace is the first option

diff --git a/.../saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx b/.../saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
@@ -774,6 +774,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
 
   renderDuplicateModal() {
     const { workspaces } = this.props;
+    const currentWorkspace = workspaces.currentWorkspace$.value;
     const { isShowingDuplicateModal, duplicateSelectedSavedObjects, duplicateMode } = this.state;
 
     if (!isShowingDuplicateModal) {
@@ -783,7 +784,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
     return (
       <SavedObjectsDuplicateModal
         selectedSavedObjects={duplicateSelectedSavedObjects}
-        workspaces={workspaces}
+        currentWorkspace={currentWorkspace}
         getDuplicateWorkspaces={this.getDuplicateWorkspaces}
         duplicateMode={duplicateMode}
         onDuplicate={this.onDuplicate}

diff --git a/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx b/src/plugins/visualize/public/application/utils/get_top_nav_config.tsx
@@ -337,14 +337,15 @@ export const getTopNavConfig = (
                 });
               };
 
+              const currentWorkspace = workspaces.currentWorkspace$.value;
               const visualizationSavedObject = (savedVis || {}) as SavedObjectWithMetadata;
               visualizationSavedObject.meta = { title: savedVis?.title }; // meta is missing in savedVis
 
               const duplicateModal = (
                 <SavedObjectsDuplicateModal
                   duplicateMode={DuplicateMode.Selected}
                   selectedSavedObjects={[visualizationSavedObject]}
-                  workspaces={workspaces}
+                  currentWorkspace={currentWorkspace}
                   getDuplicateWorkspaces={getDuplicateWorkspaces}
                   onDuplicate={onDuplicate}
                   onClose={() => {}}