diff --git a/packages/core/rendering/core-rendering-server-internal/src/render_utils.ts b/packages/core/rendering/core-rendering-server-internal/src/render_utils.ts index c64bf337adf942f..5d8eca5b201e249 100644 --- a/packages/core/rendering/core-rendering-server-internal/src/render_utils.ts +++ b/packages/core/rendering/core-rendering-server-internal/src/render_utils.ts @@ -8,13 +8,13 @@ import UiSharedDepsNpm from '@kbn/ui-shared-deps-npm'; import * as UiSharedDepsSrc from '@kbn/ui-shared-deps-src'; -import type { PublicUiSettingsParams, UserProvidedValues } from '@kbn/core-ui-settings-common'; +import type { UiSettingsParams, UserProvidedValues } from '@kbn/core-ui-settings-common'; export const getSettingValue = ( settingName: string, settings: { user?: Record>; - defaults: Readonly>; + defaults: Readonly>>; }, convert: (raw: unknown) => T ): T => { diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts index 17630ab5dda8dfb..ac74201e0f307fb 100644 --- a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts +++ b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts @@ -10,8 +10,12 @@ import { cloneDeep, defaultsDeep } from 'lodash'; import { Observable, Subject, concat, defer, of } from 'rxjs'; import { filter, map } from 'rxjs/operators'; -import { UserProvidedValues, PublicUiSettingsParams } from '@kbn/core-ui-settings-common'; -import { IUiSettingsClient, UiSettingsState } from '@kbn/core-ui-settings-browser'; +import { UserProvidedValues } from '@kbn/core-ui-settings-common'; +import { + IUiSettingsClient, + UiSettingsState, + PublicUiSettingsParams, +} from '@kbn/core-ui-settings-browser'; import { UiSettingsApi } from './ui_settings_api'; diff --git a/packages/core/ui-settings/core-ui-settings-browser/index.ts b/packages/core/ui-settings/core-ui-settings-browser/index.ts index aadb4999ed5f58d..538f02964ed3d67 100644 --- a/packages/core/ui-settings/core-ui-settings-browser/index.ts +++ b/packages/core/ui-settings/core-ui-settings-browser/index.ts @@ -6,4 +6,10 @@ * Side Public License, v 1. */ -export type { UiSettingsState, IUiSettingsClient, SettingsStart, SettingsSetup } from './src/types'; +export type { + PublicUiSettingsParams, + UiSettingsState, + IUiSettingsClient, + SettingsStart, + SettingsSetup, +} from './src/types'; diff --git a/packages/core/ui-settings/core-ui-settings-browser/src/types.ts b/packages/core/ui-settings/core-ui-settings-browser/src/types.ts index d722fb158cb51ce..1227df23092657b 100644 --- a/packages/core/ui-settings/core-ui-settings-browser/src/types.ts +++ b/packages/core/ui-settings/core-ui-settings-browser/src/types.ts @@ -7,7 +7,9 @@ */ import type { Observable } from 'rxjs'; -import type { PublicUiSettingsParams, UserProvidedValues } from '@kbn/core-ui-settings-common'; +import type { UiSettingsParams, UserProvidedValues } from '@kbn/core-ui-settings-common'; + +export type PublicUiSettingsParams = Omit; /** @public */ export interface UiSettingsState { diff --git a/packages/core/ui-settings/core-ui-settings-common/index.ts b/packages/core/ui-settings/core-ui-settings-common/index.ts index 26a1450d3a28a36..3f94ad9799415f8 100644 --- a/packages/core/ui-settings/core-ui-settings-common/index.ts +++ b/packages/core/ui-settings/core-ui-settings-common/index.ts @@ -10,7 +10,6 @@ export type { UiSettingsType, DeprecationSettings, UiSettingsParams, - PublicUiSettingsParams, UserProvidedValues, UiSettingsScope, } from './src/ui_settings'; diff --git a/packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts b/packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts index a9de76efd907a7c..9a4cf094433d4c3 100644 --- a/packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts +++ b/packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts @@ -94,12 +94,6 @@ export interface UiSettingsParams { scope?: UiSettingsScope; } -/** - * A sub-set of {@link UiSettingsParams} exposed to the client-side. - * @public - * */ -export type PublicUiSettingsParams = Omit; - /** * Describes the values explicitly set by user. * @public diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/base_ui_settings_client.ts b/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/base_ui_settings_client.ts index 27c7bccefb8356b..2d6e2d93a431365 100644 --- a/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/base_ui_settings_client.ts +++ b/packages/core/ui-settings/core-ui-settings-server-internal/src/clients/base_ui_settings_client.ts @@ -8,11 +8,7 @@ import { omit } from 'lodash'; import type { Logger } from '@kbn/logging'; -import type { - UiSettingsParams, - PublicUiSettingsParams, - UserProvidedValues, -} from '@kbn/core-ui-settings-common'; +import type { UiSettingsParams, UserProvidedValues } from '@kbn/core-ui-settings-common'; import type { IUiSettingsClient } from '@kbn/core-ui-settings-server'; export interface BaseUiSettingsDefaultsClientOptions { @@ -42,7 +38,7 @@ export abstract class BaseUiSettingsClient implements IUiSettingsClient { } getRegistered() { - const copiedDefaults: Record = {}; + const copiedDefaults: Record> = {}; for (const [key, value] of Object.entries(this.defaults)) { copiedDefaults[key] = omit(value, 'schema'); } diff --git a/packages/core/ui-settings/core-ui-settings-server/src/ui_settings_client.ts b/packages/core/ui-settings/core-ui-settings-server/src/ui_settings_client.ts index fa8022be605c53f..9a297109002de15 100644 --- a/packages/core/ui-settings/core-ui-settings-server/src/ui_settings_client.ts +++ b/packages/core/ui-settings/core-ui-settings-server/src/ui_settings_client.ts @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import type { UserProvidedValues, PublicUiSettingsParams } from '@kbn/core-ui-settings-common'; +import type { UserProvidedValues, UiSettingsParams } from '@kbn/core-ui-settings-common'; /** * Server-side client that provides access to the advanced settings stored in elasticsearch. @@ -20,7 +20,7 @@ export interface IUiSettingsClient { /** * Returns registered uiSettings values {@link UiSettingsParams} */ - getRegistered: () => Readonly>; + getRegistered: () => Readonly>>; /** * Retrieves uiSettings values set by the user with fallbacks to default values if not specified. */ diff --git a/src/core/public/index.ts b/src/core/public/index.ts index 643bc705814a00a..106a057079dcb9f 100644 --- a/src/core/public/index.ts +++ b/src/core/public/index.ts @@ -34,7 +34,11 @@ export type { FatalErrorsStart, FatalErrorInfo, } from '@kbn/core-fatal-errors-browser'; -export type { UiSettingsState, IUiSettingsClient } from '@kbn/core-ui-settings-browser'; +export type { + UiSettingsState, + IUiSettingsClient, + PublicUiSettingsParams, +} from '@kbn/core-ui-settings-browser'; export type { Capabilities } from '@kbn/core-capabilities-common'; export type { SavedObjectsStart } from '@kbn/core-saved-objects-browser'; export type { NotificationsSetup, NotificationsStart } from '@kbn/core-notifications-browser'; @@ -76,7 +80,6 @@ export { } from '@kbn/core-application-common'; export type { UiSettingsParams, - PublicUiSettingsParams, UserProvidedValues, UiSettingsType, } from '@kbn/core-ui-settings-common'; diff --git a/src/core/server/index.ts b/src/core/server/index.ts index 3364f4e4026e167..22398843324d289 100644 --- a/src/core/server/index.ts +++ b/src/core/server/index.ts @@ -389,7 +389,6 @@ export type { export type { UiSettingsParams, - PublicUiSettingsParams, UiSettingsType, UserProvidedValues, DeprecationSettings, diff --git a/src/core/types/index.ts b/src/core/types/index.ts index be6378351a30350..0ad4b4a966009fd 100644 --- a/src/core/types/index.ts +++ b/src/core/types/index.ts @@ -23,6 +23,5 @@ export type { UiSettingsType, DeprecationSettings, UiSettingsParams, - PublicUiSettingsParams, UserProvidedValues, } from '@kbn/core-ui-settings-common';