add updateWorkspaceState

Signed-off-by: tygao <[email protected]>
raintygao · Jul 8, 2024 · a1dc92b · a1dc92b
1 parent 23d1471
commit a1dc92b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/plugins/workspace/server/utils.ts b/src/plugins/workspace/server/utils.ts
@@ -124,13 +124,13 @@ export const checkAndSetDefaultDataSources = async (
   if (dataSources?.length > 0) {
     if (!isNeededCheck) {
       // Create# Will set first data source as default data source.
-      uiSettingsClient.set(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, dataSources[0]);
+      await uiSettingsClient.set(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, dataSources[0]);
     } else {
       // Update will check if default DS still exists.
       const defaultDSId = (await uiSettingsClient.get(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID)) ?? '';
       const isDefaultDSExist = dataSources.indexOf(defaultDSId) > -1;
       if (!isDefaultDSExist) {
-        uiSettingsClient.set(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, dataSources[0]);
+        await uiSettingsClient.set(DEFAULT_DATA_SOURCE_UI_SETTINGS_ID, dataSources[0]);
       }
     }
   }

diff --git a/src/plugins/workspace/server/workspace_client.ts b/src/plugins/workspace/server/workspace_client.ts
@@ -11,8 +11,9 @@ import {
   WorkspaceAttribute,
   SavedObjectsServiceStart,
   UiSettingsServiceStart,
+  WORKSPACE_TYPE,
 } from '../../../core/server';
-import { WORKSPACE_TYPE } from '../../../core/server';
+import { updateWorkspaceState } from '../../../core/server/utils';
 import {
   IWorkspaceClientImpl,
   WorkspaceFindOptions,
@@ -125,9 +126,13 @@ export class WorkspaceClient implements IWorkspaceClientImpl {
         }
       );
       if (dataSources && this.uiSettings && client) {
+        // This is for setting in workspace environment, otherwise uiSettings can't set workspace level value.
+        updateWorkspaceState(requestDetail.request, {
+          requestWorkspaceId: id,
+        });
         // Set first data source as default after creating workspace
         const uiSettingsClient = this.uiSettings.asScopedToClient(client);
-        checkAndSetDefaultDataSources(uiSettingsClient, dataSources, false);
+        await checkAndSetDefaultDataSources(uiSettingsClient, dataSources, false);
       }
 
       return {