Skip to content

Commit 8cb32f4

Browse files
authored
remove legacy uiSettings mixin (#76255) (#76291)
* remove legacy uiSettings mixin * adapt ui_render mixin to use core APIs
1 parent 7acfe79 commit 8cb32f4

File tree

10 files changed

+8
-402
lines changed

10 files changed

+8
-402
lines changed

src/core/server/ui_settings/integration_tests/lib/servers.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ export function getServices() {
7373
httpServerMock.createKibanaRequest()
7474
);
7575

76-
const uiSettings = kbnServer.server.uiSettingsServiceFactory({
77-
savedObjectsClient,
78-
});
76+
const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(
77+
savedObjectsClient
78+
);
7979

8080
services = {
8181
kbnServer,

src/legacy/server/kbn_server.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import { LegacyConfig, ILegacyService, ILegacyInternals } from '../../core/serve
4545
import { UiPlugins } from '../../core/server/plugins';
4646
import { CallClusterWithRequest, ElasticsearchPlugin } from '../core_plugins/elasticsearch';
4747
import { UsageCollectionSetup } from '../../plugins/usage_collection/server';
48-
import { UiSettingsServiceFactoryOptions } from '../../legacy/ui/ui_settings/ui_settings_service_factory';
4948
import { HomeServerPluginSetup } from '../../plugins/home/server';
5049

5150
// lot of legacy code was assuming this type only had these two methods
@@ -78,7 +77,6 @@ declare module 'hapi' {
7877
name: string,
7978
factoryFn: (request: Request) => Record<string, any>
8079
) => void;
81-
uiSettingsServiceFactory: (options?: UiSettingsServiceFactoryOptions) => IUiSettingsClient;
8280
logWithMetadata: (tags: string[], message: string, meta: Record<string, any>) => void;
8381
newPlatform: KbnServer['newPlatform'];
8482
}

src/legacy/ui/ui_mixin.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919

2020
import { uiAppsMixin } from './ui_apps';
2121
import { uiRenderMixin } from './ui_render';
22-
import { uiSettingsMixin } from './ui_settings';
2322

2423
export async function uiMixin(kbnServer) {
2524
await kbnServer.mixin(uiAppsMixin);
26-
await kbnServer.mixin(uiSettingsMixin);
2725
await kbnServer.mixin(uiRenderMixin);
2826
}

src/legacy/ui/ui_render/ui_render_mixin.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { createHash } from 'crypto';
2121
import Boom from 'boom';
2222
import { i18n } from '@kbn/i18n';
2323
import * as UiSharedDeps from '@kbn/ui-shared-deps';
24+
import { KibanaRequest } from '../../../core/server';
2425
import { AppBootstrap } from './bootstrap';
2526
import { getApmConfig } from '../apm';
2627

@@ -79,7 +80,10 @@ export function uiRenderMixin(kbnServer, server, config) {
7980
auth: authEnabled ? { mode: 'try' } : false,
8081
},
8182
async handler(request, h) {
82-
const uiSettings = request.getUiSettingsService();
83+
const soClient = kbnServer.newPlatform.start.core.savedObjects.getScopedClient(
84+
KibanaRequest.from(request)
85+
);
86+
const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(soClient);
8387

8488
const darkMode =
8589
!authEnabled || request.auth.isAuthenticated

src/legacy/ui/ui_settings/index.js

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts

Lines changed: 0 additions & 179 deletions
This file was deleted.

src/legacy/ui/ui_settings/ui_exports_consumer.js

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/legacy/ui/ui_settings/ui_settings_mixin.js

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)