Provide uiSettings service in NP

docs/development/core/server/kibana-plugin-server.coresetup.md

@@ -19,4 +19,5 @@ export interface CoreSetup
 |  [context](./kibana-plugin-server.coresetup.context.md) | <code>ContextSetup</code> | [ContextSetup](./kibana-plugin-server.contextsetup.md) |
 |  [elasticsearch](./kibana-plugin-server.coresetup.elasticsearch.md) | <code>ElasticsearchServiceSetup</code> | [ElasticsearchServiceSetup](./kibana-plugin-server.elasticsearchservicesetup.md) |
 |  [http](./kibana-plugin-server.coresetup.http.md) | <code>HttpServiceSetup</code> | [HttpServiceSetup](./kibana-plugin-server.httpservicesetup.md) |
+|  [uiSettings](./kibana-plugin-server.coresetup.uisettings.md) | <code>UiSettingsServiceSetup</code> | [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md) |
 

docs/development/core/server/kibana-plugin-server.coresetup.uisettings.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [CoreSetup](./kibana-plugin-server.coresetup.md) &gt; [uiSettings](./kibana-plugin-server.coresetup.uisettings.md)
+
+## CoreSetup.uiSettings property
+
+[UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md)
+
+<b>Signature:</b>
+
+```typescript
+uiSettings: UiSettingsServiceSetup;
+```

docs/development/core/server/kibana-plugin-server.iuisettingsclient.getdefaults.md

@@ -9,5 +9,5 @@ Returns uiSettings default values [UiSettingsParams](./kibana-plugin-server.uise
 <b>Signature:</b>
 
 ```typescript
-getDefaults: () => Record<string, UiSettingsParams>;
+getDefaults: () => Readonly<Record<string, UiSettingsParams>>;
 ```

docs/development/core/server/kibana-plugin-server.iuisettingsclient.md

@@ -4,7 +4,7 @@
 
 ## IUiSettingsClient interface
 
-Service that provides access to the UiSettings stored in elasticsearch.
+Client that provides access to the UiSettings stored in elasticsearch.
 
 <b>Signature:</b>
 
@@ -18,7 +18,7 @@ export interface IUiSettingsClient
 |  --- | --- | --- |
 |  [get](./kibana-plugin-server.iuisettingsclient.get.md) | <code>&lt;T extends SavedObjectAttribute = any&gt;(key: string) =&gt; Promise&lt;T&gt;</code> | Retrieves uiSettings values set by the user with fallbacks to default values if not specified. |
 |  [getAll](./kibana-plugin-server.iuisettingsclient.getall.md) | <code>&lt;T extends SavedObjectAttribute = any&gt;() =&gt; Promise&lt;Record&lt;string, T&gt;&gt;</code> | Retrieves a set of all uiSettings values set by the user with fallbacks to default values if not specified. |
-|  [getDefaults](./kibana-plugin-server.iuisettingsclient.getdefaults.md) | <code>() =&gt; Record&lt;string, UiSettingsParams&gt;</code> | Returns uiSettings default values [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) |
+|  [getDefaults](./kibana-plugin-server.iuisettingsclient.getdefaults.md) | <code>() =&gt; Readonly&lt;Record&lt;string, UiSettingsParams&gt;&gt;</code> | Returns uiSettings default values [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) |
 |  [getUserProvided](./kibana-plugin-server.iuisettingsclient.getuserprovided.md) | <code>&lt;T extends SavedObjectAttribute = any&gt;() =&gt; Promise&lt;Record&lt;string, {</code><br/><code>        userValue?: T;</code><br/><code>        isOverridden?: boolean;</code><br/><code>    }&gt;&gt;</code> | Retrieves a set of all uiSettings values set by the user. |
 |  [isOverridden](./kibana-plugin-server.iuisettingsclient.isoverridden.md) | <code>(key: string) =&gt; boolean</code> | Shows whether the uiSettings value set by the user. |
 |  [remove](./kibana-plugin-server.iuisettingsclient.remove.md) | <code>(key: string) =&gt; Promise&lt;void&gt;</code> | Removes uiSettings value by key. |

docs/development/core/server/kibana-plugin-server.md

@@ -63,7 +63,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [IKibanaSocket](./kibana-plugin-server.ikibanasocket.md) | A tiny abstraction for TCP socket. |
 |  [IndexSettingsDeprecationInfo](./kibana-plugin-server.indexsettingsdeprecationinfo.md) |  |
 |  [IRouter](./kibana-plugin-server.irouter.md) | Registers route handlers for specified resource path and method. See [RouteConfig](./kibana-plugin-server.routeconfig.md) and [RequestHandler](./kibana-plugin-server.requesthandler.md) for more information about arguments to route registrations. |
-|  [IUiSettingsClient](./kibana-plugin-server.iuisettingsclient.md) | Service that provides access to the UiSettings stored in elasticsearch. |
+|  [IUiSettingsClient](./kibana-plugin-server.iuisettingsclient.md) | Client that provides access to the UiSettings stored in elasticsearch. |
 |  [KibanaRequestRoute](./kibana-plugin-server.kibanarequestroute.md) | Request specific route information exposed to a handler. |
 |  [LegacyRequest](./kibana-plugin-server.legacyrequest.md) |  |
 |  [LegacyServiceSetupDeps](./kibana-plugin-server.legacyservicesetupdeps.md) |  |
@@ -114,6 +114,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SessionStorageCookieOptions](./kibana-plugin-server.sessionstoragecookieoptions.md) | Configuration used to create HTTP session storage based on top of cookie mechanism. |
 |  [SessionStorageFactory](./kibana-plugin-server.sessionstoragefactory.md) | SessionStorage factory to bind one to an incoming request |
 |  [UiSettingsParams](./kibana-plugin-server.uisettingsparams.md) | UiSettings parameters defined by the plugins. |
