optimize the code

Signed-off-by: yubonluo <[email protected]>
opensearch-project · Jul 23, 2024 · b850070 · b850070
1 parent 0ef48c3
commit b850070
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/...ment_section/objects_table/components/__snapshots__/duplicate_result_flyout.test.tsx.snap b/...ment_section/objects_table/components/__snapshots__/duplicate_result_flyout.test.tsx.snap
diff --git a/...ts_management/public/management_section/objects_table/components/duplicate_modal.test.tsx b/...ts_management/public/management_section/objects_table/components/duplicate_modal.test.tsx
@@ -112,7 +112,7 @@ describe('DuplicateModal', () => {
     expect(options[1].label).toEqual('bar');
   });
 
-  it('should display the suffix (current) in target workspace options when in workspace1', async () => {
+  it('should display the suffix (current) in target workspace options when it is the current workspace', async () => {
     workspaces.workspaceList$.next(workspaceList);
     workspaces.currentWorkspaceId$.next('workspace1');
     workspaces.currentWorkspace$.next({

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
@@ -71,13 +71,17 @@ export class SavedObjectsDuplicateModal extends React.Component<ShowDuplicateMod
   }
 
   duplicateSavedObjects = async (savedObjects: DuplicateObject[]) => {
+    const selectedWorkspace = this.state.targetWorkspaceOption[0];
+    if (!selectedWorkspace) {
+      return;
+    }
+    const targetWorkspace = selectedWorkspace.key;
+    const targetWorkspaceName = selectedWorkspace.label;
+
     this.setState({
       isLoading: true,
     });
 
-    const targetWorkspace = this.state.targetWorkspaceOption[0].key;
-    const targetWorkspaceName = this.state.targetWorkspaceOption[0].label;
-
     await this.props.onDuplicate(
       savedObjects,
       this.state.isIncludeReferencesDeepChecked,
@@ -98,10 +102,10 @@ export class SavedObjectsDuplicateModal extends React.Component<ShowDuplicateMod
     });
   };
 
-  changeIncludeReferencesDeep = () => {
-    this.setState((state) => ({
-      isIncludeReferencesDeepChecked: !state.isIncludeReferencesDeepChecked,
-    }));
+  changeIncludeReferencesDeep = (e: React.ChangeEvent<HTMLInputElement>) => {
+    this.setState({
+      isIncludeReferencesDeepChecked: e.target.checked,
+    });
   };
 
   render() {
@@ -137,7 +141,7 @@ export class SavedObjectsDuplicateModal extends React.Component<ShowDuplicateMod
           <EuiFormRow
             fullWidth
             label={i18n.translate(
-              'savedObjectsManagement.objectsTable.duplicateModal.targetWorkspacelabel',
+              'savedObjectsManagement.objectsTable.duplicateModal.targetWorkspaceLabel',
               { defaultMessage: 'Workspace' }
             )}
           >
@@ -210,9 +214,6 @@ export class SavedObjectsDuplicateModal extends React.Component<ShowDuplicateMod
             <FormattedMessage
               id="savedObjectsManagement.objectsTable.duplicateModal.confirmButtonLabel"
               defaultMessage="Copy"
-              values={{
-                objectCount: allSelectedObjects.length,
-              }}
             />
           </EuiButton>
         </EuiModalFooter>