From 4c9e05b7dece2a8399792b6cce45accc680a7b11 Mon Sep 17 00:00:00 2001 From: SuZhou-Joe Date: Sun, 27 Aug 2023 15:27:56 +0800 Subject: [PATCH] feat: merge Signed-off-by: SuZhou-Joe --- src/plugins/workspace/server/plugin.ts | 13 +++++++++++++ .../workspace_saved_objects_client_wrapper.ts | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts index c389b3df3ed1..43d1a850a5cc 100644 --- a/src/plugins/workspace/server/plugin.ts +++ b/src/plugins/workspace/server/plugin.ts @@ -84,6 +84,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 index 901b5e9ed94c..dfd66b712a3e 100644 --- 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 @@ -407,7 +407,7 @@ export class WorkspaceSavedObjectsClientWrapper { const isDashboardAdmin = this.isDashboardAdmin(wrapperOptions.request); - if (isDashboardAdmin || !this.options.enabled$.getValue()) { + if (isDashboardAdmin) { return wrapperOptions.client; }