+|  [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md) |  |
 
 ## Variables
 

docs/development/core/server/kibana-plugin-server.requesthandlercontext.core.md

@@ -15,5 +15,8 @@ core: {
             dataClient: IScopedClusterClient;
             adminClient: IScopedClusterClient;
         };
+        uiSettings: {
+            client: IUiSettingsClient;
+        };
     };
 ```

docs/development/core/server/kibana-plugin-server.requesthandlercontext.md

@@ -18,5 +18,5 @@ export interface RequestHandlerContext
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [core](./kibana-plugin-server.requesthandlercontext.core.md) | <code>{</code><br/><code>        savedObjects: {</code><br/><code>            client: SavedObjectsClientContract;</code><br/><code>        };</code><br/><code>        elasticsearch: {</code><br/><code>            dataClient: IScopedClusterClient;</code><br/><code>            adminClient: IScopedClusterClient;</code><br/><code>        };</code><br/><code>    }</code> |  |
+|  [core](./kibana-plugin-server.requesthandlercontext.core.md) | <code>{</code><br/><code>        savedObjects: {</code><br/><code>            client: SavedObjectsClientContract;</code><br/><code>        };</code><br/><code>        elasticsearch: {</code><br/><code>            dataClient: IScopedClusterClient;</code><br/><code>            adminClient: IScopedClusterClient;</code><br/><code>        };</code><br/><code>        uiSettings: {</code><br/><code>            client: IUiSettingsClient;</code><br/><code>        };</code><br/><code>    }</code> |  |
 

docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.md

@@ -0,0 +1,19 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md)
+
+## UiSettingsServiceSetup interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface UiSettingsServiceSetup 
+```
+
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [setDefaults(values)](./kibana-plugin-server.uisettingsservicesetup.setdefaults.md) | Sets settings with default values for the uiSettings. |
+

docs/development/core/server/kibana-plugin-server.uisettingsservicesetup.setdefaults.md

