feat: add options.workspace check

Signed-off-by: SuZhou-Joe <[email protected]>
SuZhou-Joe · Sep 21, 2023 · 9f95cb8 · 9f95cb8
1 parent ed9a654
commit 9f95cb8
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
@@ -656,17 +656,26 @@ export class SavedObjectsRepository {
       const { type, id, opensearchRequestIndex } = expectedResult.value;
       const doc = bulkGetResponse?.body.docs[opensearchRequestIndex];
       if (doc?.found) {
-        const transformedObject = this._serializer.rawToSavedObject(doc as SavedObjectsRawDoc);
-        const filteredWorkspaces = SavedObjectsUtils.filterWorkspacesAccordingToBaseWorkspaces(
-          options.workspaces,
-          transformedObject.workspaces
-        );
+        let workspaceConflict = false;
+        if (options.workspaces) {
+          const transformedObject = this._serializer.rawToSavedObject(doc as SavedObjectsRawDoc);
+          const filteredWorkspaces = SavedObjectsUtils.filterWorkspacesAccordingToBaseWorkspaces(
+            options.workspaces,
+            transformedObject.workspaces
+          );
+          if (filteredWorkspaces.length) {
+            workspaceConflict = true;
+          }
+        }
         errors.push({
           id,
           type,
           error: {
             ...errorContent(SavedObjectsErrorHelpers.createConflictError(type, id)),
-            metadata: { isNotOverwritable: !!filteredWorkspaces.length },
+            // @ts-expect-error MultiGetHit._source is optional
+            ...((!this.rawDocExistsInNamespace(doc!, namespace) || workspaceConflict) && {
+              metadata: { isNotOverwritable: true },
+            }),
           },
         });
       }