Revert "[Refractor] Feature flag (#102)"

This reverts commit e2f277c.

src/plugins/workspace/config.ts

@@ -6,6 +6,7 @@
 import { schema, TypeOf } from '@osd/config-schema';
 
 export const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: false }),
   dashboardAdmin: schema.object(
     {
       backendRoles: schema.arrayOf(schema.string(), {
@@ -21,5 +22,3 @@ export const configSchema = schema.object({
 });
 
 export type ConfigSchema = TypeOf<typeof configSchema>;
-
-export const FEATURE_FLAG_KEY_IN_UI_SETTING = 'workspace_enabled';

src/plugins/workspace/public/plugin.ts

@@ -46,16 +46,7 @@ export class WorkspacePlugin implements Plugin<{}, {}, WorkspacePluginSetupDeps>
   public async setup(core: CoreSetup, { savedObjectsManagement }: WorkspacePluginSetupDeps) {
     const workspaceClient = new WorkspaceClient(core.http, core.workspaces);
     workspaceClient.init();
-    const featureFlagResp = await workspaceClient.getSettings();
-    if (featureFlagResp.success) {
-      core.workspaces.workspaceEnabled$.next(featureFlagResp.result.enabled);
-    } else {
-      core.workspaces.workspaceEnabled$.next(false);
-    }
-
-    if (!core.workspaces.workspaceEnabled$.getValue()) {
-      return {};
-    }
+    core.workspaces.workspaceEnabled$.next(true);
 
     core.workspaces.registerWorkspaceMenuRender(renderWorkspaceMenu);
 
@@ -243,9 +234,6 @@ export class WorkspacePlugin implements Plugin<{}, {}, WorkspacePluginSetupDeps>
   }
 
   public start(core: CoreStart) {
-    if (!core.workspaces.workspaceEnabled$.getValue()) {
-      return {};
-    }
     this.coreStart = core;
 
     this.currentWorkspaceSubscription = this._changeSavedObjectCurrentWorkspace();

src/plugins/workspace/public/workspace_client.ts

@@ -331,18 +331,6 @@ export class WorkspaceClient {
     return result;
   }
 
-  public async getSettings(): Promise<
-    IResponse<{
-      enabled: boolean;
-    }>
-  > {
-    const result = await this.safeFetch(this.getPath(['settings']), {
-      method: 'get',
-    });
-
-    return result;
-  }
-
   public stop() {
     this.workspaces.workspaceList$.unsubscribe();
     this.workspaces.currentWorkspaceId$.unsubscribe();

src/plugins/workspace/server/plugin.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { i18n } from '@osd/i18n';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 
 import {
   PluginInitializerContext,
@@ -27,27 +27,18 @@ import { WorkspaceClientWithSavedObject } from './workspace_client';
 import { WorkspaceSavedObjectsClientWrapper } from './saved_objects';
 import { registerRoutes } from './routes';
 import { WORKSPACE_OVERVIEW_APP_ID, WORKSPACE_UPDATE_APP_ID } from '../common/constants';
-import { ConfigSchema, FEATURE_FLAG_KEY_IN_UI_SETTING } from '../config';
+import { ConfigSchema } from '../config';
 
 export class WorkspacePlugin implements Plugin<{}, {}> {
   private readonly logger: Logger;
   private client?: IWorkspaceDBImpl;
-  private coreStart?: CoreStart;
   private config$: Observable<ConfigSchema>;
-  private enabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-
-  private get isEnabled() {
-    return this.enabled$.getValue();
-  }
 
   private proxyWorkspaceTrafficToRealHandler(setupDeps: CoreSetup) {
     /**
      * Proxy all {basePath}/w/{workspaceId}{osdPath*} paths to {basePath}{osdPath*}
      */
     setupDeps.http.registerOnPreRouting(async (request, response, toolkit) => {
-      if (!this.isEnabled) {
-        return toolkit.next();
-      }
       const regexp = /\/w\/([^\/]*)/;
       const matchedResult = request.url.pathname.match(regexp);
 
@@ -90,27 +81,14 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
       http: core.http,
       logger: this.logger,
       client: this.client as IWorkspaceDBImpl,
-      enabled$: this.enabled$,
-      config$: this.config$,
     });
 
-    core.savedObjects.setClientFactoryProvider(
-      (repositoryFactory) => ({ request, includedHiddenTypes }) => {
-        const enabled = this.isEnabled;
-        if (enabled) {
-          return new SavedObjectsClient(repositoryFactory.createInternalRepository());
-        }
-
-        return new SavedObjectsClient(
-          repositoryFactory.createScopedRepository(request, includedHiddenTypes)
-        );
-      }
+    core.savedObjects.setClientFactoryProvider((repositoryFactory) => () =>
+      new SavedObjectsClient(repositoryFactory.createInternalRepository())
     );
 
     return {
       client: this.client,
-      enabled$: this.enabled$,
-      setWorkspaceFeatureFlag: this.setWorkspaceFeatureFlag,
     };
   }
 
@@ -142,11 +120,8 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
     }
   }
 
-  private async setupWorkspaces() {
-    if (!this.coreStart) {
-      throw new Error('UI setting client can not be found');
-    }
-    const internalRepository = this.coreStart.savedObjects.createInternalRepository();
+  private async setupWorkspaces(startDeps: CoreStart) {
+    const internalRepository = startDeps.savedObjects.createInternalRepository();
     this.client?.setInternalRepository(internalRepository);
     const publicWorkspaceACL = new ACL().addPermission(
       [WorkspacePermissionMode.LibraryRead, WorkspacePermissionMode.LibraryWrite],
@@ -188,50 +163,15 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
     ]);
   }
 
-  private async getUISettingClient() {
-    if (!this.coreStart) {
-      throw new Error('UI setting client can not be found');
-    }
-    const { uiSettings, savedObjects } = this.coreStart as CoreStart;
-    const internalRepository = savedObjects.createInternalRepository();
-    const savedObjectClient = new SavedObjectsClient(internalRepository);
-    return uiSettings.asScopedToClient(savedObjectClient);
-  }
-
-  private async setWorkspaceFeatureFlag(featureFlag: boolean) {
-    const uiSettingClient = await this.getUISettingClient();
-    await uiSettingClient.set(FEATURE_FLAG_KEY_IN_UI_SETTING, featureFlag);
-    this.enabled$.next(featureFlag);
-  }
-
-  private async setupWorkspaceFeatureFlag() {
-    const uiSettingClient = await this.getUISettingClient();
-    const workspaceEnabled = await uiSettingClient.get(FEATURE_FLAG_KEY_IN_UI_SETTING);
-    this.enabled$.next(!!workspaceEnabled);
-    return workspaceEnabled;
-  }
-
   public start(core: CoreStart) {
     this.logger.debug('Starting SavedObjects service');
 
-    this.coreStart = core;
-
-    this.setupWorkspaceFeatureFlag();
-
-    this.enabled$.subscribe((enabled) => {
-      if (enabled) {
-        this.setupWorkspaces();
-      }
-    });
+    this.setupWorkspaces(core);
 
     return {
       client: this.client as IWorkspaceDBImpl,
-      enabled$: this.enabled$,
-      setWorkspaceFeatureFlag: this.setWorkspaceFeatureFlag,
     };
   }
 
-  public stop() {
-    this.enabled$.unsubscribe();
-  }
+  public stop() {}
 }

src/plugins/workspace/server/routes/index.ts

@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { schema } from '@osd/config-schema';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
 import { ensureRawRequest } from '../../../../core/server';
 
 import {
@@ -15,7 +13,6 @@ import {
   WorkspacePermissionMode,
 } from '../../../../core/server';
 import { IWorkspaceDBImpl, WorkspaceRoutePermissionItem } from '../types';
-import { ConfigSchema } from '../../config';
 
 const WORKSPACES_API_BASE_URL = '/api/workspaces';
 
@@ -85,14 +82,10 @@ export function registerRoutes({
   client,
   logger,
   http,
-  enabled$,
-  config$,
 }: {
   client: IWorkspaceDBImpl;
   logger: Logger;
   http: CoreSetup['http'];
-  enabled$: BehaviorSubject<boolean>;
-  config$: Observable<ConfigSchema>;
 }) {
   const router = http.createRouter();
   router.post(
@@ -263,23 +256,4 @@ export function registerRoutes({
       return res.ok({ body: result });
     })
   );
-
-  router.get(
-    {
-      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: {
-            ...config,
-            enabled: enabled$.getValue(),
-          },
-        },
-      });
-    })
-  );
 }