github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Migrates core uiSettings client-side service to packages (#136354)

Browse source
This commit is contained in:
Christiane (Tina) Heiligers 2022-07-14 09:59:24 -07:00 • committed by GitHub
parent 17daa51d82
commit 8e7d411aa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 927 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
package.json
View file

@ -208,9 +208,14 @@
"@kbn/core-preboot-server": "link:bazel-bin/packages/core/preboot/core-preboot-server",
"@kbn/core-preboot-server-internal": "link:bazel-bin/packages/core/preboot/core-preboot-server-internal",
"@kbn/core-preboot-server-mocks": "link:bazel-bin/packages/core/preboot/core-preboot-server-mocks",
"@kbn/core-test-helpers-http-setup-browser": "link:bazel-bin/packages/core/test-helpers/core-test-helpers-http-setup-browser",
"@kbn/core-theme-browser": "link:bazel-bin/packages/core/theme/core-theme-browser",
"@kbn/core-theme-browser-internal": "link:bazel-bin/packages/core/theme/core-theme-browser-internal",
"@kbn/core-theme-browser-mocks": "link:bazel-bin/packages/core/theme/core-theme-browser-mocks",
"@kbn/core-ui-settings-browser": "link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser",
"@kbn/core-ui-settings-browser-internal": "link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser-internal",
"@kbn/core-ui-settings-browser-mocks": "link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser-mocks",
"@kbn/core-ui-settings-common": "link:bazel-bin/packages/core/ui-settings/core-ui-settings-common",
"@kbn/crypto": "link:bazel-bin/packages/kbn-crypto",
"@kbn/crypto-browser": "link:bazel-bin/packages/kbn-crypto-browser",
"@kbn/datemath": "link:bazel-bin/packages/kbn-datemath",
@ -791,9 +796,14 @@
"@types/kbn__core-preboot-server-mocks": "link:bazel-bin/packages/core/preboot/core-preboot-server-mocks/npm_module_types",
"@types/kbn__core-public-internal-base": "link:bazel-bin/packages/core/public/internal-base/npm_module_types",
"@types/kbn__core-server-internal-base": "link:bazel-bin/packages/core/server/internal-base/npm_module_types",
"@types/kbn__core-test-helpers-http-setup-browser": "link:bazel-bin/packages/core/test-helpers/core-test-helpers-http-setup-browser/npm_module_types",
"@types/kbn__core-theme-browser": "link:bazel-bin/packages/core/theme/core-theme-browser/npm_module_types",
"@types/kbn__core-theme-browser-internal": "link:bazel-bin/packages/core/theme/core-theme-browser-internal/npm_module_types",
"@types/kbn__core-theme-browser-mocks": "link:bazel-bin/packages/core/theme/core-theme-browser-mocks/npm_module_types",
"@types/kbn__core-ui-settings-browser": "link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser/npm_module_types",
"@types/kbn__core-ui-settings-browser-internal": "link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser-internal/npm_module_types",
"@types/kbn__core-ui-settings-browser-mocks": "link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser-mocks/npm_module_types",
"@types/kbn__core-ui-settings-common": "link:bazel-bin/packages/core/ui-settings/core-ui-settings-common/npm_module_types",
"@types/kbn__crypto": "link:bazel-bin/packages/kbn-crypto/npm_module_types",
"@types/kbn__crypto-browser": "link:bazel-bin/packages/kbn-crypto-browser/npm_module_types",
"@types/kbn__datemath": "link:bazel-bin/packages/kbn-datemath/npm_module_types",

10
packages/BUILD.bazel
View file

@ -76,9 +76,14 @@ filegroup(
"//packages/core/preboot/core-preboot-server-internal:build",
"//packages/core/preboot/core-preboot-server-mocks:build",
"//packages/core/preboot/core-preboot-server:build",
"//packages/core/test-helpers/core-test-helpers-http-setup-browser:build",
"//packages/core/theme/core-theme-browser-internal:build",
"//packages/core/theme/core-theme-browser-mocks:build",
"//packages/core/theme/core-theme-browser:build",
"//packages/core/ui-settings/core-ui-settings-browser-internal:build",
"//packages/core/ui-settings/core-ui-settings-browser-mocks:build",
"//packages/core/ui-settings/core-ui-settings-browser:build",
"//packages/core/ui-settings/core-ui-settings-common:build",
"//packages/elastic-apm-synthtrace:build",
"//packages/elastic-safer-lodash-set:build",
"//packages/home/sample_data_cards:build",
@ -277,9 +282,14 @@ filegroup(
"//packages/core/preboot/core-preboot-server-internal:build_types",
"//packages/core/preboot/core-preboot-server-mocks:build_types",
"//packages/core/preboot/core-preboot-server:build_types",
"//packages/core/test-helpers/core-test-helpers-http-setup-browser:build_types",
"//packages/core/theme/core-theme-browser-internal:build_types",
"//packages/core/theme/core-theme-browser-mocks:build_types",
"//packages/core/theme/core-theme-browser:build_types",
"//packages/core/ui-settings/core-ui-settings-browser-internal:build_types",
"//packages/core/ui-settings/core-ui-settings-browser-mocks:build_types",
"//packages/core/ui-settings/core-ui-settings-browser:build_types",
"//packages/core/ui-settings/core-ui-settings-common:build_types",
"//packages/elastic-apm-synthtrace:build_types",
"//packages/elastic-safer-lodash-set:build_types",
"//packages/home/sample_data_cards:build_types",

113
packages/core/test-helpers/core-test-helpers-http-setup-browser/BUILD.bazel Normal file
View file

@ -0,0 +1,113 @@
load("@npm//@bazel/typescript:index.bzl", "ts_config")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
PKG_DIRNAME = "core-test-helpers-http-setup-browser"
PKG_REQUIRE_NAME = "@kbn/core-test-helpers-http-setup-browser"
SOURCE_FILES = glob(
[
"src/**/*.ts",
"src/**/*.tsx",
],
exclude = [
"**/*.test.*",
"**/*.stories.*",
],
)
SRCS = SOURCE_FILES
filegroup(
name = "srcs",
srcs = SRCS,
)
NPM_MODULE_EXTRA_FILES = [
"package.json",
]
RUNTIME_DEPS = [
"//packages/core/execution-context/core-execution-context-browser-mocks",
"//packages/core/fatal-errors/core-fatal-errors-browser-mocks",
"//packages/core/injected-metadata/core-injected-metadata-browser-mocks",
"//packages/core/http/core-http-browser-internal"
]
TYPES_DEPS = [
"@npm//@types/node",
"@npm//@types/jest",
"//packages/core/execution-context/core-execution-context-browser-mocks:npm_module_types",
"//packages/core/fatal-errors/core-fatal-errors-browser-mocks:npm_module_types",
"//packages/core/injected-metadata/core-injected-metadata-browser-mocks:npm_module_types",
"//packages/core/http/core-http-browser-internal:npm_module_types"
]
jsts_transpiler(
name = "target_node",
srcs = SRCS,
build_pkg_name = package_name(),
)
jsts_transpiler(
name = "target_web",
srcs = SRCS,
build_pkg_name = package_name(),
web = True,
)
ts_config(
name = "tsconfig",
src = "tsconfig.json",
deps = [
"//:tsconfig.base.json",
"//:tsconfig.bazel.json",
],
)
ts_project(
name = "tsc_types",
args = ['--pretty'],
srcs = SRCS,
deps = TYPES_DEPS,
declaration = True,
declaration_map = True,
emit_declaration_only = True,
out_dir = "target_types",
root_dir = "src",
tsconfig = ":tsconfig",
)
js_library(
name = PKG_DIRNAME,
srcs = NPM_MODULE_EXTRA_FILES,
deps = RUNTIME_DEPS + [":target_node", ":target_web"],
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)
pkg_npm(
name = "npm_module",
deps = [":" + PKG_DIRNAME],
)
filegroup(
name = "build",
srcs = [":npm_module"],
visibility = ["//visibility:public"],
)
pkg_npm_types(
name = "npm_module_types",
srcs = SRCS,
deps = [":tsc_types"],
package_name = PKG_REQUIRE_NAME,
tsconfig = ":tsconfig",
visibility = ["//visibility:public"],
)
filegroup(
name = "build_types",
srcs = [":npm_module_types"],
visibility = ["//visibility:public"],
)

3
packages/core/test-helpers/core-test-helpers-http-setup-browser/README.md Normal file
View file

@ -0,0 +1,3 @@
# @kbn/core-test-helpers-http-setup-browser
This package contains Core's browser-side test helpers.

13
packages/core/test-helpers/core-test-helpers-http-setup-browser/jest.config.js Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
module.exports = {
preset: '@kbn/test',
rootDir: '../../../..',
roots: ['<rootDir>/packages/core/test-helpers/core-test-helpers-http-setup-browser'],
};

8
packages/core/test-helpers/core-test-helpers-http-setup-browser/package.json Normal file
View file

@ -0,0 +1,8 @@
{
"name": "@kbn/core-test-helpers-http-setup-browser",
"private": true,
"version": "1.0.0",
"main": "./target_node/index.js",
"browser": "./target_web/index.js",
"license": "SSPL-1.0 OR Elastic License 2.0"
}

0
src/core/test_helpers/http_test_setup.ts → packages/core/test-helpers/core-test-helpers-http-setup-browser/src/http_test_setup.ts
View file

10
packages/core/test-helpers/core-test-helpers-http-setup-browser/src/index.ts Normal file
View file

@ -0,0 +1,10 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
export type { SetupTap } from './http_test_setup';
export { setup } from './http_test_setup';

18
packages/core/test-helpers/core-test-helpers-http-setup-browser/tsconfig.json Normal file
View file

@ -0,0 +1,18 @@
{
"extends": "../../../../tsconfig.bazel.json",
"compilerOptions": {
"declaration": true,
"declarationMap": true,
"emitDeclarationOnly": true,
"outDir": "target_types",
"rootDir": "src",
"stripInternal": false,
"types": [
"jest",
"node"
]
},
"include": [
"src/**/*"
]
}

113
packages/core/ui-settings/core-ui-settings-browser-internal/BUILD.bazel Normal file
View file

@ -0,0 +1,113 @@
load("@npm//@bazel/typescript:index.bzl", "ts_config")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
PKG_DIRNAME = "core-ui-settings-browser-internal"
PKG_REQUIRE_NAME = "@kbn/core-ui-settings-browser-internal"
SOURCE_FILES = glob(
[
"src/**/*.ts",
"src/**/*.tsx",
],
exclude = [
"**/*.test.*",
"**/*.stories.*",
],
)
SRCS = SOURCE_FILES
filegroup(
name = "srcs",
srcs = SRCS,
)
NPM_MODULE_EXTRA_FILES = [
"package.json",
]
RUNTIME_DEPS = [
"@npm//rxjs",
"@npm//lodash",
"//packages/core/test-helpers/core-test-helpers-http-setup-browser"
]
TYPES_DEPS = [
"@npm//@types/node",
"@npm//@types/jest",
"@npm//rxjs",
"@npm//lodash",
"//packages/core/test-helpers/core-test-helpers-http-setup-browser:npm_module_types",
"//packages/core/http/core-http-browser:npm_module_types",
"//packages/core/ui-settings/core-ui-settings-browser:npm_module_types"
]
jsts_transpiler(
name = "target_node",
srcs = SRCS,
build_pkg_name = package_name(),
)
jsts_transpiler(
name = "target_web",
srcs = SRCS,
build_pkg_name = package_name(),
web = True,
)
ts_config(
name = "tsconfig",
src = "tsconfig.json",
deps = [
"//:tsconfig.base.json",
"//:tsconfig.bazel.json",
],
)
ts_project(
name = "tsc_types",
args = ['--pretty'],
srcs = SRCS,
deps = TYPES_DEPS,
declaration = True,
declaration_map = True,
emit_declaration_only = True,
out_dir = "target_types",
root_dir = "src",
tsconfig = ":tsconfig",
)
js_library(
name = PKG_DIRNAME,
srcs = NPM_MODULE_EXTRA_FILES,
deps = RUNTIME_DEPS + [":target_node", ":target_web"],
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)
pkg_npm(
name = "npm_module",
deps = [":" + PKG_DIRNAME],
)
filegroup(
name = "build",
srcs = [":npm_module"],
visibility = ["//visibility:public"],
)
pkg_npm_types(
name = "npm_module_types",
srcs = SRCS,
deps = [":tsc_types"],
package_name = PKG_REQUIRE_NAME,
tsconfig = ":tsconfig",
visibility = ["//visibility:public"],
)
filegroup(
name = "build_types",
srcs = [":npm_module_types"],
visibility = ["//visibility:public"],
)

3
packages/core/ui-settings/core-ui-settings-browser-internal/README.md Normal file
View file

@ -0,0 +1,3 @@
# @kbn/core-ui-settings-browser-internal
This package contains the internal types and implementation for Core's browser-side uiSettings service.

13
packages/core/ui-settings/core-ui-settings-browser-internal/jest.config.js Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
module.exports = {
preset: '@kbn/test',
rootDir: '../../../..',
roots: ['<rootDir>/packages/core/ui-settings/core-ui-settings-browser-internal'],
};

8
packages/core/ui-settings/core-ui-settings-browser-internal/package.json Normal file
View file

@ -0,0 +1,8 @@
{
"name": "@kbn/core-ui-settings-browser-internal",
"private": true,
"version": "1.0.0",
"main": "./target_node/index.js",
"browser": "./target_web/index.js",
"license": "SSPL-1.0 OR Elastic License 2.0"
}

0
src/core/public/ui_settings/__snapshots__/ui_settings_api.test.ts.snap → packages/core/ui-settings/core-ui-settings-browser-internal/src/__snapshots__/ui_settings_api.test.ts.snap generated
View file

0
src/core/public/ui_settings/__snapshots__/ui_settings_client.test.ts.snap → packages/core/ui-settings/core-ui-settings-browser-internal/src/__snapshots__/ui_settings_client.test.ts.snap generated
View file

1
src/core/public/ui_settings/index.ts → packages/core/ui-settings/core-ui-settings-browser-internal/src/index.ts
View file

@ -8,4 +8,3 @@
export { UiSettingsService } from './ui_settings_service';
export type { UiSettingsClient } from './ui_settings_client';
export type { UiSettingsState, IUiSettingsClient } from './types';

2
src/core/public/ui_settings/ui_settings_api.test.ts → packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.test.ts
View file

@ -11,7 +11,7 @@ import fetchMock from 'fetch-mock/es5/client';
import * as Rx from 'rxjs';
import { takeUntil, toArray } from 'rxjs/operators';
import { setup as httpSetup } from '../../test_helpers/http_test_setup';
import { setup as httpSetup } from '@kbn/core-test-helpers-http-setup-browser';
import { UiSettingsApi } from './ui_settings_api';
function setup() {

2
src/core/public/ui_settings/ui_settings_api.ts → packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.ts
View file

@ -9,7 +9,7 @@
import { BehaviorSubject } from 'rxjs';
import type { HttpSetup } from '@kbn/core-http-browser';
import type { UiSettingsState } from './types';
import type { UiSettingsState } from '@kbn/core-ui-settings-browser';
export interface UiSettingsApiResponse {
settings: UiSettingsState;

0
src/core/public/ui_settings/ui_settings_client.test.ts → packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.test.ts
View file

4
src/core/public/ui_settings/ui_settings_client.ts → packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.ts
View file

@ -10,8 +10,8 @@ import { cloneDeep, defaultsDeep } from 'lodash';
import { Observable, Subject, concat, defer, of } from 'rxjs';
import { filter, map } from 'rxjs/operators';
import { UserProvidedValues, PublicUiSettingsParams } from '../../server/types';
import { IUiSettingsClient, UiSettingsState } from './types';
import { UserProvidedValues, PublicUiSettingsParams } from '@kbn/core-ui-settings-common';
import { IUiSettingsClient, UiSettingsState } from '@kbn/core-ui-settings-browser';
import { UiSettingsApi } from './ui_settings_api';

0
src/core/public/ui_settings/ui_settings_service.test.ts → packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_service.test.ts
View file

2
src/core/public/ui_settings/ui_settings_service.ts → packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_service.ts
View file

@ -11,9 +11,9 @@ import { Subject } from 'rxjs';
import type { InternalInjectedMetadataSetup } from '@kbn/core-injected-metadata-browser-internal';
import type { HttpSetup } from '@kbn/core-http-browser';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { UiSettingsApi } from './ui_settings_api';
import { UiSettingsClient } from './ui_settings_client';
import type { IUiSettingsClient } from './types';
export interface UiSettingsServiceDeps {
http: HttpSetup;

18
packages/core/ui-settings/core-ui-settings-browser-internal/tsconfig.json Normal file
View file

@ -0,0 +1,18 @@
{
"extends": "../../../../tsconfig.bazel.json",
"compilerOptions": {
"declaration": true,
"declarationMap": true,
"emitDeclarationOnly": true,
"outDir": "target_types",
"rootDir": "src",
"stripInternal": false,
"types": [
"jest",
"node"
]
},
"include": [
"src/**/*"
]
}

111
packages/core/ui-settings/core-ui-settings-browser-mocks/BUILD.bazel Normal file
View file

@ -0,0 +1,111 @@
load("@npm//@bazel/typescript:index.bzl", "ts_config")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
PKG_DIRNAME = "core-ui-settings-browser-mocks"
PKG_REQUIRE_NAME = "@kbn/core-ui-settings-browser-mocks"
SOURCE_FILES = glob(
[
"src/**/*.ts",
"src/**/*.tsx",
],
exclude = [
"**/*.test.*",
"**/*.stories.*",
],
)
SRCS = SOURCE_FILES
filegroup(
name = "srcs",
srcs = SRCS,
)
NPM_MODULE_EXTRA_FILES = [
"package.json",
]
RUNTIME_DEPS = [
"@npm//rxjs",
"//packages/core/ui-settings/core-ui-settings-browser-internal"
]
TYPES_DEPS = [
"@npm//@types/node",
"@npm//@types/jest",
"@npm//rxjs",
"//packages/kbn-utility-types:npm_module_types",
"//packages/core/ui-settings/core-ui-settings-browser-internal:npm_module_types",
"//packages/core/ui-settings/core-ui-settings-browser:npm_module_types",
]
jsts_transpiler(
name = "target_node",
srcs = SRCS,
build_pkg_name = package_name(),
)
jsts_transpiler(
name = "target_web",
srcs = SRCS,
build_pkg_name = package_name(),
web = True,
)
ts_config(
name = "tsconfig",
src = "tsconfig.json",
deps = [
"//:tsconfig.base.json",
"//:tsconfig.bazel.json",
],
)
ts_project(
name = "tsc_types",
args = ['--pretty'],
srcs = SRCS,
deps = TYPES_DEPS,
declaration = True,
declaration_map = True,
emit_declaration_only = True,
out_dir = "target_types",
root_dir = "src",
tsconfig = ":tsconfig",
)
js_library(
name = PKG_DIRNAME,
srcs = NPM_MODULE_EXTRA_FILES,
deps = RUNTIME_DEPS + [":target_node", ":target_web"],
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)
pkg_npm(
name = "npm_module",
deps = [":" + PKG_DIRNAME],
)
filegroup(
name = "build",
srcs = [":npm_module"],
visibility = ["//visibility:public"],
)
pkg_npm_types(
name = "npm_module_types",
srcs = SRCS,
deps = [":tsc_types"],
package_name = PKG_REQUIRE_NAME,
tsconfig = ":tsconfig",
visibility = ["//visibility:public"],
)
filegroup(
name = "build_types",
srcs = [":npm_module_types"],
visibility = ["//visibility:public"],
)

3
packages/core/ui-settings/core-ui-settings-browser-mocks/README.md Normal file
View file

@ -0,0 +1,3 @@
# @kbn/core-ui-settings-browser-mocks
This package contains the mocks for the browser-side uiSettings service.

13
packages/core/ui-settings/core-ui-settings-browser-mocks/jest.config.js Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
module.exports = {
preset: '@kbn/test',
rootDir: '../../../..',
roots: ['<rootDir>/packages/core/ui-settings/core-ui-settings-browser-mocks'],
};

8
packages/core/ui-settings/core-ui-settings-browser-mocks/package.json Normal file
View file

@ -0,0 +1,8 @@
{
"name": "@kbn/core-ui-settings-browser-mocks",
"private": true,
"version": "1.0.0",
"main": "./target_node/index.js",
"browser": "./target_web/index.js",
"license": "SSPL-1.0 OR Elastic License 2.0"
}

9
packages/core/ui-settings/core-ui-settings-browser-mocks/src/index.ts Normal file
View file

@ -0,0 +1,9 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
export { uiSettingsServiceMock } from './ui_settings_service.mock';

4
src/core/public/ui_settings/ui_settings_service.mock.ts → packages/core/ui-settings/core-ui-settings-browser-mocks/src/ui_settings_service.mock.ts
View file

@ -8,8 +8,8 @@
import * as Rx from 'rxjs';
import type { PublicMethodsOf } from '@kbn/utility-types';
import { UiSettingsService } from '.';
import { IUiSettingsClient } from './types';
import type { UiSettingsService } from '@kbn/core-ui-settings-browser-internal';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
const createSetupContractMock = () => {
const setupContract: jest.Mocked<IUiSettingsClient> = {

18
packages/core/ui-settings/core-ui-settings-browser-mocks/tsconfig.json Normal file
View file

@ -0,0 +1,18 @@
{
"extends": "../../../../tsconfig.bazel.json",
"compilerOptions": {
"declaration": true,
"declarationMap": true,
"emitDeclarationOnly": true,
"outDir": "target_types",
"rootDir": "src",
"stripInternal": false,
"types": [
"jest",
"node"
]
},
"include": [
"src/**/*"
]
}

108
packages/core/ui-settings/core-ui-settings-browser/BUILD.bazel Normal file
View file

@ -0,0 +1,108 @@
load("@npm//@bazel/typescript:index.bzl", "ts_config")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
PKG_DIRNAME = "core-ui-settings-browser"
PKG_REQUIRE_NAME = "@kbn/core-ui-settings-browser"
SOURCE_FILES = glob(
[
"src/**/*.ts",
"src/**/*.tsx",
],
exclude = [
"**/*.test.*",
"**/*.stories.*",
],
)
SRCS = SOURCE_FILES
filegroup(
name = "srcs",
srcs = SRCS,
)
NPM_MODULE_EXTRA_FILES = [
"package.json",
]
RUNTIME_DEPS = [
"@npm//rxjs",
]
TYPES_DEPS = [
"@npm//@types/node",
"@npm//@types/jest",
"@npm//rxjs",
"//packages/core/ui-settings/core-ui-settings-common:npm_module_types"
]
jsts_transpiler(
name = "target_node",
srcs = SRCS,
build_pkg_name = package_name(),
)
jsts_transpiler(
name = "target_web",
srcs = SRCS,
build_pkg_name = package_name(),
web = True,
)
ts_config(
name = "tsconfig",
src = "tsconfig.json",
deps = [
"//:tsconfig.base.json",
"//:tsconfig.bazel.json",
],
)
ts_project(
name = "tsc_types",
args = ['--pretty'],
srcs = SRCS,
deps = TYPES_DEPS,
declaration = True,
declaration_map = True,
emit_declaration_only = True,
out_dir = "target_types",
root_dir = "src",
tsconfig = ":tsconfig",
)
js_library(
name = PKG_DIRNAME,
srcs = NPM_MODULE_EXTRA_FILES,
deps = RUNTIME_DEPS + [":target_node", ":target_web"],
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)
pkg_npm(
name = "npm_module",
deps = [":" + PKG_DIRNAME],
)
filegroup(
name = "build",
srcs = [":npm_module"],
visibility = ["//visibility:public"],
)
pkg_npm_types(
name = "npm_module_types",
srcs = SRCS,
deps = [":tsc_types"],
package_name = PKG_REQUIRE_NAME,
tsconfig = ":tsconfig",
visibility = ["//visibility:public"],
)
filegroup(
name = "build_types",
srcs = [":npm_module_types"],
visibility = ["//visibility:public"],
)

3
packages/core/ui-settings/core-ui-settings-browser/README.md Normal file
View file

@ -0,0 +1,3 @@
# @kbn/core-ui-settings-browser
This package contains the public types for the browser-side ui-settings service.

13
packages/core/ui-settings/core-ui-settings-browser/jest.config.js Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
module.exports = {
preset: '@kbn/test',
rootDir: '../../../..',
roots: ['<rootDir>/packages/core/ui-settings/core-ui-settings-browser'],
};

8
packages/core/ui-settings/core-ui-settings-browser/package.json Normal file
View file

@ -0,0 +1,8 @@
{
"name": "@kbn/core-ui-settings-browser",
"private": true,
"version": "1.0.0",
"main": "./target_node/index.js",
"browser": "./target_web/index.js",
"license": "SSPL-1.0 OR Elastic License 2.0"
}

9
packages/core/ui-settings/core-ui-settings-browser/src/index.ts Normal file
View file

@ -0,0 +1,9 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
export type { UiSettingsState, IUiSettingsClient } from './types';

4
src/core/public/ui_settings/types.ts → packages/core/ui-settings/core-ui-settings-browser/src/types.ts
View file

@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
import { Observable } from 'rxjs';
import { PublicUiSettingsParams, UserProvidedValues } from '../../server/types';
import type { Observable } from 'rxjs';
import type { PublicUiSettingsParams, UserProvidedValues } from '@kbn/core-ui-settings-common';
/** @public */
export interface UiSettingsState {

18
packages/core/ui-settings/core-ui-settings-browser/tsconfig.json Normal file
View file

@ -0,0 +1,18 @@
{
"extends": "../../../../tsconfig.bazel.json",
"compilerOptions": {
"declaration": true,
"declarationMap": true,
"emitDeclarationOnly": true,
"outDir": "target_types",
"rootDir": "src",
"stripInternal": false,
"types": [
"jest",
"node",
]
},
"include": [
"src/**/*"
]
}

107
packages/core/ui-settings/core-ui-settings-common/BUILD.bazel Normal file
View file

@ -0,0 +1,107 @@
load("@npm//@bazel/typescript:index.bzl", "ts_config")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")
PKG_DIRNAME = "core-ui-settings-common"
PKG_REQUIRE_NAME = "@kbn/core-ui-settings-common"
SOURCE_FILES = glob(
[
"src/**/*.ts",
"src/**/*.tsx",
],
exclude = [
"**/*.test.*",
"**/*.stories.*",
],
)
SRCS = SOURCE_FILES
filegroup(
name = "srcs",
srcs = SRCS,
)
NPM_MODULE_EXTRA_FILES = [
"package.json",
]
RUNTIME_DEPS = [
]
TYPES_DEPS = [
"@npm//@types/node",
"@npm//@types/jest",
"//packages/kbn-config-schema:npm_module_types",
"//packages/kbn-analytics:npm_module_types"
]
jsts_transpiler(
name = "target_node",
srcs = SRCS,
build_pkg_name = package_name(),
)
jsts_transpiler(
name = "target_web",
srcs = SRCS,
build_pkg_name = package_name(),
web = True,
)
ts_config(
name = "tsconfig",
src = "tsconfig.json",
deps = [
"//:tsconfig.base.json",
"//:tsconfig.bazel.json",
],
)
ts_project(
name = "tsc_types",
args = ['--pretty'],
srcs = SRCS,
deps = TYPES_DEPS,
declaration = True,
declaration_map = True,
emit_declaration_only = True,
out_dir = "target_types",
root_dir = "src",
tsconfig = ":tsconfig",
)
js_library(
name = PKG_DIRNAME,
srcs = NPM_MODULE_EXTRA_FILES,
deps = RUNTIME_DEPS + [":target_node", ":target_web"],
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)
pkg_npm(
name = "npm_module",
deps = [":" + PKG_DIRNAME],
)
filegroup(
name = "build",
srcs = [":npm_module"],
visibility = ["//visibility:public"],
)
pkg_npm_types(
name = "npm_module_types",
srcs = SRCS,
deps = [":tsc_types"],
package_name = PKG_REQUIRE_NAME,
tsconfig = ":tsconfig",
visibility = ["//visibility:public"],
)
filegroup(
name = "build_types",
srcs = [":npm_module_types"],
visibility = ["//visibility:public"],
)

3
packages/core/ui-settings/core-ui-settings-common/README.md Normal file
View file

@ -0,0 +1,3 @@
# @kbn/core-ui-settings-common
This package contains the common types for Core's uiSettings service.

13
packages/core/ui-settings/core-ui-settings-common/jest.config.js Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
module.exports = {
preset: '@kbn/test',
rootDir: '../../../..',
roots: ['<rootDir>/packages/core/ui-settings/core-ui-settings-common'],
};

8
packages/core/ui-settings/core-ui-settings-common/package.json Normal file
View file

@ -0,0 +1,8 @@
{
"name": "@kbn/core-ui-settings-common",
"private": true,
"version": "1.0.0",
"main": "./target_node/index.js",
"browser": "./target_web/index.js",
"license": "SSPL-1.0 OR Elastic License 2.0"
}

15
packages/core/ui-settings/core-ui-settings-common/src/index.ts Normal file
View file

@ -0,0 +1,15 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
export type {
UiSettingsType,
DeprecationSettings,
UiSettingsParams,
PublicUiSettingsParams,
UserProvidedValues,
} from './ui_settings';

4
src/core/types/ui_settings.ts → packages/core/ui-settings/core-ui-settings-common/src/ui_settings.ts
View file

@ -6,8 +6,8 @@
* Side Public License, v 1.
*/
import { Type } from '@kbn/config-schema';
import { UiCounterMetricType } from '@kbn/analytics';
import type { Type } from '@kbn/config-schema';
import type { UiCounterMetricType } from '@kbn/analytics';
/**
* UI element type to represent the settings.

18
packages/core/ui-settings/core-ui-settings-common/tsconfig.json Normal file
View file

@ -0,0 +1,18 @@
{
"extends": "../../../../tsconfig.bazel.json",
"compilerOptions": {
"declaration": true,
"declarationMap": true,
"emitDeclarationOnly": true,
"outDir": "target_types",
"rootDir": "src",
"stripInternal": false,
"types": [
"jest",
"node"
]
},
"include": [
"src/**/*"
]
}

2
src/core/public/chrome/chrome_service.test.ts
View file

@ -16,7 +16,7 @@ import { httpServiceMock } from '@kbn/core-http-browser-mocks';
import { App, PublicAppInfo } from '../application';
import { applicationServiceMock } from '../application/application_service.mock';
import { notificationServiceMock } from '../notifications/notifications_service.mock';
import { uiSettingsServiceMock } from '../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
import { ChromeService } from './chrome_service';
import { getAppInfo } from '../application/utils';

2
src/core/public/core_app/core_app.ts
View file

@ -11,6 +11,7 @@ import type { CoreContext } from '@kbn/core-base-browser-internal';
import type { InternalInjectedMetadataSetup } from '@kbn/core-injected-metadata-browser-internal';
import type { DocLinksStart } from '@kbn/core-doc-links-browser';
import type { HttpSetup, HttpStart } from '@kbn/core-http-browser';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import {
type InternalApplicationSetup,
type InternalApplicationStart,
@ -18,7 +19,6 @@ import {
type AppMountParameters,
} from '../application';
import type { NotificationsSetup, NotificationsStart } from '../notifications';
import type { IUiSettingsClient } from '../ui_settings';
import {
renderApp as renderErrorApp,
setupPublicBaseUrlConfigWarning,

4
src/core/public/core_app/errors/url_overflow.test.ts
View file

@ -11,9 +11,9 @@ import type { IBasePath } from '@kbn/core-http-browser';
import { BasePath } from '@kbn/core-http-browser-internal';
import { notificationServiceMock } from '../../notifications/notifications_service.mock';
import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
import type { IToasts } from '../../notifications';
import type { IUiSettingsClient } from '../../ui_settings';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { setupUrlOverflowDetection, URL_MAX_LENGTH, URL_WARNING_LENGTH } from './url_overflow';

2
src/core/public/core_app/errors/url_overflow.tsx
View file

@ -13,9 +13,9 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import type { IBasePath } from '@kbn/core-http-browser';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { mountReactNode } from '../../utils';
import { IToasts } from '../../notifications';
import { IUiSettingsClient } from '../../ui_settings';
const IE_REGEX = /(; ?MSIE |Edge\/\d|Trident\/[\d+\.]+;.*rv:*11\.\d+)/;
export const IS_IE = IE_REGEX.test(window.navigator.userAgent);

4
src/core/public/core_system.test.mocks.ts
View file

@ -18,7 +18,7 @@ import { i18nServiceMock } from '@kbn/core-i18n-browser-mocks';
import { notificationServiceMock } from './notifications/notifications_service.mock';
import { overlayServiceMock } from './overlays/overlay_service.mock';
import { pluginsServiceMock } from './plugins/plugins_service.mock';
import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
import { renderingServiceMock } from './rendering/rendering_service.mock';
import { integrationsServiceMock } from './integrations/integrations_service.mock';
import { coreAppMock } from './core_app/core_app.mock';
@ -76,7 +76,7 @@ export const MockUiSettingsService = uiSettingsServiceMock.create();
export const UiSettingsServiceConstructor = jest
.fn()
.mockImplementation(() => MockUiSettingsService);
jest.doMock('./ui_settings', () => ({
jest.doMock('@kbn/core-ui-settings-browser-internal', () => ({
UiSettingsService: UiSettingsServiceConstructor,
}));

2
src/core/public/core_system.ts
View file

@ -23,13 +23,13 @@ import { ExecutionContextService } from '@kbn/core-execution-context-browser-int
import type { FatalErrorsSetup } from '@kbn/core-fatal-errors-browser';
import { FatalErrorsService } from '@kbn/core-fatal-errors-browser-internal';
import { HttpService } from '@kbn/core-http-browser-internal';
import { UiSettingsService } from '@kbn/core-ui-settings-browser-internal';
import { DeprecationsService } from '@kbn/core-deprecations-browser-internal';
import { CoreSetup, CoreStart } from '.';
import { ChromeService } from './chrome';
import { NotificationsService } from './notifications';
import { OverlayService } from './overlays';
import { PluginsService } from './plugins';
import { UiSettingsService } from './ui_settings';
import { ApplicationService } from './application';
import { RenderingService } from './rendering';
import { SavedObjectsService } from './saved_objects';

9
src/core/public/index.ts
View file

@ -42,6 +42,7 @@ import type {
FatalErrorsStart,
FatalErrorInfo,
} from '@kbn/core-fatal-errors-browser';
import type { UiSettingsState, IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import type { DeprecationsServiceStart } from '@kbn/core-deprecations-browser';
import type {
ChromeBadge,
@ -73,7 +74,6 @@ import type {
PluginInitializerContext,
PluginOpaqueId,
} from './plugins';
import type { UiSettingsState, IUiSettingsClient } from './ui_settings';
import type { ApplicationSetup, Capabilities, ApplicationStart } from './application';
import type { SavedObjectsStart } from './saved_objects';
@ -82,7 +82,12 @@ export type { DomainDeprecationDetails } from '@kbn/core-deprecations-common';
export type { CoreContext } from '@kbn/core-base-browser-internal';
export type { CoreSystem } from './core_system';
export { DEFAULT_APP_CATEGORIES, APP_WRAPPER_CLASS } from '../utils';
export type { AppCategory, UiSettingsParams, UserProvidedValues, UiSettingsType } from '../types';
export type { AppCategory } from '../types';
export type {
UiSettingsParams,
UserProvidedValues,
UiSettingsType,
} from '@kbn/core-ui-settings-common';
export type { AnalyticsServiceSetup, AnalyticsServiceStart } from '@kbn/core-analytics-browser';
export type {

2
src/core/public/integrations/integrations_service.test.ts
View file

@ -9,7 +9,7 @@
import { styleServiceMock, momentServiceMock } from './integrations_service.test.mocks';
import { IntegrationsService } from './integrations_service';
import { uiSettingsServiceMock } from '../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
describe('IntegrationsService', () => {
test('it wires up styles and moment', async () => {

2
src/core/public/integrations/integrations_service.ts
View file

@ -7,7 +7,7 @@
*/
import type { CoreService } from '@kbn/core-base-browser-internal';
import { IUiSettingsClient } from '../ui_settings';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { MomentService } from './moment';
import { StylesService } from './styles';

2
src/core/public/integrations/moment/moment_service.test.ts
View file

@ -8,7 +8,7 @@
import { momentMock } from './moment_service.test.mocks';
import { MomentService } from './moment_service';
import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
import { BehaviorSubject } from 'rxjs';
describe('MomentService', () => {

2
src/core/public/integrations/moment/moment_service.ts
View file

@ -11,7 +11,7 @@ import { merge, Subscription } from 'rxjs';
import { tap } from 'rxjs/operators';
import type { CoreService } from '@kbn/core-base-browser-internal';
import { IUiSettingsClient } from '../../ui_settings';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
interface StartDeps {
uiSettings: IUiSettingsClient;

2
src/core/public/integrations/styles/styles_service.test.ts
View file

@ -11,7 +11,7 @@ import { BehaviorSubject } from 'rxjs';
jest.mock('!!raw-loader!./disable_animations.css', () => 'MOCK DISABLE ANIMATIONS CSS');
import { StylesService } from './styles_service';
import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
describe('StylesService', () => {
const flushPromises = () => new Promise((resolve) => setTimeout(resolve, 100));

2
src/core/public/integrations/styles/styles_service.ts
View file

@ -9,7 +9,7 @@
import { Subscription } from 'rxjs';
import type { CoreService } from '@kbn/core-base-browser-internal';
import { IUiSettingsClient } from '../../ui_settings';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
// @ts-expect-error
import disableAnimationsCss from '!!raw-loader!./disable_animations.css';

4
src/core/public/mocks.ts
View file

@ -17,6 +17,7 @@ import { executionContextServiceMock } from '@kbn/core-execution-context-browser
import { i18nServiceMock } from '@kbn/core-i18n-browser-mocks';
import { fatalErrorsServiceMock } from '@kbn/core-fatal-errors-browser-mocks';
import { httpServiceMock } from '@kbn/core-http-browser-mocks';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
import { deprecationsServiceMock } from '@kbn/core-deprecations-browser-mocks';
import type { PluginInitializerContext, AppMountParameters } from '.';
// Import values from their individual modules instead.
@ -25,7 +26,6 @@ import { applicationServiceMock } from './application/application_service.mock';
import { chromeServiceMock } from './chrome/chrome_service.mock';
import { notificationServiceMock } from './notifications/notifications_service.mock';
import { overlayServiceMock } from './overlays/overlay_service.mock';
import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
import { savedObjectsServiceMock } from './saved_objects/saved_objects_service.mock';
export { injectedMetadataServiceMock } from '@kbn/core-injected-metadata-browser-mocks';
@ -39,7 +39,7 @@ export { httpServiceMock } from '@kbn/core-http-browser-mocks';
export { i18nServiceMock } from '@kbn/core-i18n-browser-mocks';
export { notificationServiceMock } from './notifications/notifications_service.mock';
export { overlayServiceMock } from './overlays/overlay_service.mock';
export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
export { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
export { savedObjectsServiceMock } from './saved_objects/saved_objects_service.mock';
export { scopedHistoryMock } from './application/scoped_history.mock';
export { applicationServiceMock } from './application/application_service.mock';

2
src/core/public/notifications/notifications_service.ts
View file

@ -11,8 +11,8 @@ import { i18n } from '@kbn/i18n';
import { Subscription } from 'rxjs';
import type { ThemeServiceStart } from '@kbn/core-theme-browser';
import type { I18nStart } from '@kbn/core-i18n-browser';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { ToastsService, ToastsSetup, ToastsStart } from './toasts';
import { IUiSettingsClient } from '../ui_settings';
import { OverlayStart } from '../overlays';
export interface SetupDeps {

2
src/core/public/notifications/toasts/toasts_api.test.ts
View file

@ -10,7 +10,7 @@ import { firstValueFrom } from 'rxjs';
import { ToastsApi } from './toasts_api';
import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
import { i18nServiceMock } from '@kbn/core-i18n-browser-mocks';
async function getCurrentToasts(toasts: ToastsApi) {

2
src/core/public/notifications/toasts/toasts_api.tsx
View file

@ -12,10 +12,10 @@ import * as Rx from 'rxjs';
import { omitBy, isUndefined } from 'lodash';
import type { I18nStart } from '@kbn/core-i18n-browser';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { ErrorToast } from './error_toast';
import { MountPoint } from '../../types';
import { mountReactNode } from '../../utils';
import { IUiSettingsClient } from '../../ui_settings';
import { OverlayStart } from '../../overlays';
/**

2
src/core/public/notifications/toasts/toasts_service.test.tsx
View file

@ -12,7 +12,7 @@ import { ToastsService } from './toasts_service';
import { ToastsApi } from './toasts_api';
import { overlayServiceMock } from '../../overlays/overlay_service.mock';
import { themeServiceMock } from '@kbn/core-theme-browser-mocks';
import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
const mockI18n: any = {
Context: function I18nContext() {

2
src/core/public/notifications/toasts/toasts_service.tsx
View file

@ -12,7 +12,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
import type { ThemeServiceStart } from '@kbn/core-theme-browser';
import type { I18nStart } from '@kbn/core-i18n-browser';
import { CoreContextProvider } from '@kbn/core-theme-browser-internal';
import { IUiSettingsClient } from '../../ui_settings';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { GlobalToastList } from './global_toast_list';
import { ToastsApi, IToasts } from './toasts_api';
import { OverlayStart } from '../../overlays';

2
src/core/public/overlays/banners/banners_service.test.ts
View file

@ -9,7 +9,7 @@
import { OverlayBannersService, OverlayBannersStart } from './banners_service';
import { take } from 'rxjs/operators';
import { i18nServiceMock } from '@kbn/core-i18n-browser-mocks';
import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
describe('OverlayBannersService', () => {
let service: OverlayBannersStart;

2
src/core/public/overlays/banners/banners_service.tsx
View file

@ -11,9 +11,9 @@ import { BehaviorSubject, Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import type { I18nStart } from '@kbn/core-i18n-browser';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { PriorityMap } from './priority_map';
import { BannersList } from './banners_list';
import { IUiSettingsClient } from '../../ui_settings';
import { MountPoint } from '../../types';
import { UserBannerService } from './user_banner_service';

2
src/core/public/overlays/banners/user_banner_service.test.ts
View file

@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import { uiSettingsServiceMock } from '../../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
import { UserBannerService } from './user_banner_service';
import { overlayBannersServiceMock } from './banners_service.mock';
import { i18nServiceMock } from '@kbn/core-i18n-browser-mocks';

2
src/core/public/overlays/banners/user_banner_service.tsx
View file

@ -15,7 +15,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
import { EuiCallOut, EuiButton, EuiLoadingSpinner } from '@elastic/eui';
import type { I18nStart } from '@kbn/core-i18n-browser';
import { IUiSettingsClient } from '../../ui_settings';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { OverlayBannersStart } from './banners_service';
interface StartDeps {

2
src/core/public/overlays/overlay_service.ts
View file

@ -8,7 +8,7 @@
import type { ThemeServiceStart } from '@kbn/core-theme-browser';
import type { I18nStart } from '@kbn/core-i18n-browser';
import { IUiSettingsClient } from '../ui_settings';
import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { OverlayBannersStart, OverlayBannersService } from './banners';
import { FlyoutService, OverlayFlyoutStart } from './flyout';
import { ModalService, OverlayModalStart } from './modal';

2
src/core/public/plugins/plugins_service.test.ts
View file

@ -34,7 +34,7 @@ import { applicationServiceMock } from '../application/application_service.mock'
import { overlayServiceMock } from '../overlays/overlay_service.mock';
import { chromeServiceMock } from '../chrome/chrome_service.mock';
import { fatalErrorsServiceMock } from '@kbn/core-fatal-errors-browser-mocks';
import { uiSettingsServiceMock } from '../ui_settings/ui_settings_service.mock';
import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
import { httpServiceMock } from '@kbn/core-http-browser-mocks';
import type { CoreSetup, CoreStart, PluginInitializerContext } from '..';
import { savedObjectsServiceMock } from '../saved_objects/saved_objects_service.mock';

2
src/core/public/types.ts
View file

@ -11,7 +11,7 @@ export type {
PublicUiSettingsParams,
UserProvidedValues,
UiSettingsType,
} from '../types';
} from '@kbn/core-ui-settings-common';
/**
* A function that should mount DOM content inside the provided container element

10
src/core/server/ui_settings/types.ts
View file

@ -5,16 +5,20 @@
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
import {
UiSettingsParams,
UserProvidedValues,
PublicUiSettingsParams,
} from '@kbn/core-ui-settings-common';
import { SavedObjectsClientContract } from '../saved_objects/types';
import { UiSettingsParams, UserProvidedValues, PublicUiSettingsParams } from '../../types';
export type {
UiSettingsParams,
PublicUiSettingsParams,
DeprecationSettings,
PublicUiSettingsParams,
UiSettingsType,
UserProvidedValues,
} from '../../types';
} from '@kbn/core-ui-settings-common';
/**
* Server-side client that provides access to the advanced settings stored in elasticsearch.

8
src/core/types/index.ts
View file

@ -12,6 +12,12 @@
*/
export * from './capabilities';
export * from './app_category';
export * from './ui_settings';
export * from './saved_objects';
export type { KibanaExecutionContext } from '@kbn/core-execution-context-common';
export type {
UiSettingsType,
DeprecationSettings,
UiSettingsParams,
PublicUiSettingsParams,
UserProvidedValues,
} from '@kbn/core-ui-settings-common';

2
src/plugins/data_views/public/data_views/data_views_api_client.test.mock.ts
View file

@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import { setup } from '@kbn/core/test_helpers/http_test_setup';
import { setup } from '@kbn/core-test-helpers-http-setup-browser';
export const { http } = setup((injectedMetadata) => {
injectedMetadata.getBasePath.mockReturnValue('/hola/daro/');

2
x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
View file

@ -8,8 +8,8 @@
// @ts-ignore
import fetchMock from 'fetch-mock/es5/client';
import { setup } from '@kbn/core-test-helpers-http-setup-browser';
import { applicationServiceMock } from '@kbn/core/public/mocks';
import { setup } from '@kbn/core/test_helpers/http_test_setup';
import { SessionExpired } from './session_expired';
import { UnauthorizedResponseHttpInterceptor } from './unauthorized_response_http_interceptor';

40
yarn.lock
View file

@ -3319,6 +3319,10 @@
version "0.0.0"
uid ""
"@kbn/core-test-helpers-http-setup-browser@link:bazel-bin/packages/core/test-helpers/core-test-helpers-http-setup-browser":
version "0.0.0"
uid ""
"@kbn/core-theme-browser-internal@link:bazel-bin/packages/core/theme/core-theme-browser-internal":
version "0.0.0"
uid ""
@ -3331,6 +3335,22 @@
version "0.0.0"
uid ""
"@kbn/core-ui-settings-browser-internal@link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser-internal":
version "0.0.0"
uid ""
"@kbn/core-ui-settings-browser-mocks@link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser-mocks":
version "0.0.0"
uid ""
"@kbn/core-ui-settings-browser@link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser":
version "0.0.0"
uid ""
"@kbn/core-ui-settings-common@link:bazel-bin/packages/core/ui-settings/core-ui-settings-common":
version "0.0.0"
uid ""
"@kbn/crypto-browser@link:bazel-bin/packages/kbn-crypto-browser":
version "0.0.0"
uid ""
@ -6978,6 +6998,10 @@
version "0.0.0"
uid ""
"@types/kbn__core-test-helpers-http-setup-browser@link:bazel-bin/packages/core/test-helpers/core-test-helpers-http-setup-browser/npm_module_types":
version "0.0.0"
uid ""
"@types/kbn__core-theme-browser-internal@link:bazel-bin/packages/core/theme/core-theme-browser-internal/npm_module_types":
version "0.0.0"
uid ""
@ -6990,6 +7014,22 @@
version "0.0.0"
uid ""
"@types/kbn__core-ui-settings-browser-internal@link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser-internal/npm_module_types":
version "0.0.0"
uid ""
"@types/kbn__core-ui-settings-browser-mocks@link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser-mocks/npm_module_types":
version "0.0.0"
uid ""
"@types/kbn__core-ui-settings-browser@link:bazel-bin/packages/core/ui-settings/core-ui-settings-browser/npm_module_types":
version "0.0.0"
uid ""
"@types/kbn__core-ui-settings-common@link:bazel-bin/packages/core/ui-settings/core-ui-settings-common/npm_module_types":
version "0.0.0"
uid ""
"@types/kbn__crypto-browser@link:bazel-bin/packages/kbn-crypto-browser/npm_module_types":
version "0.0.0"
uid ""