optimize code

Signed-off-by: yubonluo <yubonluo@amazon.com>
yubonluo · Apr 7, 2024 · 334129a · 334129a
1 parent 1cd26a3
commit 334129a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
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
@@ -147,6 +147,20 @@ export class SavedObjectsDuplicateModal extends React.Component<Props, State> {
     return savedObjectTypeInfo && savedObjectTypeInfo[1];
   };
 
+  getIncludeAndNotDuplicateObjects = (targetWorkspaceId: string | undefined) => {
+    let selectedObjects = this.state.allSelectedObjects;
+    if (this.props.duplicateMode === DuplicateMode.All) {
+      selectedObjects = selectedObjects.filter((item) => this.isSavedObjectTypeIncluded(item.type));
+    }
+    // If the target workspace is not selected, all saved objects will be retained.
+    // If the target workspace has been selected, filter out the saved objects that belongs to the workspace.
+    const includedSelectedObjects = selectedObjects.filter((item) =>
+      !!targetWorkspaceId && !!item.workspaces ? !item.workspaces.includes(targetWorkspaceId) : true
+    );
+    const ignoredSelectedObjectsLength = selectedObjects.length - includedSelectedObjects.length;
+    return { includedSelectedObjects, ignoredSelectedObjectsLength };
+  };
+
   render() {
     const {
       workspaceOptions,
@@ -156,17 +170,11 @@ export class SavedObjectsDuplicateModal extends React.Component<Props, State> {
     } = this.state;
     const { duplicateMode, onClose } = this.props;
     const targetWorkspaceId = targetWorkspaceOption?.at(0)?.key;
-    let selectedObjects = allSelectedObjects;
-    if (duplicateMode === DuplicateMode.All) {
-      selectedObjects = selectedObjects.filter((item) => this.isSavedObjectTypeIncluded(item.type));
-    }
-    // If the target workspace is not selected, all saved objects will be retained.
-    // If the target workspace has been selected, filter out the saved objects that belongs to the workspace.
-    const includedSelectedObjects = selectedObjects.filter((item) =>
-      !!targetWorkspaceId && !!item.workspaces ? !item.workspaces.includes(targetWorkspaceId) : true
-    );
 
-    const ignoredSelectedObjectsLength = selectedObjects.length - includedSelectedObjects.length;
+    const {
+      includedSelectedObjects,
+      ignoredSelectedObjectsLength,
+    } = this.getIncludeAndNotDuplicateObjects(targetWorkspaceId);
 
     let confirmDuplicateButtonEnabled = false;
     if (!!targetWorkspaceId && includedSelectedObjects.length > 0) {

diff --git a/...ved_objects_management/public/management_section/objects_table/components/header.test.tsx b/...ved_objects_management/public/management_section/objects_table/components/header.test.tsx
@@ -39,7 +39,6 @@ describe('Header', () => {
       onImport: () => {},
       onRefresh: () => {},
       onDuplicate: () => {},
-      title: 'Saved Objects',
       objectCount: 4,
       filteredCount: 2,
       showDuplicateAll: false,
@@ -56,7 +55,6 @@ describe('Header', () => {
       onImport: () => {},
       onRefresh: () => {},
       onDuplicate: () => {},
-      title: 'Saved Objects',
       objectCount: 4,
       filteredCount: 2,
       showDuplicateAll: undefined,
@@ -75,7 +73,6 @@ describe('Header - workspace enabled', () => {
       onImport: () => {},
       onRefresh: () => {},
       onDuplicate: () => {},
-      title: 'Saved Objects',
       objectCount: 4,
       filteredCount: 2,
       showDuplicateAll: true,