Merge branch 'main' into 2.16-restrict-data-source

changelogs/fragments/7279.yml

@@ -0,0 +1,2 @@
+fix:
+- Unassign data source before deleteByWorkspace ([#7279](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7279))

src/plugins/workspace/server/workspace_client.test.ts

@@ -180,4 +180,20 @@ describe('#WorkspaceClient', () => {
 
     expect(mockCheckAndSetDefaultDataSource).toHaveBeenCalledWith(uiSettingsClient, ['id1'], true);
   });
+
+  it('delete# should unassign data source before deleting related saved objects', async () => {
+    const client = new WorkspaceClient(coreSetup, logger);
+    await client.setup(coreSetup);
+    client?.setSavedObjects(savedObjects);
+    client?.setUiSettings(uiSettings);
+
+    await client.delete(mockRequestDetail, mockWorkspaceId);
+
+    expect(deleteFromWorkspaces).toHaveBeenCalledWith(DATA_SOURCE_SAVED_OBJECT_TYPE, 'id1', [
+      mockWorkspaceId,
+    ]);
+    expect(deleteFromWorkspaces).toHaveBeenCalledWith(DATA_SOURCE_SAVED_OBJECT_TYPE, 'id2', [
+      mockWorkspaceId,
+    ]);
+  });
 });

src/plugins/workspace/server/workspace_client.ts

@@ -306,6 +306,21 @@ export class WorkspaceClient implements IWorkspaceClientImpl {
           }),
         };
       }
+
+      // When workspace is to be deleted, unassign all assigned data source before deleting saved object by workspace.
+      const selectedDataSources = await getDataSourcesList(savedObjectClient, [id]);
+      if (selectedDataSources.length > 0) {
+        const promises = [];
+        for (const dataSource of selectedDataSources) {
+          promises.push(
+            savedObjectClient.deleteFromWorkspaces(DATA_SOURCE_SAVED_OBJECT_TYPE, dataSource.id, [
+              id,
+            ])
+          );
+        }
+        await Promise.all(promises);
+      }
+
       await savedObjectClient.deleteByWorkspace(id);
       // delete workspace itself at last, deleteByWorkspace depends on the workspace to do permission check
       await savedObjectClient.delete(WORKSPACE_TYPE, id);