@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-server](./kibana-plugin-server.md) &gt; [UiSettingsServiceSetup](./kibana-plugin-server.uisettingsservicesetup.md) &gt; [setDefaults](./kibana-plugin-server.uisettingsservicesetup.setdefaults.md)
+
+## UiSettingsServiceSetup.setDefaults() method
+
+Sets settings with default values for the uiSettings.
+
+<b>Signature:</b>
+
+```typescript
+setDefaults(values: Record<string, UiSettingsParams>): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  values | <code>Record&lt;string, UiSettingsParams&gt;</code> |  |
+
+<b>Returns:</b>
+
+`void`
+

src/core/server/http/router/response_adapter.ts

@@ -120,7 +120,11 @@ export class HapiResponseAdapter {
     });
 
     error.output.payload.message = getErrorMessage(payload);
-    error.output.payload.attributes = getErrorAttributes(payload);
+
+    const attributes = getErrorAttributes(payload);
+    if (attributes) {
+      error.output.payload.attributes = attributes;
+    }
 
     const headers = kibanaResponse.options.headers;
     if (headers) {

src/core/server/index.ts

@@ -49,7 +49,11 @@ import { PluginsServiceSetup, PluginsServiceStart, PluginOpaqueId } from './plug
 import { ContextSetup } from './context';
 import { SavedObjectsServiceStart } from './saved_objects';
 
-import { InternalUiSettingsServiceSetup } from './ui_settings';
+import {
+  InternalUiSettingsServiceSetup,
+  IUiSettingsClient,
+  UiSettingsServiceSetup,
+} from './ui_settings';
 import { SavedObjectsClientContract } from './saved_objects/types';
 
 export { bootstrap } from './bootstrap';
@@ -171,6 +175,7 @@ export {
   UiSettingsParams,
   InternalUiSettingsServiceSetup,
   UiSettingsType,
+  UiSettingsServiceSetup,
 } from './ui_settings';
 
 export { RecursiveReadonly } from '../utils';
@@ -211,6 +216,9 @@ export interface RequestHandlerContext {
       dataClient: IScopedClusterClient;
       adminClient: IScopedClusterClient;
     };
+    uiSettings: {
+      client: IUiSettingsClient;
+    };
   };
 }
 
@@ -226,6 +234,8 @@ export interface CoreSetup {
   elasticsearch: ElasticsearchServiceSetup;
   /** {@link HttpServiceSetup} */
   http: HttpServiceSetup;
+  /** {@link UiSettingsServiceSetup} */
+  uiSettings: UiSettingsServiceSetup;
 }
 
 /**

src/core/server/legacy/legacy_service.test.ts

@@ -72,7 +72,7 @@ beforeEach(() => {
     core: {
       context: contextServiceMock.createSetupContract(),
       elasticsearch: { legacy: {} } as any,
-      uiSettings: uiSettingsServiceMock.createSetup(),
+      uiSettings: uiSettingsServiceMock.createSetupContract(),
       http: {
         ...httpServiceMock.createSetupContract(),
         auth: {

src/core/server/legacy/legacy_service.ts

@@ -248,6 +248,9 @@ export class LegacyService implements CoreService<LegacyServiceSetup> {
         basePath: setupDeps.core.http.basePath,
         isTlsEnabled: setupDeps.core.http.isTlsEnabled,
       },
+      uiSettings: {
+        setDefaults: setupDeps.core.uiSettings.setDefaults,
+      },
     };
     const coreStart: CoreStart = {};
 

src/core/server/mocks.ts

@@ -22,6 +22,7 @@ import { loggingServiceMock } from './logging/logging_service.mock';
 import { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.mock';
 import { httpServiceMock } from './http/http_service.mock';
 import { contextServiceMock } from './context/context_service.mock';
+import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 
 export { httpServerMock } from './http/http_server.mocks';
 export { sessionStorageMock } from './http/cookie_session_storage.mocks';
@@ -79,10 +80,14 @@ function createCoreSetupMock() {
   };
   httpMock.createRouter.mockImplementation(() => httpService.createRouter(''));
 
+  const uiSettingsMock = {
+    setDefaults: uiSettingsServiceMock.createSetupContract().setDefaults,
+  };
   const mock: MockedKeys<CoreSetup> = {
     context: contextServiceMock.createSetupContract(),
     elasticsearch: elasticsearchServiceMock.createSetupContract(),
     http: httpMock,
+    uiSettings: uiSettingsMock,
   };
 
   return mock;
@@ -94,8 +99,19 @@ function createCoreStartMock() {
   return mock;
 }
 
+function createInternalCoreSetupMock() {
+  const setupDeps = {
+    context: contextServiceMock.createSetupContract(),
+    elasticsearch: elasticsearchServiceMock.createSetupContract(),
+    http: httpServiceMock.createSetupContract(),
+    uiSettings: uiSettingsServiceMock.createSetupContract(),
+  };
+  return setupDeps;
+}
+
 export const coreMock = {
   createSetup: createCoreSetupMock,
   createStart: createCoreStartMock,
+  createInternalSetup: createInternalCoreSetupMock,
   createPluginInitializerContext: pluginInitializerContextMock,
 };

src/core/server/plugins/plugin.test.ts

@@ -24,15 +24,13 @@ import { schema } from '@kbn/config-schema';
 import { Env } from '../config';
 import { getEnvOptions } from '../config/__mocks__/env';
 import { CoreContext } from '../core_context';
+import { coreMock } from '../mocks';
 import { configServiceMock } from '../config/config_service.mock';
-import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 
 import { PluginWrapper } from './plugin';
 import { PluginManifest } from './types';
 import { createPluginInitializerContext, createPluginSetupContext } from './plugin_context';
-import { contextServiceMock } from '../context/context_service.mock';
 
 const mockPluginInitializer = jest.fn();
 const logger = loggingServiceMock.create();
@@ -68,11 +66,7 @@ configService.atPath.mockReturnValue(new BehaviorSubject({ initialize: true }));
 let coreId: symbol;
 let env: Env;
 let coreContext: CoreContext;
-const setupDeps = {
-  context: contextServiceMock.createSetupContract(),
-  elasticsearch: elasticsearchServiceMock.createSetupContract(),
-  http: httpServiceMock.createSetupContract(),
-};
+const setupDeps = coreMock.createInternalSetup();
 beforeEach(() => {
   coreId = Symbol('core');
   env = Env.createDefault(getEnvOptions());

src/core/server/plugins/plugin_context.ts

@@ -123,6 +123,9 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
       basePath: deps.http.basePath,
       isTlsEnabled: deps.http.isTlsEnabled,
     },
+    uiSettings: {
+      setDefaults: deps.uiSettings.setDefaults,
+    },
   };
 }
 

src/core/server/plugins/plugins_service.test.ts

@@ -25,15 +25,13 @@ import { schema } from '@kbn/config-schema';
 
 import { Config, ConfigService, Env, ObjectToConfigAdapter } from '../config';
 import { getEnvOptions } from '../config/__mocks__/env';
-import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
+import { coreMock } from '../mocks';
 import { loggingServiceMock } from '../logging/logging_service.mock';
 import { PluginDiscoveryError } from './discovery';
 import { PluginWrapper } from './plugin';
 import { PluginsService } from './plugins_service';
 import { PluginsSystem } from './plugins_system';
 import { config } from './plugins_config';
-import { contextServiceMock } from '../context/context_service.mock';
 
 const MockPluginsSystem: jest.Mock<PluginsSystem> = PluginsSystem as any;
 
@@ -42,11 +40,7 @@ let configService: ConfigService;
 let coreId: symbol;
 let env: Env;
 let mockPluginSystem: jest.Mocked<PluginsSystem>;
-const setupDeps = {
-  context: contextServiceMock.createSetupContract(),
-  elasticsearch: elasticsearchServiceMock.createSetupContract(),
-  http: httpServiceMock.createSetupContract(),
-};
+const setupDeps = coreMock.createInternalSetup();
 const logger = loggingServiceMock.create();
 
 ['path-1', 'path-2', 'path-3', 'path-4', 'path-5'].forEach(path => {

src/core/server/plugins/plugins_service.ts

@@ -21,15 +21,14 @@ import { Observable } from 'rxjs';
 import { filter, first, map, mergeMap, tap, toArray } from 'rxjs/operators';
 import { CoreService } from '../../types';
 import { CoreContext } from '../core_context';
-import { InternalElasticsearchServiceSetup } from '../elasticsearch';
-import { InternalHttpServiceSetup } from '../http';
+
 import { Logger } from '../logging';
 import { discover, PluginDiscoveryError, PluginDiscoveryErrorType } from './discovery';
 import { PluginWrapper } from './plugin';
 import { DiscoveredPlugin, DiscoveredPluginInternal, PluginName } from './types';
 import { PluginsConfig, PluginsConfigType } from './plugins_config';
 import { PluginsSystem } from './plugins_system';
-import { ContextSetup } from '../context';
+import { InternalCoreSetup } from '..';
 
 /** @public */
 export interface PluginsServiceSetup {
@@ -46,11 +45,7 @@ export interface PluginsServiceStart {
 }
 
 /** @internal */
-export interface PluginsServiceSetupDeps {
-  context: ContextSetup;
-  elasticsearch: InternalElasticsearchServiceSetup;
-  http: InternalHttpServiceSetup;
-}
+export type PluginsServiceSetupDeps = InternalCoreSetup;
 
 /** @internal */
 export interface PluginsServiceStartDeps {} // eslint-disable-line @typescript-eslint/no-empty-interface

src/core/server/plugins/plugins_system.test.ts

@@ -28,13 +28,13 @@ import { Env } from '../config';
 import { getEnvOptions } from '../config/__mocks__/env';
 import { CoreContext } from '../core_context';
 import { configServiceMock } from '../config/config_service.mock';
-import { elasticsearchServiceMock } from '../elasticsearch/elasticsearch_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
 import { loggingServiceMock } from '../logging/logging_service.mock';
+
 import { PluginWrapper } from './plugin';
 import { PluginName } from './types';
 import { PluginsSystem } from './plugins_system';
-import { contextServiceMock } from '../context/context_service.mock';
+
+import { coreMock } from '../mocks';
 
 const logger = loggingServiceMock.create();
 function createPlugin(
@@ -67,11 +67,8 @@ const configService = configServiceMock.create();
 configService.atPath.mockReturnValue(new BehaviorSubject({ initialize: true }));
 let env: Env;
 let coreContext: CoreContext;
-const setupDeps = {
-  context: contextServiceMock.createSetupContract(),
-  elasticsearch: elasticsearchServiceMock.createSetupContract(),
-  http: httpServiceMock.createSetupContract(),
-};
+const setupDeps = coreMock.createInternalSetup();
+
 beforeEach(() => {
   env = Env.createDefault(getEnvOptions());