feat: merge

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
ruanyl · Aug 27, 2023 · 11ce883 · 11ce883
1 parent d1e6b90
commit 11ce883
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts
@@ -85,6 +85,19 @@ export class WorkspacePlugin implements Plugin<{}, {}> {
       workspaceSavedObjectsClientWrapper.wrapperFactory
     );
 
+    core.savedObjects.setClientFactoryProvider(
+      (repositoryFactory) => ({ request, includedHiddenTypes }) => {
+        const enabled = this.isEnabled;
+        if (enabled) {
+          return new SavedObjectsClient(repositoryFactory.createInternalRepository());
+        }
+
+        return new SavedObjectsClient(
+          repositoryFactory.createScopedRepository(request, includedHiddenTypes)
+        );
+      }
+    );
+
     this.proxyWorkspaceTrafficToRealHandler(core);
 
     registerRoutes({

diff --git a/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts b/src/plugins/workspace/server/saved_objects/workspace_saved_objects_client_wrapper.ts
@@ -478,7 +478,7 @@ export class WorkspaceSavedObjectsClientWrapper {
 
     const isDashboardAdmin = this.isDashboardAdmin(wrapperOptions.request);
 
-    if (isDashboardAdmin || !this.options.enabled$.getValue()) {
+    if (isDashboardAdmin) {
       return wrapperOptions.client;
     }