feat: optimize code

Signed-off-by: SuZhou-Joe <[email protected]>
opensearch-project · Feb 29, 2024 · ed4126a · ed4126a
1 parent 9ebadcd
commit ed4126a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/core/server/saved_objects/service/lib/utils.ts b/src/core/server/saved_objects/service/lib/utils.ts
@@ -80,11 +80,4 @@ export class SavedObjectsUtils {
     total: 0,
     saved_objects: [],
   });
-
-  public static filterWorkspacesAccordingToSourceWorkspaces(
-    targetWorkspaces?: string[],
-    baseWorkspaces?: string[]
-  ): string[] {
-    return targetWorkspaces?.filter((item) => !baseWorkspaces?.includes(item)) || [];
-  }
 }
diff --git a/...gins/workspace/server/saved_objects/saved_objects_wrapper_for_check_workspace_conflict.ts b/...gins/workspace/server/saved_objects/saved_objects_wrapper_for_check_workspace_conflict.ts
@@ -20,6 +20,11 @@ import {
 
 const errorContent = (error: Boom.Boom) => error.output.payload;
 
+const filterWorkspacesAccordingToSourceWorkspaces = (
+  targetWorkspaces?: string[],
+  baseWorkspaces?: string[]
+): string[] => targetWorkspaces?.filter((item) => !baseWorkspaces?.includes(item)) || [];
+
 export class WorkspaceConflictSavedObjectsClientWrapper {
   private _serializer?: SavedObjectsSerializer;
   public setSerializer(serializer: SavedObjectsSerializer) {
@@ -53,10 +58,7 @@ export class WorkspaceConflictSavedObjectsClientWrapper {
         }
         if (currentItem) {
           if (
-            SavedObjectsUtils.filterWorkspacesAccordingToSourceWorkspaces(
-              workspaces,
-              currentItem.workspaces
-            ).length
+            filterWorkspacesAccordingToSourceWorkspaces(workspaces, currentItem.workspaces).length
           ) {
             throw SavedObjectsErrorHelpers.createConflictError(type, id);
           } else {
@@ -112,7 +114,7 @@ export class WorkspaceConflictSavedObjectsClientWrapper {
              * We need to check if the options.workspaces is the subset of object.workspaces,
              * Or it will be treated as a conflict
              */
-            const filteredWorkspaces = SavedObjectsUtils.filterWorkspacesAccordingToSourceWorkspaces(
+            const filteredWorkspaces = filterWorkspacesAccordingToSourceWorkspaces(
               options.workspaces,
               object.workspaces
             );
@@ -229,7 +231,7 @@ export class WorkspaceConflictSavedObjectsClientWrapper {
              */
             if (!object.error) {
               let workspaceConflict = false;
-              const filteredWorkspaces = SavedObjectsUtils.filterWorkspacesAccordingToSourceWorkspaces(
+              const filteredWorkspaces = filterWorkspacesAccordingToSourceWorkspaces(
                 options.workspaces,
                 object.workspaces
               );