{
});
it('returns a div for the legacy service to render into', () => {
- const {
- start: { legacyTargetDomElement },
- targetDomElement,
- } = getService({ legacyMode: true });
+ const { legacyTargetDomElement } = startService();
+
expect(targetDomElement.contains(legacyTargetDomElement!)).toBe(true);
});
});
diff --git a/src/core/public/rendering/rendering_service.tsx b/src/core/public/rendering/rendering_service.tsx
index 7a747faa2673f..58b8c1921e333 100644
--- a/src/core/public/rendering/rendering_service.tsx
+++ b/src/core/public/rendering/rendering_service.tsx
@@ -25,6 +25,7 @@ import { InternalChromeStart } from '../chrome';
import { InternalApplicationStart } from '../application';
import { InjectedMetadataStart } from '../injected_metadata';
import { OverlayStart } from '../overlays';
+import { AppWrapper, AppContainer } from './app_containers';
interface StartDeps {
application: InternalApplicationStart;
@@ -65,12 +66,12 @@ export class RenderingService {
{chromeUi}
{!legacyMode && (
-
+
{bannerUi}
-
{appUi}
+
{appUi}
-
+
)}
{legacyMode &&
}
diff --git a/src/core/server/elasticsearch/elasticsearch_service.mock.ts b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
index 1b52f22c4da09..a4e51ca55b3e7 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.mock.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.mock.ts
@@ -74,8 +74,6 @@ const createInternalSetupContractMock = () => {
legacy: {
config$: new BehaviorSubject({} as ElasticsearchConfig),
},
- adminClient$: new BehaviorSubject(createClusterClientMock()),
- dataClient$: new BehaviorSubject(createClusterClientMock()),
};
setupContract.adminClient.asScoped.mockReturnValue(createScopedClusterClientMock());
setupContract.dataClient.asScoped.mockReturnValue(createScopedClusterClientMock());
diff --git a/src/core/server/elasticsearch/elasticsearch_service.test.ts b/src/core/server/elasticsearch/elasticsearch_service.test.ts
index 9f694ac1c46da..5a7d223fec7ad 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.test.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.test.ts
@@ -21,7 +21,7 @@ import { first } from 'rxjs/operators';
import { MockClusterClient } from './elasticsearch_service.test.mocks';
-import { BehaviorSubject, combineLatest } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
import { Env } from '../config';
import { getEnvOptions } from '../config/__mocks__/env';
import { CoreContext } from '../core_context';
@@ -91,44 +91,6 @@ describe('#setup', () => {
expect(mockDataClusterClientInstance.callAsInternalUser).toHaveBeenCalledTimes(1);
});
- it('returns data and admin client observables as a part of the contract', async () => {
- const mockAdminClusterClientInstance = { close: jest.fn() };
- const mockDataClusterClientInstance = { close: jest.fn() };
- MockClusterClient.mockImplementationOnce(
- () => mockAdminClusterClientInstance
- ).mockImplementationOnce(() => mockDataClusterClientInstance);
-
- const setupContract = await elasticsearchService.setup(deps);
-
- const [esConfig, adminClient, dataClient] = await combineLatest(
- setupContract.legacy.config$,
- setupContract.adminClient$,
- setupContract.dataClient$
- )
- .pipe(first())
- .toPromise();
-
- expect(adminClient).toBe(mockAdminClusterClientInstance);
- expect(dataClient).toBe(mockDataClusterClientInstance);
-
- expect(MockClusterClient).toHaveBeenCalledTimes(2);
- expect(MockClusterClient).toHaveBeenNthCalledWith(
- 1,
- esConfig,
- expect.objectContaining({ context: ['elasticsearch', 'admin'] }),
- undefined
- );
- expect(MockClusterClient).toHaveBeenNthCalledWith(
- 2,
- esConfig,
- expect.objectContaining({ context: ['elasticsearch', 'data'] }),
- expect.any(Function)
- );
-
- expect(mockAdminClusterClientInstance.close).not.toHaveBeenCalled();
- expect(mockDataClusterClientInstance.close).not.toHaveBeenCalled();
- });
-
describe('#createClient', () => {
it('allows to specify config properties', async () => {
const setupContract = await elasticsearchService.setup(deps);
diff --git a/src/core/server/elasticsearch/elasticsearch_service.ts b/src/core/server/elasticsearch/elasticsearch_service.ts
index db3fda3a504ab..aba246ce66fb5 100644
--- a/src/core/server/elasticsearch/elasticsearch_service.ts
+++ b/src/core/server/elasticsearch/elasticsearch_service.ts
@@ -152,8 +152,6 @@ export class ElasticsearchService implements CoreService
clients.config)) },
- adminClient$,
- dataClient$,
adminClient,
dataClient,
diff --git a/src/core/server/elasticsearch/types.ts b/src/core/server/elasticsearch/types.ts
index 22340bf3f2fc6..899b273c5c60a 100644
--- a/src/core/server/elasticsearch/types.ts
+++ b/src/core/server/elasticsearch/types.ts
@@ -77,7 +77,4 @@ export interface InternalElasticsearchServiceSetup extends ElasticsearchServiceS
readonly legacy: {
readonly config$: Observable;
};
-
- readonly adminClient$: Observable;
- readonly dataClient$: Observable;
}
diff --git a/src/core/server/http/integration_tests/core_service.test.mocks.ts b/src/core/server/http/integration_tests/core_service.test.mocks.ts
index 3982df567ed7c..6fa3357168027 100644
--- a/src/core/server/http/integration_tests/core_service.test.mocks.ts
+++ b/src/core/server/http/integration_tests/core_service.test.mocks.ts
@@ -16,8 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
+import { elasticsearchServiceMock } from '../../elasticsearch/elasticsearch_service.mock';
export const clusterClientMock = jest.fn();
jest.doMock('../../elasticsearch/scoped_cluster_client', () => ({
- ScopedClusterClient: clusterClientMock,
+ ScopedClusterClient: clusterClientMock.mockImplementation(function() {
+ return elasticsearchServiceMock.createScopedClusterClient();
+ }),
}));
diff --git a/src/core/server/http/integration_tests/core_services.test.ts b/src/core/server/http/integration_tests/core_services.test.ts
index f3867faa2ae75..65c4f1432721d 100644
--- a/src/core/server/http/integration_tests/core_services.test.ts
+++ b/src/core/server/http/integration_tests/core_services.test.ts
@@ -133,7 +133,7 @@ describe('http service', () => {
const { http } = await root.setup();
const { registerAuth } = http;
- await registerAuth((req, res, toolkit) => {
+ registerAuth((req, res, toolkit) => {
return toolkit.authenticated({ responseHeaders: authResponseHeader });
});
@@ -157,7 +157,7 @@ describe('http service', () => {
const { http } = await root.setup();
const { registerAuth } = http;
- await registerAuth((req, res, toolkit) => {
+ registerAuth((req, res, toolkit) => {
return toolkit.authenticated({ responseHeaders: authResponseHeader });
});
@@ -222,12 +222,15 @@ describe('http service', () => {
const { http } = await root.setup();
const { registerAuth, createRouter } = http;
- await registerAuth((req, res, toolkit) =>
- toolkit.authenticated({ requestHeaders: authHeaders })
- );
+ registerAuth((req, res, toolkit) => toolkit.authenticated({ requestHeaders: authHeaders }));
const router = createRouter('/new-platform');
- router.get({ path: '/', validate: false }, (context, req, res) => res.ok());
+ router.get({ path: '/', validate: false }, async (context, req, res) => {
+ // it forces client initialization since the core creates them lazily.
+ await context.core.elasticsearch.adminClient.callAsCurrentUser('ping');
+ await context.core.elasticsearch.dataClient.callAsCurrentUser('ping');
+ return res.ok();
+ });
await root.start();
@@ -247,7 +250,12 @@ describe('http service', () => {
const { createRouter } = http;
const router = createRouter('/new-platform');
- router.get({ path: '/', validate: false }, (context, req, res) => res.ok());
+ router.get({ path: '/', validate: false }, async (context, req, res) => {
+ // it forces client initialization since the core creates them lazily.
+ await context.core.elasticsearch.adminClient.callAsCurrentUser('ping');
+ await context.core.elasticsearch.dataClient.callAsCurrentUser('ping');
+ return res.ok();
+ });
await root.start();
diff --git a/src/core/server/legacy/legacy_service.test.ts b/src/core/server/legacy/legacy_service.test.ts
index 608392e4943f9..af4db68ee95e1 100644
--- a/src/core/server/legacy/legacy_service.test.ts
+++ b/src/core/server/legacy/legacy_service.test.ts
@@ -424,7 +424,7 @@ describe('#discoverPlugins()', () => {
await legacyService.discoverPlugins();
expect(findLegacyPluginSpecs).toHaveBeenCalledTimes(1);
- expect(findLegacyPluginSpecs).toHaveBeenCalledWith(expect.any(Object), logger);
+ expect(findLegacyPluginSpecs).toHaveBeenCalledWith(expect.any(Object), logger, env.packageInfo);
});
it(`register legacy plugin's deprecation providers`, async () => {
diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index cc36b90ec526d..7a03cefc38c1a 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -125,7 +125,11 @@ export class LegacyService implements CoreService {
disabledPluginSpecs,
uiExports,
navLinks,
- } = await findLegacyPluginSpecs(this.settings, this.coreContext.logger);
+ } = await findLegacyPluginSpecs(
+ this.settings,
+ this.coreContext.logger,
+ this.coreContext.env.packageInfo
+ );
this.legacyPlugins = {
pluginSpecs,
diff --git a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
index d2e7a39236d0a..9867274d224bd 100644
--- a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
+++ b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
@@ -29,6 +29,8 @@ import {
import { collectUiExports as collectLegacyUiExports } from '../../../../legacy/ui/ui_exports/collect_ui_exports';
import { LoggerFactory } from '../../logging';
+import { PackageInfo } from '../../config';
+
import {
LegacyUiExports,
LegacyNavLink,
@@ -92,7 +94,11 @@ function getNavLinks(uiExports: LegacyUiExports, pluginSpecs: LegacyPluginSpec[]
.sort((a, b) => a.order - b.order);
}
-export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: LoggerFactory) {
+export async function findLegacyPluginSpecs(
+ settings: unknown,
+ loggerFactory: LoggerFactory,
+ packageInfo: PackageInfo
+) {
const configToMutate: LegacyConfig = defaultConfig(settings);
const {
pack$,
@@ -152,8 +158,7 @@ export async function findLegacyPluginSpecs(settings: unknown, loggerFactory: Lo
map(spec => {
const name = spec.getId();
const pluginVersion = spec.getExpectedKibanaVersion();
- // @ts-ignore
- const kibanaVersion = settings.pkg.version;
+ const kibanaVersion = packageInfo.version;
return `Plugin "${name}" was disabled because it expected Kibana version "${pluginVersion}", and found "${kibanaVersion}".`;
}),
distinct(),
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index 073d380d3aa67..c7082d46313ae 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -37,6 +37,7 @@ export { elasticsearchServiceMock } from './elasticsearch/elasticsearch_service.
export { httpServiceMock } from './http/http_service.mock';
export { loggingServiceMock } from './logging/logging_service.mock';
export { savedObjectsClientMock } from './saved_objects/service/saved_objects_client.mock';
+export { savedObjectsRepositoryMock } from './saved_objects/service/lib/repository.mock';
export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
import { uuidServiceMock } from './uuid/uuid_service.mock';
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index bf7dc14c73265..7f3a960571012 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -1928,6 +1928,8 @@ export type SharedGlobalConfig = RecursiveReadonly_2<{
// @public
export interface UiSettingsParams {
category?: string[];
+ // Warning: (ae-forgotten-export) The symbol "DeprecationSettings" needs to be exported by the entry point index.d.ts
+ deprecation?: DeprecationSettings;
description?: string;
name?: string;
optionLabels?: Record;
@@ -1935,6 +1937,11 @@ export interface UiSettingsParams {
readonly?: boolean;
requiresPageReload?: boolean;
type?: UiSettingsType;
+ // Warning: (ae-forgotten-export) The symbol "ImageValidation" needs to be exported by the entry point index.d.ts
+ // Warning: (ae-forgotten-export) The symbol "StringValidation" needs to be exported by the entry point index.d.ts
+ //
+ // (undocumented)
+ validation?: ImageValidation | StringValidation;
value?: SavedObjectAttribute;
}
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index 611842e8a7de0..7c3f9f249db13 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -17,7 +17,6 @@
* under the License.
*/
-import { take } from 'rxjs/operators';
import { Type } from '@kbn/config-schema';
import {
@@ -216,9 +215,6 @@ export class Server {
coreId,
'core',
async (context, req, res): Promise => {
- // it consumes elasticsearch observables to provide the same client throughout the context lifetime.
- const adminClient = await coreSetup.elasticsearch.adminClient$.pipe(take(1)).toPromise();
- const dataClient = await coreSetup.elasticsearch.dataClient$.pipe(take(1)).toPromise();
const savedObjectsClient = coreSetup.savedObjects.getScopedClient(req);
const uiSettingsClient = coreSetup.uiSettings.asScopedToClient(savedObjectsClient);
@@ -230,8 +226,8 @@ export class Server {
client: savedObjectsClient,
},
elasticsearch: {
- adminClient: adminClient.asScoped(req),
- dataClient: dataClient.asScoped(req),
+ adminClient: coreSetup.elasticsearch.adminClient.asScoped(req),
+ dataClient: coreSetup.elasticsearch.dataClient.asScoped(req),
},
uiSettings: {
client: uiSettingsClient,
diff --git a/src/core/server/types.ts b/src/core/server/types.ts
index 9919c7f0386b5..2433aad1a2be5 100644
--- a/src/core/server/types.ts
+++ b/src/core/server/types.ts
@@ -23,4 +23,3 @@ export * from './saved_objects/types';
export * from './ui_settings/types';
export * from './legacy/types';
export { EnvironmentMode, PackageInfo } from './config/types';
-export { ICspConfig } from './csp';
diff --git a/src/core/server/ui_settings/types.ts b/src/core/server/ui_settings/types.ts
index 5e3f0a4fbb6bd..14eb71a22cefc 100644
--- a/src/core/server/ui_settings/types.ts
+++ b/src/core/server/ui_settings/types.ts
@@ -73,6 +73,15 @@ export interface UserProvidedValues {
isOverridden?: boolean;
}
+/**
+ * UiSettings deprecation field options.
+ * @public
+ * */
+export interface DeprecationSettings {
+ message: string;
+ docLinksKey: string;
+}
+
/**
* UI element type to represent the settings.
* @public
@@ -102,6 +111,25 @@ export interface UiSettingsParams {
readonly?: boolean;
/** defines a type of UI element {@link UiSettingsType} */
type?: UiSettingsType;
+ /** optional deprecation information. Used to generate a deprecation warning. */
+ deprecation?: DeprecationSettings;
+ /*
+ * Allows defining a custom validation applicable to value change on the client.
+ * @deprecated
+ */
+ validation?: ImageValidation | StringValidation;
+}
+
+export interface StringValidation {
+ regexString: string;
+ message: string;
+}
+
+export interface ImageValidation {
+ maxSize: {
+ length: number;
+ description: string;
+ };
}
/** @internal */
diff --git a/src/core/utils/merge.test.ts b/src/core/utils/merge.test.ts
index aa98f51067411..c857e980dec21 100644
--- a/src/core/utils/merge.test.ts
+++ b/src/core/utils/merge.test.ts
@@ -61,4 +61,15 @@ describe('merge', () => {
expect(merge({ a: 0 }, {}, {})).toEqual({ a: 0 });
expect(merge({ a: 0 }, { a: 1 }, {})).toEqual({ a: 1 });
});
+
+ test(`doesn't pollute prototypes`, () => {
+ merge({}, JSON.parse('{ "__proto__": { "foo": "bar" } }'));
+ merge({}, JSON.parse('{ "constructor": { "prototype": { "foo": "bar" } } }'));
+ merge(
+ {},
+ JSON.parse('{ "__proto__": { "foo": "bar" } }'),
+ JSON.parse('{ "constructor": { "prototype": { "foo": "bar" } } }')
+ );
+ expect(({} as any).foo).toBe(undefined);
+ });
});
diff --git a/src/dev/build/README.md b/src/dev/build/README.md
index af08414f0bf4b..3b579033fabe1 100644
--- a/src/dev/build/README.md
+++ b/src/dev/build/README.md
@@ -44,7 +44,7 @@ The majority of this logic is extracted from the grunt build that has existed fo
We have introduced in our bundle a webpack dll for the client vendor modules in order to improve
the optimization time both in dev and in production. As for those modules we already have the
-code into the vendors.bundle.dll.js we have decided to delete those bundled modules from the
+code into the vendors_${chunk_number}.bundle.dll.js we have decided to delete those bundled modules from the
distributable node_modules folder. However, in order to accomplish this, we need to exclude
every node_module used in the server side code. This logic is performed
under `nodejs_modules/clean_client_modules_on_dll_task.js`. In case we need to add any new cli
diff --git a/src/dev/build/tasks/nodejs_modules/clean_client_modules_on_dll_task.js b/src/dev/build/tasks/nodejs_modules/clean_client_modules_on_dll_task.js
index 19d74bcf89e30..52928d6e47fc4 100644
--- a/src/dev/build/tasks/nodejs_modules/clean_client_modules_on_dll_task.js
+++ b/src/dev/build/tasks/nodejs_modules/clean_client_modules_on_dll_task.js
@@ -98,12 +98,16 @@ export const CleanClientModulesOnDLLTask = {
// Consider this as our whiteList for the modules we can't delete
const whiteListedModules = [...serverDependencies, ...kbnWebpackLoaders, ...manualExceptions];
- // Resolve the client vendors dll manifest path
- const dllManifestPath = `${baseDir}/built_assets/dlls/vendors.manifest.dll.json`;
+ // Resolve the client vendors dll manifest paths
+ // excluding the runtime one
+ const dllManifestPaths = await globby([
+ `${baseDir}/built_assets/dlls/vendors_*.manifest.dll.json`,
+ `!${baseDir}/built_assets/dlls/vendors_runtime.manifest.dll.json`,
+ ]);
// Get dll entries filtering out the ones
// from any whitelisted module
- const dllEntries = await getDllEntries(dllManifestPath, whiteListedModules, baseDir);
+ const dllEntries = await getDllEntries(dllManifestPaths, whiteListedModules, baseDir);
for (const relativeEntryPath of dllEntries) {
const entryPath = `${baseDir}/${relativeEntryPath}`;
diff --git a/src/dev/build/tasks/nodejs_modules/webpack_dll.js b/src/dev/build/tasks/nodejs_modules/webpack_dll.js
index ea8cc1e286407..72910226bb04a 100644
--- a/src/dev/build/tasks/nodejs_modules/webpack_dll.js
+++ b/src/dev/build/tasks/nodejs_modules/webpack_dll.js
@@ -28,27 +28,37 @@ function checkDllEntryAccess(entry, baseDir = '') {
return isFileAccessible(resolvedPath);
}
-export async function getDllEntries(manifestPath, whiteListedModules, baseDir = '') {
- const manifest = JSON.parse(await read(manifestPath));
-
- if (!manifest || !manifest.content) {
- // It should fails because if we don't have the manifest file
- // or it is malformed something wrong is happening and we
- // should stop
- throw new Error(`The following dll manifest doesn't exists: ${manifestPath}`);
- }
+export async function getDllEntries(manifestPaths, whiteListedModules, baseDir = '') {
+ // Read and parse all manifests
+ const manifests = await Promise.all(
+ manifestPaths.map(async manifestPath => JSON.parse(await read(manifestPath)))
+ );
- const modules = Object.keys(manifest.content);
- if (!modules.length) {
- // It should fails because if we don't have any
- // module inside the client vendors dll something
- // wrong is happening and we should stop too
- throw new Error(`The following dll manifest is reporting an empty dll: ${manifestPath}`);
- }
+ // Process and group modules from all manifests
+ const manifestsModules = manifests.flatMap((manifest, idx) => {
+ if (!manifest || !manifest.content) {
+ // It should fails because if we don't have the manifest file
+ // or it is malformed something wrong is happening and we
+ // should stop
+ throw new Error(`The following dll manifest doesn't exists: ${manifestPaths[idx]}`);
+ }
+
+ const modules = Object.keys(manifest.content);
+ if (!modules.length) {
+ // It should fails because if we don't have any
+ // module inside the client vendors dll something
+ // wrong is happening and we should stop too
+ throw new Error(
+ `The following dll manifest is reporting an empty dll: ${manifestPaths[idx]}`
+ );
+ }
+
+ return modules;
+ });
// Only includes modules who are not in the white list of modules
// and that are node_modules
- return modules.filter(entry => {
+ return manifestsModules.filter(entry => {
const isWhiteListed = whiteListedModules.some(nonEntry =>
normalizePosixPath(entry).includes(`node_modules/${nonEntry}`)
);
diff --git a/src/dev/build/tasks/nodejs_modules/webpack_dll.test.js b/src/dev/build/tasks/nodejs_modules/webpack_dll.test.js
index 1fdd7d8d4f5ff..ce305169a777b 100644
--- a/src/dev/build/tasks/nodejs_modules/webpack_dll.test.js
+++ b/src/dev/build/tasks/nodejs_modules/webpack_dll.test.js
@@ -52,7 +52,7 @@ describe('Webpack DLL Build Tasks Utils', () => {
isFileAccessible.mockImplementation(() => true);
- const mockManifestPath = '/mock/mock_dll_manifest.json';
+ const mockManifestPath = ['/mock/mock_dll_manifest.json'];
const mockModulesWhitelist = ['dep1'];
const dllEntries = await getDllEntries(mockManifestPath, mockModulesWhitelist);
@@ -66,7 +66,7 @@ describe('Webpack DLL Build Tasks Utils', () => {
isFileAccessible.mockImplementation(() => false);
- const mockManifestPath = '/mock/mock_dll_manifest.json';
+ const mockManifestPath = ['/mock/mock_dll_manifest.json'];
const mockModulesWhitelist = ['dep1'];
const dllEntries = await getDllEntries(mockManifestPath, mockModulesWhitelist);
@@ -78,7 +78,7 @@ describe('Webpack DLL Build Tasks Utils', () => {
it('should throw an error for no manifest file', async () => {
read.mockImplementationOnce(async () => noManifestMock);
- const mockManifestPath = '/mock/mock_dll_manifest.json';
+ const mockManifestPath = ['/mock/mock_dll_manifest.json'];
try {
await getDllEntries(mockManifestPath, []);
@@ -92,7 +92,7 @@ describe('Webpack DLL Build Tasks Utils', () => {
it('should throw an error for no manifest content field', async () => {
read.mockImplementation(async () => noContentFieldManifestMock);
- const mockManifestPath = '/mock/mock_dll_manifest.json';
+ const mockManifestPath = ['/mock/mock_dll_manifest.json'];
try {
await getDllEntries(mockManifestPath, []);
@@ -106,7 +106,7 @@ describe('Webpack DLL Build Tasks Utils', () => {
it('should throw an error for manifest file without any content', async () => {
read.mockImplementation(async () => emptyManifestContentMock);
- const mockManifestPath = '/mock/mock_dll_manifest.json';
+ const mockManifestPath = ['/mock/mock_dll_manifest.json'];
try {
await getDllEntries(mockManifestPath, []);
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index a4aa3474c0762..bd084767a723f 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -23,6 +23,7 @@ export const LICENSE_WHITELIST = [
'Elastic-License',
'(BSD-2-Clause OR MIT OR Apache-2.0)',
'(BSD-2-Clause OR MIT)',
+ '(BSD-3-Clause AND Apache-2.0)',
'(GPL-2.0 OR MIT)',
'(MIT AND CC-BY-3.0)',
'(MIT AND Zlib)',
diff --git a/src/dev/sass/build_sass.js b/src/dev/sass/build_sass.js
index 14f03a7a116a6..1ff7c700d0386 100644
--- a/src/dev/sass/build_sass.js
+++ b/src/dev/sass/build_sass.js
@@ -19,6 +19,7 @@
import { resolve } from 'path';
+import * as Rx from 'rxjs';
import { toArray } from 'rxjs/operators';
import { createFailError } from '@kbn/dev-utils';
@@ -61,9 +62,11 @@ export async function buildSass({ log, kibanaDir, watch }) {
const scanDirs = [resolve(kibanaDir, 'src/legacy/core_plugins')];
const paths = [resolve(kibanaDir, 'x-pack')];
- const { spec$ } = findPluginSpecs({ plugins: { scanDirs, paths } });
- const enabledPlugins = await spec$.pipe(toArray()).toPromise();
- const uiExports = collectUiExports(enabledPlugins);
+ const { spec$, disabledSpec$ } = findPluginSpecs({ plugins: { scanDirs, paths } });
+ const allPlugins = await Rx.merge(spec$, disabledSpec$)
+ .pipe(toArray())
+ .toPromise();
+ const uiExports = collectUiExports(allPlugins);
const { styleSheetPaths } = uiExports;
log.info('%s %d styleSheetPaths', watch ? 'watching' : 'found', styleSheetPaths.length);
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.tsx b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.tsx
index 40b9cc4640eef..761a252b56a87 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.tsx
+++ b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.tsx
@@ -164,7 +164,7 @@ function EditorUI() {
mappings.retrieveAutoCompleteInfo();
- const unsubscribeResizer = subscribeResizeChecker(editorRef.current!, editor.getCoreEditor());
+ const unsubscribeResizer = subscribeResizeChecker(editorRef.current!, editor);
setupAutosave();
return () => {
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/subscribe_console_resize_checker.ts b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/subscribe_console_resize_checker.ts
index 4ecd5d415833c..1adc56d47927b 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/subscribe_console_resize_checker.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/subscribe_console_resize_checker.ts
@@ -22,8 +22,15 @@ export function subscribeResizeChecker(el: HTMLElement, ...editors: any[]) {
const checker = new ResizeChecker(el);
checker.on('resize', () =>
editors.forEach(e => {
- e.resize();
- if (e.updateActionsBar) e.updateActionsBar();
+ if (e.getCoreEditor) {
+ e.getCoreEditor().resize();
+ } else {
+ e.resize();
+ }
+
+ if (e.updateActionsBar) {
+ e.updateActionsBar();
+ }
})
);
return () => checker.destroy();
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts b/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts
index 608c73335b3e5..8301daa675b5c 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts
@@ -297,30 +297,32 @@ export class LegacyCoreEditor implements CoreEditor {
// pageY is relative to page, so subtract the offset
// from pageY to get the new top value
const offsetFromPage = $(this.editor.container).offset()!.top;
- const startRow = range.start.lineNumber - 1;
+ const startLine = range.start.lineNumber;
const startColumn = range.start.column;
- const firstLine = this.getLineValue(startRow);
+ const firstLine = this.getLineValue(startLine);
const maxLineLength = this.getWrapLimit() - 5;
const isWrapping = firstLine.length > maxLineLength;
- const getScreenCoords = (row: number) =>
- this.editor.renderer.textToScreenCoordinates(row, startColumn).pageY - offsetFromPage;
- const topOfReq = getScreenCoords(startRow);
+ const getScreenCoords = (line: number) =>
+ this.editor.renderer.textToScreenCoordinates(line - 1, startColumn).pageY -
+ offsetFromPage +
+ (window.pageYOffset || 0);
+ const topOfReq = getScreenCoords(startLine);
if (topOfReq >= 0) {
let offset = 0;
if (isWrapping) {
// Try get the line height of the text area in pixels.
const textArea = $(this.editor.container.querySelector('textArea')!);
- const hasRoomOnNextLine = this.getLineValue(startRow + 1).length < maxLineLength;
+ const hasRoomOnNextLine = this.getLineValue(startLine).length < maxLineLength;
if (textArea && hasRoomOnNextLine) {
// Line height + the number of wraps we have on a line.
- offset += this.getLineValue(startRow).length * textArea.height()!;
+ offset += this.getLineValue(startLine).length * textArea.height()!;
} else {
- if (startRow > 0) {
- this.setActionsBar(getScreenCoords(startRow - 1));
+ if (startLine > 1) {
+ this.setActionsBar(getScreenCoords(startLine - 1));
return;
}
- this.setActionsBar(getScreenCoords(startRow + 1));
+ this.setActionsBar(getScreenCoords(startLine + 1));
return;
}
}
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/smart_resize.ts b/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/smart_resize.ts
index b88e0e44591d8..7c4d871c4d73e 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/smart_resize.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/smart_resize.ts
@@ -24,7 +24,7 @@ export default function(editor: any) {
const resize = editor.resize;
const throttledResize = throttle(() => {
- resize.call(editor);
+ resize.call(editor, false);
// Keep current top line in view when resizing to avoid losing user context
const userRow = get(throttledResize, 'topRow', 0);
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt b/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt
index 88467ab3672cd..7de874c244e74 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt
@@ -52,3 +52,33 @@ Correctly handle new lines in triple quotes
SELECT * FROM "TABLE"
"""
}
+==========
+Single quotes escaped special case, start and end
+-------------------------------------
+{
+ "query": "\"test\""
+}
+-------------------------------------
+{
+ "query": "\"test\""
+}
+==========
+Single quotes escaped special case, start
+-------------------------------------
+{
+ "query": "\"test"
+}
+-------------------------------------
+{
+ "query": "\"test"
+}
+==========
+Single quotes escaped special case, end
+-------------------------------------
+{
+ "query": "test\""
+}
+-------------------------------------
+{
+ "query": "test\""
+}
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts b/src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts
index a7f59acf1d77b..0b10938abe704 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts
@@ -84,6 +84,20 @@ export function expandLiteralStrings(data: string) {
// Expand to triple quotes if there are _any_ slashes
if (string.match(/\\./)) {
const firstDoubleQuoteIdx = string.indexOf('"');
+ const lastDoubleQuoteIdx = string.lastIndexOf('"');
+
+ // Handle a special case where we may have a value like "\"test\"". We don't
+ // want to expand this to """"test"""" - so we terminate before processing the string
+ // further if we detect this either at the start or end of the double quote section.
+
+ if (string[firstDoubleQuoteIdx + 1] === '\\' && string[firstDoubleQuoteIdx + 2] === '"') {
+ return string;
+ }
+
+ if (string[lastDoubleQuoteIdx - 1] === '"' && string[lastDoubleQuoteIdx - 2] === '\\') {
+ return string;
+ }
+
const colonAndAnySpacing = string.slice(0, firstDoubleQuoteIdx);
const rawStringifiedValue = string.slice(firstDoubleQuoteIdx, string.length);
// Remove one level of JSON stringification
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.indices.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.indices.json
index 45da7f054bfb4..e6ca1fb575396 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.indices.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.indices.json
@@ -5,8 +5,15 @@
"bytes": [
"b",
"k",
+ "kb",
"m",
- "g"
+ "mb",
+ "g",
+ "gb",
+ "t",
+ "tb",
+ "p",
+ "pb"
],
"local": "__flag__",
"master_timeout": "",
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/clear_scroll.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/clear_scroll.json
index 55d9673054276..7e6e6692f931b 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/clear_scroll.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/clear_scroll.json
@@ -4,8 +4,7 @@
"DELETE"
],
"patterns": [
- "_search/scroll",
- "_search/scroll/{scroll_id}"
+ "_search/scroll"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-body.html#_clear_scroll_api"
}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/create.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/create.json
index 6c0ee8a2425ee..8bbee143c299f 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/create.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/create.json
@@ -22,8 +22,7 @@
"POST"
],
"patterns": [
- "{indices}/_create/{id}",
- "{indices}/{type}/{id}/_create"
+ "{indices}/_create/{id}"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-index_.html"
}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/delete.json
index aba84d0a10fc2..0852d8d184831 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/delete.json
@@ -23,8 +23,7 @@
"DELETE"
],
"patterns": [
- "{indices}/_doc/{id}",
- "{indices}/{type}/{id}"
+ "{indices}/_doc/{id}"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-delete.html"
}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json
index 3867efd814238..2d1636d5f2c02 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json
@@ -1,7 +1,6 @@
{
"delete_by_query": {
"url_params": {
- "analyzer": "",
"analyze_wildcard": "__flag__",
"default_operator": [
"AND",
@@ -31,6 +30,7 @@
"dfs_query_then_fetch"
],
"search_timeout": "",
+ "size": "",
"max_docs": "all documents",
"sort": [],
"_source": [],
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/exists_source.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/exists_source.json
index e96273ffbc083..9ffc4b55f3037 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/exists_source.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/exists_source.json
@@ -20,8 +20,7 @@
"HEAD"
],
"patterns": [
- "{indices}/_source/{id}",
- "{indices}/{type}/{id}/_source"
+ "{indices}/_source/{id}"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-get.html"
}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/get_script_languages.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/get_script_languages.json
new file mode 100644
index 0000000000000..10ea433ca68c5
--- /dev/null
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/get_script_languages.json
@@ -0,0 +1,10 @@
+{
+ "get_script_languages": {
+ "methods": [
+ "GET"
+ ],
+ "patterns": [
+ "_script_language"
+ ]
+ }
+}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json
index 31acc86a2fa56..6fbdea0f1244b 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json
@@ -1,6 +1,7 @@
{
"indices.shrink": {
"url_params": {
+ "copy_settings": "__flag__",
"timeout": "",
"master_timeout": "",
"wait_for_active_shards": ""
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json
index 1bfbaa078b796..68f2e338cd201 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json
@@ -1,6 +1,7 @@
{
"indices.split": {
"url_params": {
+ "copy_settings": "__flag__",
"timeout": "",
"master_timeout": "",
"wait_for_active_shards": ""
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.validate_query.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.validate_query.json
index ceffec26beecc..33720576ef8a3 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.validate_query.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.validate_query.json
@@ -28,8 +28,7 @@
],
"patterns": [
"_validate/query",
- "{indices}/_validate/query",
- "{indices}/{type}/_validate/query"
+ "{indices}/_validate/query"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-validate.html"
}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json
index 0b0ca087b1819..c2f741066bbdb 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json
@@ -9,8 +9,7 @@
],
"typed_keys": "__flag__",
"max_concurrent_searches": "",
- "rest_total_hits_as_int": "__flag__",
- "ccs_minimize_roundtrips": "__flag__"
+ "rest_total_hits_as_int": "__flag__"
},
"methods": [
"GET",
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.hot_threads.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.hot_threads.json
index b8aa5dd4ca711..b3cbbe80e0d00 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.hot_threads.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.hot_threads.json
@@ -17,13 +17,7 @@
],
"patterns": [
"_nodes/hot_threads",
- "_nodes/{nodes}/hot_threads",
- "_cluster/nodes/hotthreads",
- "_cluster/nodes/{nodes}/hotthreads",
- "_nodes/hotthreads",
- "_nodes/{nodes}/hotthreads",
- "_cluster/nodes/hot_threads",
- "_cluster/nodes/{nodes}/hot_threads"
+ "_nodes/{nodes}/hot_threads"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/cluster-nodes-hot-threads.html"
}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/rank_eval.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/rank_eval.json
index 620f1c629d959..c2bed081124a8 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/rank_eval.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/rank_eval.json
@@ -8,6 +8,10 @@
"closed",
"none",
"all"
+ ],
+ "search_type": [
+ "query_then_fetch",
+ "dfs_query_then_fetch"
]
},
"methods": [
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/scroll.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/scroll.json
index 3e959b9630e98..4ce82a2c25e0e 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/scroll.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/scroll.json
@@ -10,8 +10,7 @@
"POST"
],
"patterns": [
- "_search/scroll",
- "_search/scroll/{scroll_id}"
+ "_search/scroll"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-body.html#request-body-search-scroll"
}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json
index 582ecab1dd614..cf5a5c5f32db3 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json
@@ -22,8 +22,7 @@
"explain": "__flag__",
"profile": "__flag__",
"typed_keys": "__flag__",
- "rest_total_hits_as_int": "__flag__",
- "ccs_minimize_roundtrips": "__flag__"
+ "rest_total_hits_as_int": "__flag__"
},
"methods": [
"GET",
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/update.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/update.json
index 4e103b0af2195..43945dfada35c 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/update.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/update.json
@@ -21,8 +21,7 @@
"POST"
],
"patterns": [
- "{indices}/_update/{id}",
- "{indices}/{type}/{id}/_update"
+ "{indices}/_update/{id}"
],
"documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/docs-update.html"
}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json b/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json
index 739ea16888146..393197949e86c 100644
--- a/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json
+++ b/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json
@@ -32,6 +32,7 @@
"dfs_query_then_fetch"
],
"search_timeout": "",
+ "size": "",
"max_docs": "all documents",
"sort": [],
"_source": [],
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/clear_scroll.json b/src/legacy/core_plugins/console/server/api_server/spec/overrides/clear_scroll.json
new file mode 100644
index 0000000000000..e9d4a6cee54ce
--- /dev/null
+++ b/src/legacy/core_plugins/console/server/api_server/spec/overrides/clear_scroll.json
@@ -0,0 +1,7 @@
+{
+ "clear_scroll": {
+ "data_autocomplete_rules": {
+ "scroll_id": ""
+ }
+ }
+}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/create.json b/src/legacy/core_plugins/console/server/api_server/spec/overrides/create.json
deleted file mode 100644
index 0bbf456245c84..0000000000000
--- a/src/legacy/core_plugins/console/server/api_server/spec/overrides/create.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "create": {
- "url_params": {
- "timeout": "1m",
- "ttl": "5m",
- "version": "1"
- },
- "methods": [
- "PUT",
- "POST"
- ],
- "patterns": [
- "{indices}/{type}/{id}/_create"
- ]
- }
-}
diff --git a/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
index 55e2c63f608d4..257513f20fa94 100644
--- a/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
+++ b/src/legacy/core_plugins/data/public/search/fetch/components/__snapshots__/shard_failure_table.test.tsx.snap
@@ -72,5 +72,6 @@ exports[`ShardFailureTable renders matching snapshot given valid properties 1`]
},
}
}
+ tableLayout="fixed"
/>
`;
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
index 632fe63e9e148..278811ca85df9 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
+++ b/src/legacy/core_plugins/input_control_vis/public/components/editor/__snapshots__/controls_tab.test.tsx.snap
@@ -135,11 +135,7 @@ exports[`renders ControlsTab 1`] = `
>
) => void;
handleParentChange: (controlIndex: number, event: ChangeEvent) => void;
- parentCandidates: EuiSelectProps['options'];
+ parentCandidates: React.ComponentProps['options'];
deps: InputControlVisDependencies;
}
diff --git a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap
index 31c221b36e2b2..99482a4be2d7b 100644
--- a/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap
+++ b/src/legacy/core_plugins/input_control_vis/public/components/vis/__snapshots__/list_control.test.tsx.snap
@@ -8,10 +8,7 @@ exports[`disableMsg 1`] = `
label="list control"
>
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/area.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/area.js
index 049544b504918..fd13067c84cc0 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/area.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/area.js
@@ -33,7 +33,7 @@ import {
getConfigCollections,
} from './utils/collections';
import { getAreaOptionTabs, countLabel } from './utils/common_config';
-import { palettes } from '@elastic/eui/lib/services';
+import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
import { vislibVisController } from './controller';
export const areaDefinition = {
@@ -117,7 +117,7 @@ export const areaDefinition = {
value: 10,
width: 1,
style: ThresholdLineStyles.FULL,
- color: palettes.euiPaletteColorBlind.colors[9],
+ color: euiPaletteColorBlind()[9],
},
labels: {},
},
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_ranges.tsx b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_ranges.tsx
index 276e765ae7fe6..947c7ae7e6e36 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_ranges.tsx
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/components/common/color_ranges.tsx
@@ -48,6 +48,10 @@ function ColorRanges({
const validateRange = useCallback(
({ from, to }, index) => {
+ if (!colorsRange[index]) {
+ return [false, false];
+ }
+
const leftBound = index === 0 ? -Infinity : colorsRange[index - 1].to || 0;
const isFromValid = from >= leftBound;
const isToValid = to >= from;
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/histogram.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/histogram.js
index fdc18f5bfa0e6..bc017b5a1a871 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/histogram.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/histogram.js
@@ -32,7 +32,7 @@ import {
getConfigCollections,
} from './utils/collections';
import { getAreaOptionTabs, countLabel } from './utils/common_config';
-import { palettes } from '@elastic/eui/lib/services';
+import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
import { vislibVisController } from './controller';
export const histogramDefinition = {
@@ -120,7 +120,7 @@ export const histogramDefinition = {
value: 10,
width: 1,
style: ThresholdLineStyles.FULL,
- color: palettes.euiPaletteColorBlind.colors[9],
+ color: euiPaletteColorBlind()[9],
},
},
},
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js
index 15bbf9c01cd77..ee3570314618a 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js
@@ -32,7 +32,7 @@ import {
getConfigCollections,
} from './utils/collections';
import { getAreaOptionTabs, countLabel } from './utils/common_config';
-import { palettes } from '@elastic/eui/lib/services';
+import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
import { vislibVisController } from './controller';
export const horizontalBarDefinition = {
@@ -119,7 +119,7 @@ export const horizontalBarDefinition = {
value: 10,
width: 1,
style: ThresholdLineStyles.FULL,
- color: palettes.euiPaletteColorBlind.colors[9],
+ color: euiPaletteColorBlind()[9],
},
},
},
diff --git a/src/legacy/core_plugins/kbn_vislib_vis_types/public/line.js b/src/legacy/core_plugins/kbn_vislib_vis_types/public/line.js
index a3fb874b5aa1b..d6d075f452fed 100644
--- a/src/legacy/core_plugins/kbn_vislib_vis_types/public/line.js
+++ b/src/legacy/core_plugins/kbn_vislib_vis_types/public/line.js
@@ -32,7 +32,7 @@ import {
InterpolationModes,
getConfigCollections,
} from './utils/collections';
-import { palettes } from '@elastic/eui/lib/services';
+import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
import { getAreaOptionTabs, countLabel } from './utils/common_config';
import { vislibVisController } from './controller';
@@ -118,7 +118,7 @@ export const lineDefinition = {
value: 10,
width: 1,
style: ThresholdLineStyles.FULL,
- color: palettes.euiPaletteColorBlind.colors[9],
+ color: euiPaletteColorBlind()[9],
},
},
},
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/__tests__/url_helper.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/url_helper.test.ts
new file mode 100644
index 0000000000000..df2dbfd54c130
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/dashboard/__tests__/url_helper.test.ts
@@ -0,0 +1,118 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+jest.mock('../', () => ({
+ DashboardConstants: {
+ ADD_EMBEDDABLE_ID: 'addEmbeddableId',
+ ADD_EMBEDDABLE_TYPE: 'addEmbeddableType',
+ },
+}));
+
+jest.mock('../legacy_imports', () => {
+ return {
+ absoluteToParsedUrl: jest.fn(() => {
+ return {
+ basePath: '/pep',
+ appId: 'kibana',
+ appPath: '/dashboard?addEmbeddableType=lens&addEmbeddableId=123eb456cd&x=1&y=2&z=3',
+ hostname: 'localhost',
+ port: 5601,
+ protocol: 'http:',
+ addQueryParameter: () => {},
+ getAbsoluteUrl: () => {
+ return 'http://localhost:5601/pep/app/kibana#/dashboard?addEmbeddableType=lens&addEmbeddableId=123eb456cd&x=1&y=2&z=3';
+ },
+ };
+ }),
+ };
+});
+
+import {
+ addEmbeddableToDashboardUrl,
+ getLensUrlFromDashboardAbsoluteUrl,
+ getUrlVars,
+} from '../np_ready/url_helper';
+
+describe('Dashboard URL Helper', () => {
+ beforeEach(() => {
+ jest.resetModules();
+ });
+
+ it('addEmbeddableToDashboardUrl', () => {
+ const id = '123eb456cd';
+ const type = 'lens';
+ const urlVars = {
+ x: '1',
+ y: '2',
+ z: '3',
+ };
+ const basePath = '/pep';
+ const url =
+ "http://localhost:5601/pep/app/kibana#/dashboard?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()";
+ expect(addEmbeddableToDashboardUrl(url, basePath, id, urlVars, type)).toEqual(
+ `http://localhost:5601/pep/app/kibana#/dashboard?addEmbeddableType=${type}&addEmbeddableId=${id}&x=1&y=2&z=3`
+ );
+ });
+
+ it('getUrlVars', () => {
+ let url =
+ "http://localhost:5601/app/kibana#/dashboard?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()";
+ expect(getUrlVars(url)).toEqual({
+ _g: '(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))',
+ _a: "(description:'',filters:!()",
+ });
+ url = 'http://mybusiness.mydomain.com/app/kibana#/dashboard?x=y&y=z';
+ expect(getUrlVars(url)).toEqual({
+ x: 'y',
+ y: 'z',
+ });
+ url = 'http://localhost:5601/app/kibana#/dashboard/777182';
+ expect(getUrlVars(url)).toEqual({});
+ url =
+ 'http://localhost:5601/app/kibana#/dashboard/777182?title=Some%20Dashboard%20With%20Spaces';
+ expect(getUrlVars(url)).toEqual({ title: 'Some Dashboard With Spaces' });
+ });
+
+ it('getLensUrlFromDashboardAbsoluteUrl', () => {
+ const id = '1244';
+ const basePath = '/wev';
+ let url =
+ "http://localhost:5601/wev/app/kibana#/dashboard?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()";
+ expect(getLensUrlFromDashboardAbsoluteUrl(url, basePath, id)).toEqual(
+ 'http://localhost:5601/wev/app/kibana#/lens/edit/1244'
+ );
+
+ url =
+ "http://localhost:5601/wev/app/kibana#/dashboard/625357282?_a=(description:'',filters:!()&_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))";
+ expect(getLensUrlFromDashboardAbsoluteUrl(url, basePath, id)).toEqual(
+ 'http://localhost:5601/wev/app/kibana#/lens/edit/1244'
+ );
+
+ url = 'http://myserver.mydomain.com:5601/wev/app/kibana#/dashboard/777182';
+ expect(getLensUrlFromDashboardAbsoluteUrl(url, basePath, id)).toEqual(
+ 'http://myserver.mydomain.com:5601/wev/app/kibana#/lens/edit/1244'
+ );
+
+ url =
+ "http://localhost:5601/app/kibana#/dashboard?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-15m,to:now))&_a=(description:'',filters:!()";
+ expect(getLensUrlFromDashboardAbsoluteUrl(url, '', id)).toEqual(
+ 'http://localhost:5601/app/kibana#/lens/edit/1244'
+ );
+ });
+});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index ec0913e5fb3e7..ba01919431080 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -67,3 +67,4 @@ export { IInjector } from 'ui/chrome';
export { SavedObjectLoader } from 'ui/saved_objects';
export { VISUALIZE_EMBEDDABLE_TYPE } from '../visualize_embeddable';
export { registerTimefilterWithGlobalStateFactory } from 'ui/timefilter/setup_router';
+export { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url';
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
index 2a5dedab98151..7f7bf7cf47bda 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -86,11 +86,9 @@ export const renderApp = (element: HTMLElement, appBasePath: string, deps: Rende
};
};
-const mainTemplate = (basePath: string) => `
+const mainTemplate = (basePath: string) => `
-`;
+
-
+
}
/>
@@ -63,6 +66,7 @@ exports[`after fetch initialFilter 1`] = `
entityName="dashboard"
entityNamePlural="dashboards"
findItems={[Function]}
+ headingId="dashboardListingHeading"
initialFilter="my dashboard"
listingLimit={1000}
noItemsFragment={
@@ -114,13 +118,15 @@ exports[`after fetch initialFilter 1`] = `
}
iconType="dashboardApp"
title={
-