feat: some modify

ruanyl · Aug 27, 2023 · d1e6b90 · d1e6b90
1 parent 7832969
commit d1e6b90
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/src/plugins/workspace/public/plugin.ts b/src/plugins/workspace/public/plugin.ts
@@ -54,7 +54,7 @@ export class WorkspacePlugin implements Plugin<{}, {}, WorkspacePluginSetupDeps>
     workspaceClient.init();
     const featureFlagResp = await workspaceClient.getFeatureFlag();
     if (featureFlagResp.success) {
-      core.workspaces.workspaceEnabled$.next(featureFlagResp.result);
+      core.workspaces.workspaceEnabled$.next(featureFlagResp.result.enabled);
     } else {
       core.workspaces.workspaceEnabled$.next(false);
     }

diff --git a/src/plugins/workspace/public/workspace_client.ts b/src/plugins/workspace/public/workspace_client.ts
@@ -329,8 +329,12 @@ export class WorkspaceClient {
     return result;
   }
 
-  public async getFeatureFlag(): Promise<IResponse<boolean>> {
-    const result = await this.safeFetch(this.getPath(['is_workspace_enabled']), {
+  public async getFeatureFlag(): Promise<
+    IResponse<{
+      enabled: boolean;
+    }>
+  > {
+    const result = await this.safeFetch(this.getPath(['settings']), {
       method: 'get',
     });
 

diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts
@@ -92,6 +92,7 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
       logger: this.logger,
       client: this.client as IWorkspaceDBImpl,
       enabled$: this.enabled$,
+      config$: this.config$,
     });
 
     core.savedObjects.setClientFactoryProvider((repositoryFactory) => () =>
@@ -219,6 +220,5 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
 
   public stop() {
     this.enabled$.unsubscribe();
-    clearTimeout(this.loopRequestTimer);
   }
 }
diff --git a/src/plugins/workspace/server/routes/index.ts b/src/plugins/workspace/server/routes/index.ts
@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { schema } from '@osd/config-schema';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { first } from 'rxjs/operators';
 import { ensureRawRequest } from '../../../../core/server';
 
 import {
@@ -14,6 +15,7 @@ import {
   WorkspacePermissionMode,
 } from '../../../../core/server';
 import { IWorkspaceDBImpl, WorkspaceRoutePermissionItem } from '../types';
+import { ConfigSchema } from '../../config';
 
 const WORKSPACES_API_BASE_URL = '/api/workspaces';
 
@@ -84,11 +86,13 @@ export function registerRoutes({
   logger,
   http,
   enabled$,
+  config$,
 }: {
   client: IWorkspaceDBImpl;
   logger: Logger;
   http: CoreSetup['http'];
   enabled$: BehaviorSubject<boolean>;
+  config$: Observable<ConfigSchema>;
 }) {
   const router = http.createRouter();
   router.post(
@@ -261,14 +265,18 @@ export function registerRoutes({
 
   router.get(
     {
-      path: `${WORKSPACES_API_BASE_URL}/is_workspace_enabled`,
+      path: `${WORKSPACES_API_BASE_URL}/settings`,
       validate: {},
     },
     router.handleLegacyErrors(async (context, req, res) => {
+      const config = await config$.pipe(first()).toPromise();
       return res.ok({
         body: {
           success: true,
-          result: enabled$.getValue(),
+          result: {
+            ...config,
+            enabled: enabled$.getValue(),
+          },
         },
       });
     })