Skip to content

Commit

Permalink
[Workspace] Unassign data source before deleteByWorkspace (#7279) (#7284
Browse files Browse the repository at this point in the history
)

* unassign data source before deleteByWorkspace



* Changeset file for PR #7279 created/updated

---------



(cherry picked from commit d67d6ba)

Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed Jul 18, 2024
1 parent 49677e9 commit bbab1ad
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 0 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/7279.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fix:
- Unassign data source before deleteByWorkspace ([#7279](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7279))
16 changes: 16 additions & 0 deletions src/plugins/workspace/server/workspace_client.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]);
});
});
15 changes: 15 additions & 0 deletions src/plugins/workspace/server/workspace_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bbab1ad

Please sign in to comment.