- {children}
-
- );
- }
-}
diff --git a/packages/kbn-ui-framework/generator-kui/component/templates/index.js b/packages/kbn-ui-framework/generator-kui/component/templates/index.js
deleted file mode 100644
index 1da6deaa79d9a..0000000000000
--- a/packages/kbn-ui-framework/generator-kui/component/templates/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export {
- <%= componentName %>,
-} from './<%= fileName %>';
diff --git a/packages/kbn-ui-framework/generator-kui/component/templates/stateless_function.js b/packages/kbn-ui-framework/generator-kui/component/templates/stateless_function.js
deleted file mode 100644
index 7fcbf0c19d728..0000000000000
--- a/packages/kbn-ui-framework/generator-kui/component/templates/stateless_function.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-
-export const <%= componentName %> = ({
- children,
- className,
- ...rest
-}) => {
- const classes = classNames('<%= cssClassName %>', className);
-
- return (
-
- {children}
-
- );
-};
-
-<%= componentName %>.propTypes = {
- children: PropTypes.node,
- className: PropTypes.string,
-};
diff --git a/packages/kbn-ui-framework/generator-kui/component/templates/test.js b/packages/kbn-ui-framework/generator-kui/component/templates/test.js
deleted file mode 100644
index 4f384d6c2d3aa..0000000000000
--- a/packages/kbn-ui-framework/generator-kui/component/templates/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import { render } from 'enzyme';
-import { requiredProps } from '../../test/required_props';
-
-import { <%= componentName %> } from './<%= fileName %>';
-
-describe('<%= componentName %>', () => {
- test('is rendered', () => {
- const component = render(
- <<%= componentName %> {...requiredProps} />
- );
-
- expect(component)
- .toMatchSnapshot();
- });
-});
diff --git a/packages/kbn-ui-framework/generator-kui/documentation/index.js b/packages/kbn-ui-framework/generator-kui/documentation/index.js
deleted file mode 100644
index 03f8d5813b251..0000000000000
--- a/packages/kbn-ui-framework/generator-kui/documentation/index.js
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * 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.
- */
-
-const chalk = require('chalk');
-const { resolve } = require('path');
-const Generator = require('yeoman-generator');
-const utils = require('../utils');
-
-const DOCUMENTATION_PAGE_PATH = resolve(__dirname, '../../doc_site/src/views');
-
-module.exports = class extends Generator {
- constructor(args, options) {
- super(args, options);
-
- this.fileType = options.fileType;
- }
-
- prompting() {
- const prompts = [
- {
- message: "What's the name of the component you're documenting? Use snake_case, please.",
- name: 'name',
- type: 'input',
- store: true,
- },
- ];
-
- if (this.fileType === 'demo') {
- prompts.push({
- message: `What's the name of the directory this demo should go in? (Within ${DOCUMENTATION_PAGE_PATH}). Use snake_case, please.`,
- name: 'folderName',
- type: 'input',
- store: true,
- default: (answers) => answers.name,
- });
-
- prompts.push({
- message: 'What would you like to name this demo? Use snake_case, please.',
- name: 'demoName',
- type: 'input',
- store: true,
- });
- }
-
- return this.prompt(prompts).then((answers) => {
- this.config = answers;
- });
- }
-
- writing() {
- const config = this.config;
-
- const writeDocumentationPage = () => {
- const componentExampleName = utils.makeComponentName(config.name, false);
- const componentExamplePrefix = utils.lowerCaseFirstLetter(componentExampleName);
- const fileName = config.name;
-
- const path = DOCUMENTATION_PAGE_PATH;
-
- const vars = (config.documentationVars = {
- componentExampleName,
- componentExamplePrefix,
- fileName,
- });
-
- const documentationPagePath = (config.documentationPagePath = `${path}/${config.name}/${config.name}_example.js`);
-
- this.fs.copyTpl(
- this.templatePath('documentation_page.js'),
- this.destinationPath(documentationPagePath),
- vars
- );
- };
-
- const writeDocumentationPageDemo = (fileName, folderName) => {
- const componentExampleName = utils.makeComponentName(fileName, false);
- const componentExamplePrefix = utils.lowerCaseFirstLetter(componentExampleName);
- const componentName = utils.makeComponentName(config.name);
-
- const path = DOCUMENTATION_PAGE_PATH;
-
- const vars = (config.documentationVars = {
- componentExampleName,
- componentExamplePrefix,
- componentName,
- fileName,
- });
-
- const documentationPageDemoPath = (config.documentationPageDemoPath = `${path}/${folderName}/${fileName}.js`);
-
- this.fs.copyTpl(
- this.templatePath('documentation_page_demo.js'),
- this.destinationPath(documentationPageDemoPath),
- vars
- );
- };
-
- const writeSandbox = () => {
- const fileName = config.name;
- const componentExampleName = utils.makeComponentName(fileName, false);
-
- const path = DOCUMENTATION_PAGE_PATH;
-
- const vars = (config.documentationVars = {
- componentExampleName,
- fileName,
- });
-
- const sandboxPath = (config.documentationPageDemoPath = `${path}/${config.name}/${fileName}`);
-
- this.fs.copyTpl(
- this.templatePath('documentation_sandbox.html'),
- this.destinationPath(`${sandboxPath}_sandbox.html`)
- );
-
- this.fs.copyTpl(
- this.templatePath('documentation_sandbox.js'),
- this.destinationPath(`${sandboxPath}_sandbox.js`),
- vars
- );
- };
-
- switch (this.fileType) {
- case 'documentation':
- writeDocumentationPage();
- writeDocumentationPageDemo(config.name, config.name);
- break;
-
- case 'demo':
- writeDocumentationPageDemo(config.demoName, config.folderName);
- break;
-
- case 'sandbox':
- writeSandbox();
- break;
- }
- }
-
- end() {
- const showImportDemoSnippet = () => {
- const {
- componentExampleName,
- componentExamplePrefix,
- fileName,
- } = this.config.documentationVars;
-
- this.log(chalk.white('\n// Import demo into example.'));
- this.log(
- `${chalk.magenta('import')} ${componentExampleName} from ${chalk.cyan(
- `'./${fileName}'`
- )};\n` +
- `${chalk.magenta('const')} ${componentExamplePrefix}Source = require(${chalk.cyan(
- `'!!raw-loader!./${fileName}'`
- )});\n` +
- `${chalk.magenta(
- 'const'
- )} ${componentExamplePrefix}Html = renderToHtml(${componentExampleName});`
- );
-
- this.log(chalk.white('\n// Render demo.'));
- this.log(
- `Do whatever you want here!
diff --git a/packages/kbn-ui-framework/generator-kui/documentation/templates/documentation_sandbox.js b/packages/kbn-ui-framework/generator-kui/documentation/templates/documentation_sandbox.js deleted file mode 100644 index 6dd661601b891..0000000000000 --- a/packages/kbn-ui-framework/generator-kui/documentation/templates/documentation_sandbox.js +++ /dev/null @@ -1,27 +0,0 @@ -import React from 'react'; - -import { - GuideDemo, - GuideSandbox, - GuideSandboxCodeToggle, - GuideSectionTypes, -} from '../../components'; - -import html from './<%= fileName %>_sandbox.html'; - -export default props => ( -In the future, this algorithm could enable (2.6) "read-only functionality during the downtime window" but this is outside of the scope of this RFC.
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts index 6988a3211fa12..48187fe465392 100644 --- a/src/core/public/doc_links/doc_links_service.ts +++ b/src/core/public/doc_links/doc_links_service.ts @@ -37,6 +37,7 @@ export class DocLinksService { ELASTIC_WEBSITE_URL, links: { dashboard: { + guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html`, drilldowns: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/drilldowns.html`, drilldownsTriggerPicker: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/url-drilldown.html#trigger-picker`, urlDrilldownTemplateSyntax: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/url-drilldown.html#templating`, @@ -134,6 +135,8 @@ export class DocLinksService { visualize: { guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/visualize.html`, timelionDeprecation: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html#timelion-deprecation`, + lens: `${ELASTIC_WEBSITE_URL}what-is/kibana-lens`, + maps: `${ELASTIC_WEBSITE_URL}maps`, }, }, }); @@ -146,6 +149,7 @@ export interface DocLinksStart { readonly ELASTIC_WEBSITE_URL: string; readonly links: { readonly dashboard: { + readonly guide: string; readonly drilldowns: string; readonly drilldownsTriggerPicker: string; readonly urlDrilldownTemplateSyntax: string; diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md index fd2d943cab9d2..781a50f849e24 100644 --- a/src/core/public/public.api.md +++ b/src/core/public/public.api.md @@ -460,6 +460,7 @@ export interface DocLinksStart { // (undocumented) readonly links: { readonly dashboard: { + readonly guide: string; readonly drilldowns: string; readonly drilldownsTriggerPicker: string; readonly urlDrilldownTemplateSyntax: string; diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts index 333f5caf72525..c35ec809fcf8d 100644 --- a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts +++ b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts @@ -21,28 +21,64 @@ import { esKuery } from '../../../es_query'; type KueryNode = any; -import { typeRegistryMock } from '../../../saved_objects_type_registry.mock'; -import { ALL_NAMESPACES_STRING } from '../utils'; +import { ALL_NAMESPACES_STRING, DEFAULT_NAMESPACE_STRING } from '../utils'; +import { SavedObjectTypeRegistry } from '../../../saved_objects_type_registry'; import { getQueryParams, getClauseForReference } from './query_params'; -const registry = typeRegistryMock.create(); +const registerTypes = (registry: SavedObjectTypeRegistry) => { + registry.registerType({ + name: 'pending', + hidden: false, + namespaceType: 'single', + mappings: { + properties: { title: { type: 'text' } }, + }, + management: { + defaultSearchField: 'title', + }, + }); -const MAPPINGS = { - properties: { - pending: { properties: { title: { type: 'text' } } }, - saved: { + registry.registerType({ + name: 'saved', + hidden: false, + namespaceType: 'single', + mappings: { properties: { title: { type: 'text', fields: { raw: { type: 'keyword' } } }, obj: { properties: { key1: { type: 'text' } } }, }, }, - // mock registry returns isMultiNamespace=true for 'shared' type - shared: { properties: { name: { type: 'keyword' } } }, - // mock registry returns isNamespaceAgnostic=true for 'global' type - global: { properties: { name: { type: 'keyword' } } }, - }, + management: { + defaultSearchField: 'title', + }, + }); + + registry.registerType({ + name: 'shared', + hidden: false, + namespaceType: 'multiple', + mappings: { + properties: { name: { type: 'keyword' } }, + }, + management: { + defaultSearchField: 'name', + }, + }); + + registry.registerType({ + name: 'global', + hidden: false, + namespaceType: 'agnostic', + mappings: { + properties: { name: { type: 'keyword' } }, + }, + management: { + defaultSearchField: 'name', + }, + }); }; -const ALL_TYPES = Object.keys(MAPPINGS.properties); + +const ALL_TYPES = ['pending', 'saved', 'shared', 'global']; // get all possible subsets (combination) of all types const ALL_TYPE_SUBSETS = ALL_TYPES.reduce( (subsets, value) => subsets.concat(subsets.map((set) => [...set, value])), @@ -51,48 +87,58 @@ const ALL_TYPE_SUBSETS = ALL_TYPES.reduce( .filter((x) => x.length) // exclude empty set .map((x) => (x.length === 1 ? x[0] : x)); // if a subset is a single string, destructure it -const createTypeClause = (type: string, namespaces?: string[]) => { - if (registry.isMultiNamespace(type)) { - const array = [...(namespaces ?? ['default']), ALL_NAMESPACES_STRING]; - return { - bool: { - must: expect.arrayContaining([{ terms: { namespaces: array } }]), - must_not: [{ exists: { field: 'namespace' } }], - }, - }; - } else if (registry.isSingleNamespace(type)) { - const nonDefaultNamespaces = namespaces?.filter((n) => n !== 'default') ?? []; - const should: any = []; - if (nonDefaultNamespaces.length > 0) { - should.push({ terms: { namespace: nonDefaultNamespaces } }); - } - if (namespaces?.includes('default')) { - should.push({ bool: { must_not: [{ exists: { field: 'namespace' } }] } }); - } - return { - bool: { - must: [{ term: { type } }], - should: expect.arrayContaining(should), - minimum_should_match: 1, - must_not: [{ exists: { field: 'namespaces' } }], - }, - }; - } - // isNamespaceAgnostic - return { - bool: expect.objectContaining({ - must_not: [{ exists: { field: 'namespace' } }, { exists: { field: 'namespaces' } }], - }), - }; -}; - /** * Note: these tests cases are defined in the order they appear in the source code, for readability's sake */ describe('#getQueryParams', () => { - const mappings = MAPPINGS; + let registry: SavedObjectTypeRegistry; type Result = ReturnType {
@@ -272,6 +273,8 @@ class DashboardGridUi extends React.Component {
}}
>
{
});
});
+ describe('getFormatterForField', () => {
+ test('should return the default one for empty objects', () => {
+ indexPattern.setFieldFormat('scriptedFieldWithEmptyFormatter', {});
+ expect(
+ indexPattern.getFormatterForField({
+ name: 'scriptedFieldWithEmptyFormatter',
+ type: 'number',
+ esTypes: ['long'],
+ })
+ ).toEqual(
+ expect.objectContaining({
+ convert: expect.any(Function),
+ getConverterFor: expect.any(Function),
+ })
+ );
+ });
+ });
+
describe('toSpec', () => {
test('should match snapshot', () => {
const formatter = {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index a0f27078543a9..4508d7b1d9082 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -291,15 +291,15 @@ export class IndexPattern implements IIndexPattern {
getFormatterForField(
field: IndexPatternField | IndexPatternField['spec'] | IFieldType
): FieldFormat {
- const formatSpec = this.fieldFormatMap[field.name];
- if (formatSpec) {
- return this.fieldFormats.getInstance(formatSpec.id, formatSpec.params);
- } else {
- return this.fieldFormats.getDefaultInstance(
- field.type as KBN_FIELD_TYPES,
- field.esTypes as ES_FIELD_TYPES[]
- );
+ const fieldFormat = this.getFormatterForFieldNoDefault(field.name);
+ if (fieldFormat) {
+ return fieldFormat;
}
+
+ return this.fieldFormats.getDefaultInstance(
+ field.type as KBN_FIELD_TYPES,
+ field.esTypes as ES_FIELD_TYPES[]
+ );
}
/**
@@ -308,7 +308,7 @@ export class IndexPattern implements IIndexPattern {
*/
getFormatterForFieldNoDefault(fieldname: string) {
const formatSpec = this.fieldFormatMap[fieldname];
- if (formatSpec) {
+ if (formatSpec?.id) {
return this.fieldFormats.getInstance(formatSpec.id, formatSpec.params);
}
}
diff --git a/src/plugins/data/common/search/aggs/types.ts b/src/plugins/data/common/search/aggs/types.ts
index 09a13762d4d70..897b60e91b100 100644
--- a/src/plugins/data/common/search/aggs/types.ts
+++ b/src/plugins/data/common/search/aggs/types.ts
@@ -94,7 +94,7 @@ export interface AggsCommonStart {
*/
getDateMetaByDatatableColumn: (
column: DatatableColumn
- ) => Promise;
+ ) => Promise;
createAggConfigs: (
indexPattern: IndexPattern,
configStates?: CreateAggConfigParams[],
diff --git a/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts b/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts
index e56d622734554..8eb076f5b7906 100644
--- a/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts
+++ b/src/plugins/data/common/search/aggs/utils/time_column_meta.test.ts
@@ -91,6 +91,43 @@ describe('getDateMetaByDatatableColumn', () => {
});
});
+ it('throws if unable to resolve interval', async () => {
+ await expect(
+ getDateMetaByDatatableColumn(params)({
+ id: 'test',
+ name: 'test',
+ meta: {
+ type: 'date',
+ source: 'esaggs',
+ sourceParams: {
+ type: BUCKET_TYPES.DATE_HISTOGRAM,
+ params: {
+ time_zone: 'UTC',
+ interval: 'auto',
+ },
+ },
+ },
+ })
+ ).rejects.toBeDefined();
+
+ await expect(
+ getDateMetaByDatatableColumn(params)({
+ id: 'test',
+ name: 'test',
+ meta: {
+ type: 'date',
+ source: 'esaggs',
+ sourceParams: {
+ type: BUCKET_TYPES.DATE_HISTOGRAM,
+ params: {
+ time_zone: 'UTC',
+ },
+ },
+ },
+ })
+ ).rejects.toBeDefined();
+ });
+
it('returns resolved auto interval', async () => {
expect(
await getDateMetaByDatatableColumn(params)({
@@ -106,8 +143,8 @@ describe('getDateMetaByDatatableColumn', () => {
interval: 'auto',
},
appliedTimeRange: {
- from: 'now-5d',
- to: 'now',
+ from: '2020-10-05T00:00:00.000Z',
+ to: '2020-10-10T00:00:00.000Z',
},
},
},
diff --git a/src/plugins/data/common/search/aggs/utils/time_column_meta.ts b/src/plugins/data/common/search/aggs/utils/time_column_meta.ts
index 1bea716c6a049..7ed8cb79f63f4 100644
--- a/src/plugins/data/common/search/aggs/utils/time_column_meta.ts
+++ b/src/plugins/data/common/search/aggs/utils/time_column_meta.ts
@@ -38,11 +38,11 @@ export const getDateMetaByDatatableColumn = ({
getConfig,
}: DateMetaByColumnDeps) => async (
column: DatatableColumn
-): Promise => {
+): Promise => {
if (column.meta.source !== 'esaggs') return;
if (column.meta.sourceParams?.type !== BUCKET_TYPES.DATE_HISTOGRAM) return;
const params = column.meta.sourceParams.params as AggParamsDateHistogram;
- const appliedTimeRange = column.meta.sourceParams.appliedTimeRange as TimeRange;
+ const appliedTimeRange = column.meta.sourceParams.appliedTimeRange as TimeRange | undefined;
const tz = inferTimeZone(
params,
@@ -52,9 +52,11 @@ export const getDateMetaByDatatableColumn = ({
);
const interval =
- params.interval === 'auto' ? calculateAutoTimeExpression(appliedTimeRange) : params.interval;
+ params.interval === 'auto' && appliedTimeRange
+ ? calculateAutoTimeExpression(appliedTimeRange)
+ : params.interval;
- if (!interval) {
+ if (!interval || interval === 'auto') {
throw new Error('time interval could not be determined');
}
diff --git a/src/plugins/data/public/search/expressions/esaggs.ts b/src/plugins/data/public/search/expressions/esaggs.ts
index dba77d398c8b6..3932484801fa8 100644
--- a/src/plugins/data/public/search/expressions/esaggs.ts
+++ b/src/plugins/data/public/search/expressions/esaggs.ts
@@ -267,6 +267,8 @@ export const esaggs = (): EsaggsExpressionFunctionDefinition => ({
searchSource.setField('index', indexPattern);
searchSource.setField('size', 0);
+ const resolvedTimeRange = input?.timeRange && calculateBounds(input.timeRange);
+
const response = await handleCourierRequest({
searchSource,
aggs,
@@ -303,7 +305,10 @@ export const esaggs = (): EsaggsExpressionFunctionDefinition => ({
input?.timeRange &&
args.timeFields &&
args.timeFields.includes(column.aggConfig.params.field?.name)
- ? { from: input.timeRange.from, to: input.timeRange.to }
+ ? {
+ from: resolvedTimeRange?.min?.toISOString(),
+ to: resolvedTimeRange?.max?.toISOString(),
+ }
: undefined,
...column.aggConfig.serialize(),
},
diff --git a/src/plugins/embeddable/public/lib/containers/container.ts b/src/plugins/embeddable/public/lib/containers/container.ts
index 9f701f021162a..4dede8bf5d752 100644
--- a/src/plugins/embeddable/public/lib/containers/container.ts
+++ b/src/plugins/embeddable/public/lib/containers/container.ts
@@ -19,6 +19,7 @@
import uuid from 'uuid';
import { merge, Subscription } from 'rxjs';
+import { startWith, pairwise } from 'rxjs/operators';
import {
Embeddable,
EmbeddableInput,
@@ -55,7 +56,12 @@ export abstract class Container<
parent?: Container
) {
super(input, output, parent);
- this.subscription = this.getInput$().subscribe(() => this.maybeUpdateChildren());
+ this.subscription = this.getInput$()
+ // At each update event, get both the previous and current state
+ .pipe(startWith(input), pairwise())
+ .subscribe(([{ panels: prevPanels }, { panels: currentPanels }]) => {
+ this.maybeUpdateChildren(currentPanels, prevPanels);
+ });
}
public updateInputForChild(
@@ -329,16 +335,30 @@ export abstract class Container<
return embeddable;
}
- private maybeUpdateChildren() {
- const allIds = Object.keys({ ...this.input.panels, ...this.output.embeddableLoaded });
+ private panelHasChanged(currentPanel: PanelState, prevPanel: PanelState) {
+ if (currentPanel.type !== prevPanel.type) {
+ return true;
+ }
+ }
+
+ private maybeUpdateChildren(
+ currentPanels: TContainerInput['panels'],
+ prevPanels: TContainerInput['panels']
+ ) {
+ const allIds = Object.keys({ ...currentPanels, ...this.output.embeddableLoaded });
allIds.forEach((id) => {
- if (this.input.panels[id] !== undefined && this.output.embeddableLoaded[id] === undefined) {
- this.onPanelAdded(this.input.panels[id]);
- } else if (
- this.input.panels[id] === undefined &&
- this.output.embeddableLoaded[id] !== undefined
- ) {
- this.onPanelRemoved(id);
+ if (currentPanels[id] !== undefined && this.output.embeddableLoaded[id] === undefined) {
+ return this.onPanelAdded(currentPanels[id]);
+ }
+ if (currentPanels[id] === undefined && this.output.embeddableLoaded[id] !== undefined) {
+ return this.onPanelRemoved(id);
+ }
+ // In case of type change, remove and add a panel with the same id
+ if (currentPanels[id] && prevPanels[id]) {
+ if (this.panelHasChanged(currentPanels[id], prevPanels[id])) {
+ this.onPanelRemoved(id);
+ this.onPanelAdded(currentPanels[id]);
+ }
}
});
}
diff --git a/src/plugins/expressions/public/public.api.md b/src/plugins/expressions/public/public.api.md
index e6bff703aadcd..773d61ebe2e28 100644
--- a/src/plugins/expressions/public/public.api.md
+++ b/src/plugins/expressions/public/public.api.md
@@ -1057,7 +1057,7 @@ export interface Range {
// Warning: (ae-missing-release-tag) "ReactExpressionRenderer" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
-export const ReactExpressionRenderer: ({ className, dataAttrs, padding, renderError, expression, onEvent, reload$, debounce, ...expressionLoaderOptions }: ReactExpressionRendererProps) => JSX.Element;
+export const ReactExpressionRenderer: ({ className, dataAttrs, padding, renderError, expression, onEvent, onData$, reload$, debounce, ...expressionLoaderOptions }: ReactExpressionRendererProps) => JSX.Element;
// Warning: (ae-missing-release-tag) "ReactExpressionRendererProps" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
@@ -1072,6 +1072,8 @@ export interface ReactExpressionRendererProps extends IExpressionLoaderParams {
// (undocumented)
expression: string | ExpressionAstExpression;
// (undocumented)
+ onData$?: (data: TData, adapters?: TInspectorAdapters) => void;
+ // (undocumented)
onEvent?: (event: ExpressionRendererEvent) => void;
// (undocumented)
padding?: 'xs' | 's' | 'm' | 'l' | 'xl';
diff --git a/src/plugins/expressions/public/react_expression_renderer.test.tsx b/src/plugins/expressions/public/react_expression_renderer.test.tsx
index 052c2a9f6a24a..e52d4d153882f 100644
--- a/src/plugins/expressions/public/react_expression_renderer.test.tsx
+++ b/src/plugins/expressions/public/react_expression_renderer.test.tsx
@@ -195,6 +195,38 @@ describe('ExpressionRenderer', () => {
expect(instance.find('[data-test-subj="custom-error"]')).toHaveLength(0);
});
+ it('should call onData$ prop on every data$ observable emission in loader', () => {
+ const dataSubject = new Subject();
+ const data$ = dataSubject.asObservable().pipe(share());
+
+ const newData = {};
+ const inspectData = {};
+ const onData$ = jest.fn();
+
+ (ExpressionLoader as jest.Mock).mockImplementation(() => {
+ return {
+ render$: new Subject(),
+ data$,
+ loading$: new Subject(),
+ events$: new Subject(),
+ update: jest.fn(),
+ inspect: jest.fn(() => inspectData),
+ };
+ });
+
+ mount((data: TData, adapters?: TInspectorAdapters) => void;
/**
* An observable which can be used to re-run the expression without destroying the component
*/
@@ -71,6 +72,7 @@ export const ReactExpressionRenderer = ({
renderError,
expression,
onEvent,
+ onData$,
reload$,
debounce,
...expressionLoaderOptions
@@ -135,6 +137,13 @@ export const ReactExpressionRenderer = ({
})
);
}
+ if (onData$) {
+ subs.push(
+ expressionLoaderRef.current.data$.subscribe((newData) => {
+ onData$(newData, expressionLoaderRef.current?.inspect());
+ })
+ );
+ }
subs.push(
expressionLoaderRef.current.loading$.subscribe(() => {
hasHandledErrorRef.current = false;
diff --git a/src/plugins/input_control_vis/public/input_control_vis_type.ts b/src/plugins/input_control_vis/public/input_control_vis_type.ts
index 782df67f5c58a..6e33e18c1603b 100644
--- a/src/plugins/input_control_vis/public/input_control_vis_type.ts
+++ b/src/plugins/input_control_vis/public/input_control_vis_type.ts
@@ -18,8 +18,7 @@
*/
import { i18n } from '@kbn/i18n';
-
-import { BaseVisTypeOptions } from 'src/plugins/visualizations/public';
+import { VisGroups, BaseVisTypeOptions } from '../../visualizations/public';
import { createInputControlVisController } from './vis_controller';
import { getControlsTab } from './components/editor/controls_tab';
import { OptionsTab } from './components/editor/options_tab';
@@ -37,8 +36,9 @@ export function createInputControlVisTypeDefinition(
defaultMessage: 'Controls',
}),
icon: 'controlsHorizontal',
+ group: VisGroups.TOOLS,
description: i18n.translate('inputControl.register.controlsDescription', {
- defaultMessage: 'Create interactive controls for easy dashboard manipulation.',
+ defaultMessage: 'Add dropdown menus and range sliders to your dashboard.',
}),
stage: 'experimental',
visualization: InputControlVisController,
diff --git a/src/plugins/lens_oss/README.md b/src/plugins/lens_oss/README.md
new file mode 100644
index 0000000000000..187da2497026e
--- /dev/null
+++ b/src/plugins/lens_oss/README.md
@@ -0,0 +1,6 @@
+# lens_oss
+
+The lens_oss plugin registers the lens visualization on OSS.
+It is registered as disabled. The x-pack plugin should unregister this.
+
+`visualizations.unregisterAlias('lensOss')`
\ No newline at end of file
diff --git a/src/plugins/lens_oss/common/constants.ts b/src/plugins/lens_oss/common/constants.ts
new file mode 100644
index 0000000000000..ac92c9e196993
--- /dev/null
+++ b/src/plugins/lens_oss/common/constants.ts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+export const APP_NAME = 'lens';
+export const PLUGIN_ID_OSS = 'lensOss';
+export const APP_PATH = '#/';
+export const APP_ICON = 'lensApp';
diff --git a/src/plugins/visualizations/public/wizard/type_selection/index.ts b/src/plugins/lens_oss/common/index.ts
similarity index 94%
rename from src/plugins/visualizations/public/wizard/type_selection/index.ts
rename to src/plugins/lens_oss/common/index.ts
index c4093b4dec3e8..fd1c2843d6b26 100644
--- a/src/plugins/visualizations/public/wizard/type_selection/index.ts
+++ b/src/plugins/lens_oss/common/index.ts
@@ -17,4 +17,4 @@
* under the License.
*/
-export { TypeSelection } from './type_selection';
+export * from './constants';
diff --git a/src/plugins/lens_oss/config.ts b/src/plugins/lens_oss/config.ts
new file mode 100644
index 0000000000000..6749bd83de39f
--- /dev/null
+++ b/src/plugins/lens_oss/config.ts
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+ enabled: schema.boolean({ defaultValue: true }),
+});
+
+export type ConfigSchema = TypeOf;
diff --git a/src/plugins/lens_oss/kibana.json b/src/plugins/lens_oss/kibana.json
new file mode 100644
index 0000000000000..3e3d3585f37fb
--- /dev/null
+++ b/src/plugins/lens_oss/kibana.json
@@ -0,0 +1,10 @@
+{
+ "id": "lensOss",
+ "version": "kibana",
+ "ui": true,
+ "server": true,
+ "requiredPlugins": [
+ "visualizations"
+ ],
+ "extraPublicDirs": ["common/constants"]
+}
diff --git a/src/plugins/lens_oss/public/index.ts b/src/plugins/lens_oss/public/index.ts
new file mode 100644
index 0000000000000..f936052a37264
--- /dev/null
+++ b/src/plugins/lens_oss/public/index.ts
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+import { LensOSSPlugin } from './plugin';
+
+export const plugin = () => new LensOSSPlugin();
diff --git a/packages/kbn-ui-framework/generator-kui/app/component.js b/src/plugins/lens_oss/public/plugin.ts
similarity index 53%
rename from packages/kbn-ui-framework/generator-kui/app/component.js
rename to src/plugins/lens_oss/public/plugin.ts
index bcb561f6fa729..15b815dab87c8 100644
--- a/packages/kbn-ui-framework/generator-kui/app/component.js
+++ b/src/plugins/lens_oss/public/plugin.ts
@@ -16,37 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
+import { DocLinksStart, CoreSetup } from 'src/core/public';
+import { VisualizationsSetup } from '../../visualizations/public';
+import { getLensAliasConfig } from './vis_type_alias';
-const Generator = require('yeoman-generator');
+export interface LensPluginSetupDependencies {
+ visualizations: VisualizationsSetup;
+}
-const componentGenerator = require.resolve('../component/index.js');
+export interface LensPluginStartDependencies {
+ docLinks: DocLinksStart;
+}
-module.exports = class extends Generator {
- prompting() {
- return this.prompt([
- {
- message: 'What do you want to create?',
- name: 'fileType',
- type: 'list',
- choices: [
- {
- name: 'Stateless function',
- value: 'function',
- },
- {
- name: 'Component class',
- value: 'component',
- },
- ],
- },
- ]).then((answers) => {
- this.config = answers;
+export class LensOSSPlugin {
+ setup(
+ core: CoreSetup,
+ { visualizations }: LensPluginSetupDependencies
+ ) {
+ core.getStartServices().then(([coreStart]) => {
+ visualizations.registerAlias(getLensAliasConfig(coreStart.docLinks));
});
}
- writing() {
- this.composeWith(componentGenerator, {
- fileType: this.config.fileType,
- });
- }
-};
+ start() {}
+}
diff --git a/src/plugins/lens_oss/public/vis_type_alias.ts b/src/plugins/lens_oss/public/vis_type_alias.ts
new file mode 100644
index 0000000000000..230209646deb5
--- /dev/null
+++ b/src/plugins/lens_oss/public/vis_type_alias.ts
@@ -0,0 +1,48 @@
+/*
+ * 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.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { VisTypeAlias } from 'src/plugins/visualizations/public';
+import { DocLinksStart } from 'src/core/public';
+import { APP_NAME, PLUGIN_ID_OSS, APP_PATH, APP_ICON } from '../common';
+
+export const getLensAliasConfig = ({ links }: DocLinksStart): VisTypeAlias => ({
+ aliasPath: APP_PATH,
+ aliasApp: APP_NAME,
+ name: PLUGIN_ID_OSS,
+ title: i18n.translate('lensOss.visTypeAlias.title', {
+ defaultMessage: 'Lens',
+ }),
+ description: i18n.translate('lensOss.visTypeAlias.description', {
+ defaultMessage:
+ 'Create visualizations with our drag-and-drop editor. Switch between visualization types at any time. Best for most visualizations.',
+ }),
+ icon: APP_ICON,
+ stage: 'production',
+ disabled: true,
+ note: i18n.translate('lensOss.visTypeAlias.note', {
+ defaultMessage: 'Recommended for most users.',
+ }),
+ promoTooltip: {
+ description: i18n.translate('lensOss.visTypeAlias.promoTooltip.description', {
+ defaultMessage: 'Try Lens for free with Elastic. Learn more.',
+ }),
+ link: `${links.visualize.lens}?blade=kibanaossvizwizard`,
+ },
+});
diff --git a/src/plugins/visualizations/public/wizard/type_selection/vis_type_icon.tsx b/src/plugins/lens_oss/server/index.ts
similarity index 54%
rename from src/plugins/visualizations/public/wizard/type_selection/vis_type_icon.tsx
rename to src/plugins/lens_oss/server/index.ts
index a9837313f2917..1a089a5382cc1 100644
--- a/src/plugins/visualizations/public/wizard/type_selection/vis_type_icon.tsx
+++ b/src/plugins/lens_oss/server/index.ts
@@ -17,25 +17,16 @@
* under the License.
*/
-import { EuiIcon, IconType } from '@elastic/eui';
-import React from 'react';
+import { PluginConfigDescriptor } from 'kibana/server';
+import { copyFromRoot } from '@kbn/config';
+import { configSchema, ConfigSchema } from '../config';
-interface VisTypeIconProps {
- icon?: IconType;
- image?: string;
-}
-
-/**
- * This renders the icon for a specific visualization type.
- * This currently checks the following:
- * - If image is set, use that as the `src` of an image
- * - Otherwise use the icon as an EuiIcon or the 'empty' icon if that's not set
- */
-export const VisTypeIcon = ({ icon, image }: VisTypeIconProps) => {
- return (
-
- {image && 
}
- {!image &&
- );
+export const config: PluginConfigDescriptor = {
+ schema: configSchema,
+ deprecations: () => [copyFromRoot('xpack.lens.enabled', 'lens_oss.enabled')],
};
+
+export const plugin = () => ({
+ setup() {},
+ start() {},
+});
diff --git a/src/plugins/maps_oss/README.md b/src/plugins/maps_oss/README.md
new file mode 100644
index 0000000000000..ed91de500fbfb
--- /dev/null
+++ b/src/plugins/maps_oss/README.md
@@ -0,0 +1,6 @@
+# maps_oss
+
+The maps_oss plugin registers the maps visualization on OSS.
+It is registered as disabled. The x-pack plugin should unregister this.
+
+`visualizations.unregisterAlias('mapsOss')`
\ No newline at end of file
diff --git a/src/plugins/maps_oss/common/constants.ts b/src/plugins/maps_oss/common/constants.ts
new file mode 100644
index 0000000000000..b4063c68840b3
--- /dev/null
+++ b/src/plugins/maps_oss/common/constants.ts
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+export const APP_NAME = 'maps';
+export const PLUGIN_ID_OSS = 'mapsOss';
+export const APP_PATH = '/map';
+export const APP_ICON = 'gisApp';
diff --git a/src/plugins/maps_oss/common/index.ts b/src/plugins/maps_oss/common/index.ts
new file mode 100644
index 0000000000000..fd1c2843d6b26
--- /dev/null
+++ b/src/plugins/maps_oss/common/index.ts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+export * from './constants';
diff --git a/src/plugins/maps_oss/config.ts b/src/plugins/maps_oss/config.ts
new file mode 100644
index 0000000000000..6749bd83de39f
--- /dev/null
+++ b/src/plugins/maps_oss/config.ts
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+ enabled: schema.boolean({ defaultValue: true }),
+});
+
+export type ConfigSchema = TypeOf;
diff --git a/src/plugins/maps_oss/kibana.json b/src/plugins/maps_oss/kibana.json
new file mode 100644
index 0000000000000..19770dcffaadd
--- /dev/null
+++ b/src/plugins/maps_oss/kibana.json
@@ -0,0 +1,10 @@
+{
+ "id": "mapsOss",
+ "version": "kibana",
+ "ui": true,
+ "server": true,
+ "requiredPlugins": [
+ "visualizations"
+ ],
+ "extraPublicDirs": ["common/constants"]
+}
diff --git a/src/plugins/maps_oss/public/index.ts b/src/plugins/maps_oss/public/index.ts
new file mode 100644
index 0000000000000..ec18ff1fde638
--- /dev/null
+++ b/src/plugins/maps_oss/public/index.ts
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+import { MapsOSSPlugin } from './plugin';
+
+export const plugin = () => new MapsOSSPlugin();
diff --git a/src/plugins/visualizations/public/wizard/type_selection/vis_help_text.tsx b/src/plugins/maps_oss/public/plugin.ts
similarity index 53%
rename from src/plugins/visualizations/public/wizard/type_selection/vis_help_text.tsx
rename to src/plugins/maps_oss/public/plugin.ts
index 8517919955f7c..3369e0bf27706 100644
--- a/src/plugins/visualizations/public/wizard/type_selection/vis_help_text.tsx
+++ b/src/plugins/maps_oss/public/plugin.ts
@@ -17,34 +17,27 @@
* under the License.
*/
-import React from 'react';
+import { DocLinksStart, CoreSetup } from 'src/core/public';
+import { VisualizationsSetup } from '../../visualizations/public';
+import { getMapsAliasConfig } from './vis_type_alias';
-import { EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+export interface MapsPluginSetupDependencies {
+ visualizations: VisualizationsSetup;
+}
-interface VisHelpTextProps {
- name: string;
- title: string;
- description?: string;
- highlightMsg?: string;
+export interface MapsPluginStartDependencies {
+ docLinks: DocLinksStart;
}
-export const VisHelpText = ({ name, title, description, highlightMsg }: VisHelpTextProps) => {
- return (
-
-
-
-
- );
-};
+export class MapsOSSPlugin {
+ setup(
+ core: CoreSetup,
+ { visualizations }: MapsPluginSetupDependencies
+ ) {
+ core.getStartServices().then(([coreStart]) => {
+ visualizations.registerAlias(getMapsAliasConfig(coreStart.docLinks));
+ });
+ }
+
+ start() {}
+}
diff --git a/src/plugins/maps_oss/public/vis_type_alias.ts b/src/plugins/maps_oss/public/vis_type_alias.ts
new file mode 100644
index 0000000000000..14fdc06bc539f
--- /dev/null
+++ b/src/plugins/maps_oss/public/vis_type_alias.ts
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { VisTypeAlias } from 'src/plugins/visualizations/public';
+import { DocLinksStart } from 'src/core/public';
+import { APP_NAME, PLUGIN_ID_OSS, APP_PATH, APP_ICON } from '../common';
+
+export const getMapsAliasConfig = ({ links }: DocLinksStart): VisTypeAlias => ({
+ aliasPath: APP_PATH,
+ aliasApp: APP_NAME,
+ name: PLUGIN_ID_OSS,
+ title: i18n.translate('mapsOss.visTypeAlias.title', {
+ defaultMessage: 'Maps',
+ }),
+ description: i18n.translate('mapsOss.visTypeAlias.description', {
+ defaultMessage: 'Plot and style your geo data in a multi layer map.',
+ }),
+ icon: APP_ICON,
+ stage: 'production',
+ disabled: true,
+ promoTooltip: {
+ description: i18n.translate('mapsOss.visTypeAlias.promoTooltip.description', {
+ defaultMessage: 'Try maps for free with Elastic. Learn more.',
+ }),
+ link: `${links.visualize.maps}?blade=kibanaossvizwizard`,
+ },
+});
diff --git a/src/plugins/maps_oss/server/index.ts b/src/plugins/maps_oss/server/index.ts
new file mode 100644
index 0000000000000..defc3a09c2538
--- /dev/null
+++ b/src/plugins/maps_oss/server/index.ts
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+import { PluginConfigDescriptor } from 'kibana/server';
+import { copyFromRoot } from '@kbn/config';
+import { configSchema, ConfigSchema } from '../config';
+
+export const config: PluginConfigDescriptor = {
+ schema: configSchema,
+ deprecations: () => [copyFromRoot('xpack.maps.enabled', 'maps_oss.enabled')],
+};
+
+export const plugin = () => ({
+ setup() {},
+ start() {},
+});
diff --git a/src/plugins/usage_collection/server/routes/stats/stats.ts b/src/plugins/usage_collection/server/routes/stats/stats.ts
index ef64d15fabc2d..d38250067053c 100644
--- a/src/plugins/usage_collection/server/routes/stats/stats.ts
+++ b/src/plugins/usage_collection/server/routes/stats/stats.ts
@@ -73,8 +73,9 @@ export function registerStatsRoute({
return collectorSet.toObject(usage);
};
- const getClusterUuid = async (callCluster: LegacyAPICaller): Promise => {
- const { cluster_uuid: uuid } = await callCluster('info', { filterPath: 'cluster_uuid' });
+ const getClusterUuid = async (asCurrentUser: ElasticsearchClient): Promise => {
+ const { body } = await asCurrentUser.info({ filter_path: 'cluster_uuid' });
+ const { cluster_uuid: uuid } = body;
return uuid;
};
@@ -103,7 +104,7 @@ export function registerStatsRoute({
let extended;
if (isExtended) {
const callCluster = context.core.elasticsearch.legacy.client.callAsCurrentUser;
- const esClient = context.core.elasticsearch.client.asCurrentUser;
+ const { asCurrentUser } = context.core.elasticsearch.client;
const savedObjectsClient = context.core.savedObjects.client;
if (shouldGetUsage) {
@@ -114,9 +115,12 @@ export function registerStatsRoute({
}
const usagePromise = shouldGetUsage
- ? getUsage(callCluster, esClient, savedObjectsClient)
+ ? getUsage(callCluster, asCurrentUser, savedObjectsClient)
: Promise.resolve({});
- const [usage, clusterUuid] = await Promise.all([usagePromise, getClusterUuid(callCluster)]);
+ const [usage, clusterUuid] = await Promise.all([
+ usagePromise,
+ getClusterUuid(asCurrentUser),
+ ]);
let modifiedUsage = usage;
if (isLegacy) {
diff --git a/src/plugins/vis_type_markdown/public/markdown_vis.ts b/src/plugins/vis_type_markdown/public/markdown_vis.ts
index 27ac038aee6ff..b6ec2cbd993b0 100644
--- a/src/plugins/vis_type_markdown/public/markdown_vis.ts
+++ b/src/plugins/vis_type_markdown/public/markdown_vis.ts
@@ -22,6 +22,7 @@ import { i18n } from '@kbn/i18n';
import { MarkdownOptions } from './markdown_options';
import { SettingsOptions } from './settings_options_lazy';
import { DefaultEditorSize } from '../../vis_default_editor/public';
+import { VisGroups } from '../../visualizations/public';
import { toExpressionAst } from './to_ast';
export const markdownVisDefinition = {
@@ -29,8 +30,12 @@ export const markdownVisDefinition = {
title: 'Markdown',
isAccessible: true,
icon: 'visText',
+ group: VisGroups.TOOLS,
+ titleInWizard: i18n.translate('visTypeMarkdown.markdownTitleInWizard', {
+ defaultMessage: 'Text',
+ }),
description: i18n.translate('visTypeMarkdown.markdownDescription', {
- defaultMessage: 'Create a document using markdown syntax',
+ defaultMessage: 'Add text and images to your dashboard.',
}),
toExpressionAst,
visConfig: {
diff --git a/src/plugins/vis_type_timeseries/common/types.ts b/src/plugins/vis_type_timeseries/common/types.ts
index 4520069244527..8973060848b41 100644
--- a/src/plugins/vis_type_timeseries/common/types.ts
+++ b/src/plugins/vis_type_timeseries/common/types.ts
@@ -18,8 +18,9 @@
*/
import { TypeOf } from '@kbn/config-schema';
-import { metricsItems, panel, seriesItems } from './vis_schema';
+import { metricsItems, panel, seriesItems, visPayloadSchema } from './vis_schema';
export type SeriesItemsSchema = TypeOf;
export type MetricsItemsSchema = TypeOf;
export type PanelSchema = TypeOf;
+export type VisPayload = TypeOf;
diff --git a/src/plugins/vis_type_timeseries/common/vis_schema.ts b/src/plugins/vis_type_timeseries/common/vis_schema.ts
index 40f776050617e..27f09fb574b0f 100644
--- a/src/plugins/vis_type_timeseries/common/vis_schema.ts
+++ b/src/plugins/vis_type_timeseries/common/vis_schema.ts
@@ -273,4 +273,5 @@ export const visPayloadSchema = schema.object({
min: stringRequired,
max: stringRequired,
}),
+ sessionId: schema.maybe(schema.string()),
});
diff --git a/src/plugins/vis_type_timeseries/public/metrics_type.ts b/src/plugins/vis_type_timeseries/public/metrics_type.ts
index d6621870fef67..682517ab1a996 100644
--- a/src/plugins/vis_type_timeseries/public/metrics_type.ts
+++ b/src/plugins/vis_type_timeseries/public/metrics_type.ts
@@ -25,15 +25,16 @@ import { EditorController } from './application';
// @ts-ignore
import { PANEL_TYPES } from '../common/panel_types';
import { VisEditor } from './application/components/vis_editor_lazy';
-import { VIS_EVENT_TO_TRIGGER } from '../../visualizations/public';
+import { VIS_EVENT_TO_TRIGGER, VisGroups } from '../../visualizations/public';
export const metricsVisDefinition = {
name: 'metrics',
title: i18n.translate('visTypeTimeseries.kbnVisTypes.metricsTitle', { defaultMessage: 'TSVB' }),
description: i18n.translate('visTypeTimeseries.kbnVisTypes.metricsDescription', {
- defaultMessage: 'Build time-series using a visual pipeline interface',
+ defaultMessage: 'Perform advanced analysis of your time series data.',
}),
icon: 'visVisualBuilder',
+ group: VisGroups.PROMOTED,
visConfig: {
defaults: {
id: '61ca57f0-469d-11e7-af02-69e470af7417',
diff --git a/src/plugins/vis_type_timeseries/public/request_handler.js b/src/plugins/vis_type_timeseries/public/request_handler.js
index e33d0e254f609..12b7f3d417ef6 100644
--- a/src/plugins/vis_type_timeseries/public/request_handler.js
+++ b/src/plugins/vis_type_timeseries/public/request_handler.js
@@ -32,7 +32,8 @@ export const metricsRequestHandler = async ({
const config = getUISettings();
const timezone = getTimezone(config);
const uiStateObj = uiState.get(visParams.type, {});
- const parsedTimeRange = getDataStart().query.timefilter.timefilter.calculateBounds(timeRange);
+ const dataSearch = getDataStart();
+ const parsedTimeRange = dataSearch.query.timefilter.timefilter.calculateBounds(timeRange);
const scaledDataFormat = config.get('dateFormat:scaled');
const dateFormat = config.get('dateFormat');
@@ -53,6 +54,7 @@ export const metricsRequestHandler = async ({
panels: [visParams],
state: uiStateObj,
savedObjectId: savedObjectId || 'unsaved',
+ sessionId: dataSearch.search.session.getSessionId(),
}),
});
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js
index 9710f7daf69b6..2c38e883cd69f 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js
@@ -28,6 +28,7 @@ describe('AbstractSearchStrategy', () => {
beforeEach(() => {
mockedFields = {};
req = {
+ payload: {},
pre: {
indexPatternsService: {
getFieldsForWildcard: jest.fn().mockReturnValue(mockedFields),
@@ -60,6 +61,9 @@ describe('AbstractSearchStrategy', () => {
const responses = await abstractSearchStrategy.search(
{
+ payload: {
+ sessionId: 1,
+ },
requestContext: {
search: { search: searchFn },
},
@@ -76,7 +80,9 @@ describe('AbstractSearchStrategy', () => {
},
indexType: undefined,
},
- {}
+ {
+ sessionId: 1,
+ }
);
});
});
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
index eb22fcb1dd689..b1e21edf8b588 100644
--- a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
@@ -23,8 +23,10 @@ import {
IUiSettingsClient,
SavedObjectsClientContract,
} from 'kibana/server';
+
import { Framework } from '../../../plugin';
import { IndexPatternsFetcher } from '../../../../../data/server';
+import { VisPayload } from '../../../../common/types';
/**
* ReqFacade is a regular KibanaRequest object extended with additional service
@@ -32,17 +34,17 @@ import { IndexPatternsFetcher } from '../../../../../data/server';
*
* This will be replaced by standard KibanaRequest and RequestContext objects in a later version.
*/
-export type ReqFacade = FakeRequest & {
+export interface ReqFacade extends FakeRequest {
requestContext: RequestHandlerContext;
framework: Framework;
- payload: unknown;
+ payload: T;
pre: {
indexPatternsService?: IndexPatternsFetcher;
};
getUiSettingsService: () => IUiSettingsClient;
getSavedObjectsClient: () => SavedObjectsClientContract;
getEsShardTimeout: () => Promise;
-};
+}
export class AbstractSearchStrategy {
public indexType?: string;
@@ -53,8 +55,10 @@ export class AbstractSearchStrategy {
this.additionalParams = additionalParams;
}
- async search(req: ReqFacade, bodies: any[], options = {}) {
+ async search(req: ReqFacade, bodies: any[], options = {}) {
const requests: any[] = [];
+ const { sessionId } = req.payload;
+
bodies.forEach((body) => {
requests.push(
req.requestContext
@@ -67,6 +71,7 @@ export class AbstractSearchStrategy {
indexType: this.indexType,
},
{
+ sessionId,
...options,
}
)
diff --git a/src/plugins/vis_type_vega/public/vega_type.ts b/src/plugins/vis_type_vega/public/vega_type.ts
index 17f35b75f0016..2211abb54aa93 100644
--- a/src/plugins/vis_type_vega/public/vega_type.ts
+++ b/src/plugins/vis_type_vega/public/vega_type.ts
@@ -25,7 +25,7 @@ import { VegaVisualizationDependencies } from './plugin';
import { createVegaRequestHandler } from './vega_request_handler';
import { getDefaultSpec } from './default_spec';
import { createInspectorAdapters } from './vega_inspector';
-import { VIS_EVENT_TO_TRIGGER } from '../../visualizations/public';
+import { VIS_EVENT_TO_TRIGGER, VisGroups } from '../../visualizations/public';
import { toExpressionAst } from './to_ast';
import { VisParams } from './vega_fn';
import { getInfoMessage } from './components/experimental_map_vis_info';
@@ -41,10 +41,17 @@ export const createVegaTypeDefinition = (
title: 'Vega',
getInfoMessage,
description: i18n.translate('visTypeVega.type.vegaDescription', {
- defaultMessage: 'Create custom visualizations using Vega and Vega-Lite',
+ defaultMessage: 'Use Vega to create new types of visualizations.',
description: 'Vega and Vega-Lite are product names and should not be translated',
}),
+ note: i18n.translate('visTypeVega.type.vegaNote', {
+ defaultMessage: 'Requires knowledge of Vega syntax.',
+ }),
icon: 'visVega',
+ group: VisGroups.PROMOTED,
+ titleInWizard: i18n.translate('visTypeVega.type.vegaTitleInWizard', {
+ defaultMessage: 'Custom visualization',
+ }),
visConfig: { defaults: { spec: getDefaultSpec() } },
editorConfig: {
optionsTemplate: VegaVisEditorComponent,
diff --git a/src/plugins/vis_type_vislib/public/gauge.ts b/src/plugins/vis_type_vislib/public/gauge.ts
index 86e3b8793d618..2b3c415087ee1 100644
--- a/src/plugins/vis_type_vislib/public/gauge.ts
+++ b/src/plugins/vis_type_vislib/public/gauge.ts
@@ -61,8 +61,7 @@ export const gaugeVisTypeDefinition: BaseVisTypeOptions = {
title: i18n.translate('visTypeVislib.gauge.gaugeTitle', { defaultMessage: 'Gauge' }),
icon: 'visGauge',
description: i18n.translate('visTypeVislib.gauge.gaugeDescription', {
- defaultMessage:
- "Gauges indicate the status of a metric. Use it to show how a metric's value relates to reference threshold values.",
+ defaultMessage: 'Gauges indicate the status of a metric.',
}),
toExpressionAst,
visConfig: {
diff --git a/src/plugins/visualizations/public/index.scss b/src/plugins/visualizations/public/index.scss
index 2b61535f3e7f2..0202419cea232 100644
--- a/src/plugins/visualizations/public/index.scss
+++ b/src/plugins/visualizations/public/index.scss
@@ -1,3 +1,2 @@
-@import 'wizard/index';
@import 'embeddable/index';
@import 'components/index';
diff --git a/src/plugins/visualizations/public/index.ts b/src/plugins/visualizations/public/index.ts
index 7bd4466b23166..d66a6f6113cad 100644
--- a/src/plugins/visualizations/public/index.ts
+++ b/src/plugins/visualizations/public/index.ts
@@ -36,6 +36,7 @@ export { getSchemas as getVisSchemas } from './legacy/build_pipeline';
/** @public types */
export { VisualizationsSetup, VisualizationsStart };
+export { VisGroups } from './vis_types';
export type { VisTypeAlias, VisType, BaseVisTypeOptions, ReactVisTypeOptions } from './vis_types';
export { VisParams, SerializedVis, SerializedVisData, VisData } from './vis';
export type VisualizeEmbeddableFactoryContract = PublicContract;
diff --git a/src/plugins/visualizations/public/mocks.ts b/src/plugins/visualizations/public/mocks.ts
index f20e87dbd3b6a..66399352bea7d 100644
--- a/src/plugins/visualizations/public/mocks.ts
+++ b/src/plugins/visualizations/public/mocks.ts
@@ -41,6 +41,8 @@ const createStartContract = (): VisualizationsStart => ({
get: jest.fn(),
all: jest.fn(),
getAliases: jest.fn(),
+ getByGroup: jest.fn(),
+ unRegisterAlias: jest.fn(),
savedVisualizationsLoader: {
get: jest.fn(),
} as any,
diff --git a/src/plugins/visualizations/public/plugin.ts b/src/plugins/visualizations/public/plugin.ts
index c1dbe39def64c..29e31e92b971e 100644
--- a/src/plugins/visualizations/public/plugin.ts
+++ b/src/plugins/visualizations/public/plugin.ts
@@ -49,6 +49,7 @@ import {
setOverlays,
setSavedSearchLoader,
setEmbeddable,
+ setDocLinks,
} from './services';
import {
VISUALIZE_EMBEDDABLE_TYPE,
@@ -172,6 +173,7 @@ export class VisualizationsPlugin
setCapabilities(core.application.capabilities);
setHttp(core.http);
setSavedObjects(core.savedObjects);
+ setDocLinks(core.docLinks);
setIndexPatterns(data.indexPatterns);
setSearch(data.search);
setFilterManager(data.query.filterManager);
diff --git a/src/plugins/visualizations/public/services.ts b/src/plugins/visualizations/public/services.ts
index 0761b8862e8e3..08537b4ac3081 100644
--- a/src/plugins/visualizations/public/services.ts
+++ b/src/plugins/visualizations/public/services.ts
@@ -26,6 +26,7 @@ import {
IUiSettingsClient,
OverlayStart,
SavedObjectsStart,
+ DocLinksStart,
} from '../../../core/public';
import { TypesStart } from './vis_types';
import { createGetterSetter } from '../../../plugins/kibana_utils/public';
@@ -60,6 +61,8 @@ export const [getTypes, setTypes] = createGetterSetter('Types');
export const [getI18n, setI18n] = createGetterSetter('I18n');
+export const [getDocLinks, setDocLinks] = createGetterSetter('DocLinks');
+
export const [getFilterManager, setFilterManager] = createGetterSetter(
'FilterManager'
);
diff --git a/src/plugins/visualizations/public/vis_types/base_vis_type.ts b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
index f2933de723a39..807582723172d 100644
--- a/src/plugins/visualizations/public/vis_types/base_vis_type.ts
+++ b/src/plugins/visualizations/public/vis_types/base_vis_type.ts
@@ -20,7 +20,7 @@
import { defaultsDeep } from 'lodash';
import { ISchemas } from 'src/plugins/vis_default_editor/public';
import { VisParams } from '../types';
-import { VisType, VisTypeOptions } from './types';
+import { VisType, VisTypeOptions, VisGroups } from './types';
interface CommonBaseVisTypeOptions
extends Pick<
@@ -41,7 +41,14 @@ interface CommonBaseVisTypeOptions
>,
Pick<
Partial>,
- 'editorConfig' | 'hidden' | 'stage' | 'useCustomNoDataScreen' | 'visConfig'
+ | 'editorConfig'
+ | 'hidden'
+ | 'stage'
+ | 'useCustomNoDataScreen'
+ | 'visConfig'
+ | 'group'
+ | 'titleInWizard'
+ | 'note'
> {
options?: Partial['options']>;
}
@@ -72,10 +79,13 @@ export class BaseVisType implements VisType
public readonly name;
public readonly title;
public readonly description;
+ public readonly note;
public readonly getSupportedTriggers;
public readonly icon;
public readonly image;
public readonly stage;
+ public readonly group;
+ public readonly titleInWizard;
public readonly options;
public readonly visualization;
public readonly visConfig;
@@ -98,6 +108,7 @@ export class BaseVisType implements VisType
this.name = opts.name;
this.description = opts.description ?? '';
+ this.note = opts.note ?? '';
this.getSupportedTriggers = opts.getSupportedTriggers;
this.title = opts.title;
this.icon = opts.icon;
@@ -108,6 +119,8 @@ export class BaseVisType implements VisType
this.editorConfig = defaultsDeep({}, opts.editorConfig, { collections: {} });
this.options = defaultsDeep({}, opts.options, defaultOptions);
this.stage = opts.stage ?? 'production';
+ this.group = opts.group ?? VisGroups.AGGBASED;
+ this.titleInWizard = opts.titleInWizard ?? '';
this.hidden = opts.hidden ?? false;
this.requestHandler = opts.requestHandler ?? 'courier';
this.responseHandler = opts.responseHandler ?? 'none';
diff --git a/src/plugins/visualizations/public/vis_types/index.ts b/src/plugins/visualizations/public/vis_types/index.ts
index a46b257c9905c..a02ac82c8d122 100644
--- a/src/plugins/visualizations/public/vis_types/index.ts
+++ b/src/plugins/visualizations/public/vis_types/index.ts
@@ -18,6 +18,7 @@
*/
export * from './types_service';
+export { VisGroups } from './types';
export type { VisType } from './types';
export type { BaseVisTypeOptions } from './base_vis_type';
export type { ReactVisTypeOptions } from './react_vis_type';
diff --git a/src/plugins/visualizations/public/vis_types/types.ts b/src/plugins/visualizations/public/vis_types/types.ts
index 7206e9612f102..ee804e5677243 100644
--- a/src/plugins/visualizations/public/vis_types/types.ts
+++ b/src/plugins/visualizations/public/vis_types/types.ts
@@ -33,21 +33,63 @@ export interface VisTypeOptions {
hierarchicalData: boolean;
}
+export enum VisGroups {
+ PROMOTED = 'promoted',
+ TOOLS = 'tools',
+ AGGBASED = 'aggbased',
+}
+
/**
* A visualization type representing one specific type of "classical"
* visualizations (i.e. not Lens visualizations).
*/
export interface VisType {
+ /**
+ * Visualization unique name
+ */
readonly name: string;
+ /**
+ * It is the displayed text on the wizard and the vis listing
+ */
readonly title: string;
+ /**
+ * If given, it will be diplayed on the wizard vis card as the main description.
+ */
readonly description?: string;
+ /**
+ * If given, it will be diplayed on the wizard vis card as a note in italic.
+ */
+ readonly note: string;
+ /**
+ * If given, it will return the supported triggers for this vis.
+ */
readonly getSupportedTriggers?: () => Array;
readonly isAccessible?: boolean;
readonly requestHandler?: string | unknown;
readonly responseHandler?: string | unknown;
+ /**
+ * It is the visualization icon, displayed on the wizard.
+ */
readonly icon?: IconType;
+ /**
+ * Except from an icon, an image can be passed
+ */
readonly image?: string;
+ /**
+ * Describes the visualization stage
+ */
readonly stage: 'experimental' | 'beta' | 'production';
+ /**
+ * Describes the experience group that the visualization belongs.
+ * It can be on tools, aggregation based or promoted group.
+ */
+ readonly group: VisGroups;
+ /**
+ * If given, it will be displayed on the wizard instead of the title.
+ * We use it because we want to differentiate the vis title from the
+ * way it is presented on the wizard
+ */
+ readonly titleInWizard: string;
readonly requiresSearch: boolean;
readonly useCustomNoDataScreen: boolean;
readonly hierarchicalData?: boolean | ((vis: { params: TVisParams }) => boolean);
diff --git a/src/plugins/visualizations/public/vis_types/types_service.ts b/src/plugins/visualizations/public/vis_types/types_service.ts
index 5d619064c240e..27276eeb88923 100644
--- a/src/plugins/visualizations/public/vis_types/types_service.ts
+++ b/src/plugins/visualizations/public/vis_types/types_service.ts
@@ -20,7 +20,7 @@
import { visTypeAliasRegistry, VisTypeAlias } from './vis_type_alias_registry';
import { BaseVisType, BaseVisTypeOptions } from './base_vis_type';
import { ReactVisType, ReactVisTypeOptions } from './react_vis_type';
-import { VisType } from './types';
+import { VisType, VisGroups } from './types';
/**
* Vis Types Service
@@ -101,6 +101,21 @@ export class TypesService {
* returns all registered aliases
*/
getAliases: visTypeAliasRegistry.get,
+ /**
+ * unregisters a visualization alias by its name
+ * alias is a visualization type without implementation, it just redirects somewhere in kibana
+ * @param {string} visTypeAliasName - visualization alias name
+ */
+ unRegisterAlias: visTypeAliasRegistry.remove,
+ /**
+ * returns all visualizations of specific group
+ * @param {VisGroups} group - group type (aggbased | other | tools)
+ */
+ getByGroup: (group: VisGroups) => {
+ return Object.values(this.types).filter((type) => {
+ return type.group === group;
+ });
+ },
};
}
diff --git a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
index 9733e9fd68549..fc5dfd4e123fb 100644
--- a/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
+++ b/src/plugins/visualizations/public/vis_types/vis_type_alias_registry.ts
@@ -43,9 +43,9 @@ export interface VisualizationsAppExtension {
}) => VisualizationListItem;
}
-export interface VisTypeAliasPromotion {
+export interface VisTypeAliasPromoTooltip {
description: string;
- buttonText: string;
+ link: string;
}
export interface VisTypeAlias {
@@ -54,8 +54,11 @@ export interface VisTypeAlias {
name: string;
title: string;
icon: string;
- promotion?: VisTypeAliasPromotion;
+ promotion?: boolean;
+ promoTooltip?: VisTypeAliasPromoTooltip;
description: string;
+ note?: string;
+ disabled?: boolean;
getSupportedTriggers?: () => Array;
stage: 'experimental' | 'beta' | 'production';
@@ -65,11 +68,13 @@ export interface VisTypeAlias {
};
}
-const registry: VisTypeAlias[] = [];
+let registry: VisTypeAlias[] = [];
+const discardOnRegister: string[] = [];
interface VisTypeAliasRegistry {
get: () => VisTypeAlias[];
add: (newVisTypeAlias: VisTypeAlias) => void;
+ remove: (visTypeAliasName: string) => void;
}
export const visTypeAliasRegistry: VisTypeAliasRegistry = {
@@ -78,6 +83,22 @@ export const visTypeAliasRegistry: VisTypeAliasRegistry = {
if (registry.find((visTypeAlias) => visTypeAlias.name === newVisTypeAlias.name)) {
throw new Error(`${newVisTypeAlias.name} already registered`);
}
- registry.push(newVisTypeAlias);
+ // if it exists on discardOnRegister array then we don't allow it to be registered
+ const isToBeDiscarded = discardOnRegister.some(
+ (aliasName) => aliasName === newVisTypeAlias.name
+ );
+ if (!isToBeDiscarded) {
+ registry.push(newVisTypeAlias);
+ }
+ },
+ remove: (visTypeAliasName) => {
+ const isAliasPresent = registry.find((visTypeAlias) => visTypeAlias.name === visTypeAliasName);
+ // in case the alias has not registered yet we store it on an array, in order to not allow it to
+ // be registered in case of a race condition
+ if (!isAliasPresent) {
+ discardOnRegister.push(visTypeAliasName);
+ } else {
+ registry = registry.filter((visTypeAlias) => visTypeAlias.name !== visTypeAliasName);
+ }
},
};
diff --git a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
deleted file mode 100644
index 2089289b372a2..0000000000000
--- a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
+++ /dev/null
@@ -1,2141 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`NewVisModal filter for visualization types should render as expected 1`] = `
-
-
-
-
- }
- >
- {title}
-
-
- {highlightMsg && (
-
-
- - {highlightMsg} -
- )} -{description}
-
-
-
-
-
-
-
-
-
-
- New Visualization
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3 types found
-
-
- -
-
- - - -
- - - -
- - - -
- - - -
-
- - Select a visualization type -
- -
-
- - Start creating your visualization by selecting a type for that visualization. -
-- - promotion description - -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- New Visualization
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3 types found
-
-
-
-
-
-
- -
-
-
-
- Vis alias with promotion - - } - onBlur={[Function]} - onClick={[Function]} - onFocus={[Function]} - onMouseEnter={[Function]} - onMouseLeave={[Function]} - > - - -
- -
-
- Vis with alias Url - - } - onBlur={[Function]} - onClick={[Function]} - onFocus={[Function]} - onMouseEnter={[Function]} - onMouseLeave={[Function]} - > - - -
- -
-
- Vis with search - - } - onBlur={[Function]} - onClick={[Function]} - onFocus={[Function]} - onMouseEnter={[Function]} - onMouseLeave={[Function]} - > - - -
- -
-
- Vis Type 1 - - } - onBlur={[Function]} - onClick={[Function]} - onFocus={[Function]} - onMouseEnter={[Function]} - onMouseLeave={[Function]} - > - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Select a visualization type
-
-
-
-
-
-
-
-
-
-
-
- - promotion description - -
-
-
-
- }
- >
-
-
-
-
-
-
-
-
- New Visualization
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- - - -
- - - -
- - - -
- - - -
-
- - Select a visualization type -
- -
-
- - Start creating your visualization by selecting a type for that visualization. -
-- - promotion description - -
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- New Visualization
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
- Vis alias with promotion - - } - onBlur={[Function]} - onClick={[Function]} - onFocus={[Function]} - onMouseEnter={[Function]} - onMouseLeave={[Function]} - > - - -
- -
-
- Vis Type 1 - - } - onBlur={[Function]} - onClick={[Function]} - onFocus={[Function]} - onMouseEnter={[Function]} - onMouseLeave={[Function]} - > - - -
- -
-
- Vis with alias Url - - } - onBlur={[Function]} - onClick={[Function]} - onFocus={[Function]} - onMouseEnter={[Function]} - onMouseLeave={[Function]} - > - - -
- -
-
- Vis with search - - } - onBlur={[Function]} - onClick={[Function]} - onFocus={[Function]} - onMouseEnter={[Function]} - onMouseLeave={[Function]} - > - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Select a visualization type
-
-
-
-
-
-
-
-
-
-
-
- - promotion description - -
-
+
+ {promotedVisGroups.map((visType) => (
+
+
+
+
+ {props.visTypesRegistry.getByGroup(VisGroups.AGGBASED).length > 0 && (
+
+ props.toggleGroups(false)}
+ title={
+
+ {i18n.translate('visualizations.newVisWizard.aggBasedGroupTitle', {
+ defaultMessage: 'Aggregation based',
+ })}
+
+ }
+ data-test-subj="visGroup-aggbased"
+ description={i18n.translate(
+ 'visualizations.newVisWizard.aggBasedGroupDescription',
+ {
+ defaultMessage:
+ 'Use our classic visualize library to create charts based on aggregations.',
+ }
+ )}
+ icon={ props.toggleGroups(false)}
+ >
+
+ {i18n.translate('visualizations.newVisWizard.exploreOptionLinkText', {
+ defaultMessage: 'Explore options',
+ })}{' '}
+
+
+
+
+ )}
+ {props.visTypesRegistry.getByGroup(VisGroups.TOOLS).length > 0 && (
+
+
+
+ {i18n.translate('visualizations.newVisWizard.toolsGroupTitle', {
+ defaultMessage: 'Tools',
+ })}
+
+
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+ {props.visTypesRegistry.getByGroup(VisGroups.TOOLS).map((visType) => (
+
+
-
- - Look at this fancy new thing!!! - -
-
-
- {t.promotion!.description} -
-
-
-
-
-
-
-
-
-
- {query && (
- type.highlighted).length,
- }}
- />
- )}
-
-
-
- {visTypes.map(this.renderVisType)}
-
-
-
-
-
- {highlightedType ? (
-
-
-
-
-
- t.type)
- .filter((t): t is VisTypeAlias => isVisTypeAlias(t) && Boolean(t.promotion))}
- onPromotionClicked={this.props.onVisTypeSelected}
- />
-
- )}
-
-
-
-
-
- + Object.entries(errors).map(([field, errs]: [string, string[]], fieldIndex) => + errs.map((e, index) => ( +
+
+
+
- {i18n.translate( - 'xpack.apm.serviceOverview.errorRateChartTitle', - { - defaultMessage: 'Error rate', - } - )} -
-
-
-
-
-`;
-
-exports[`Histogram when hovering over a non-empty bucket should have correct markup for tooltip 1`] = `
-.c0 {
- margin: 0 16px;
- -webkit-transform: translateY(-50%);
- -ms-transform: translateY(-50%);
- transform: translateY(-50%);
- border: 1px solid #d3dae6;
- background: #ffffff;
- border-radius: 4px;
- font-size: 14px;
- color: #000000;
-}
-
-.c1 {
- background: #f5f7fa;
- border-bottom: 1px solid #d3dae6;
- border-radius: 4px 4px 0 0;
- padding: 8px;
- color: #98a2b3;
-}
-
-.c2 {
- margin: 8px;
- margin-right: 16px;
- font-size: 12px;
-}
-
-.c4 {
- color: #98a2b3;
- margin: 8px;
- font-size: 12px;
-}
-
-.c3 {
- color: #69707d;
- font-size: 14px;
-}
-
-
-
-
-
-
-
-
-
-
-`;
diff --git a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/response.json b/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/response.json
deleted file mode 100644
index 302e105dfa997..0000000000000
--- a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/response.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- "buckets": [
- { "key": 0, "count": 0 },
- { "key": 115868, "count": 0 },
- { "key": 231736, "count": 0 },
- { "key": 347604, "count": 0 },
- { "key": 463472, "count": 0 },
- {
- "key": 579340,
- "count": 8,
- "samples": [
- {
- "transactionId": "99437ee4-08d4-41f5-9b2b-93cc32ec3dfb"
- }
- ]
- },
- {
- "key": 695208,
- "count": 23,
- "samples": [
- {
- "transactionId": "d327611b-e999-4942-a94f-c60208940180"
- }
- ]
- },
- {
- "key": 811076,
- "count": 49,
- "samples": [
- {
- "transactionId": "99c50a5b-44b4-4289-a3d1-a2815d128192"
- }
- ]
- },
- {
- "key": 926944,
- "count": 51,
- "transactionId": "9706a1ec-23f5-4ce8-97e8-69ce35fb0a9a"
- },
- {
- "key": 1042812,
- "count": 46,
- "transactionId": "f8d360c3-dd5e-47b6-b082-9e0bf821d3b2"
- },
- {
- "key": 1158680,
- "count": 13,
- "samples": [
- {
- "transactionId": "8486d3e2-7f15-48df-aa37-6ee9955adbd2"
- }
- ]
- },
- {
- "key": 1274548,
- "count": 7,
- "transactionId": "54b4b5a7-f065-4cab-9016-534e58f4fc0a"
- },
- {
- "key": 1390416,
- "count": 4,
- "transactionId": "8cfac2a3-38e7-4d3a-9792-d008b4bcb867"
- },
- {
- "key": 1506284,
- "count": 3,
- "transactionId": "ce3f3bd3-a37c-419e-bb9c-5db956ded149"
- },
- { "key": 1622152, "count": 0 },
- {
- "key": 1738020,
- "count": 4,
- "transactionId": "2300174b-85d8-40ba-a6cb-eeba2a49debf"
- },
- { "key": 1853888, "count": 0 },
- { "key": 1969756, "count": 0 },
- {
- "key": 2085624,
- "count": 1,
- "transactionId": "774955a4-2ba3-4461-81a6-65759db4805d"
- },
- { "key": 2201492, "count": 0 },
- { "key": 2317360, "count": 0 },
- { "key": 2433228, "count": 0 },
- { "key": 2549096, "count": 0 },
- { "key": 2664964, "count": 0 },
- {
- "key": 2780832,
- "count": 1,
- "transactionId": "035d1b9d-af71-46cf-8910-57bd4faf412d"
- },
- {
- "key": 2896700,
- "count": 1,
- "transactionId": "4a845b32-9de4-4796-8ef4-d7bbdedc9099"
- },
- { "key": 3012568, "count": 0 },
- {
- "key": 3128436,
- "count": 1,
- "transactionId": "68620ffb-7a1b-4f8e-b9bb-009fa5b092be"
- }
- ],
- "bucketSize": 115868,
- "defaultBucketIndex": 12
-}
diff --git a/x-pack/plugins/apm/public/components/shared/charts/Histogram/index.js b/x-pack/plugins/apm/public/components/shared/charts/Histogram/index.js
deleted file mode 100644
index 3b2109d68c613..0000000000000
--- a/x-pack/plugins/apm/public/components/shared/charts/Histogram/index.js
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { PureComponent } from 'react';
-import d3 from 'd3';
-import { isEmpty } from 'lodash';
-import PropTypes from 'prop-types';
-import { scaleLinear } from 'd3-scale';
-import styled from 'styled-components';
-import SingleRect from './SingleRect';
-import {
- XYPlot,
- XAxis,
- YAxis,
- HorizontalGridLines,
- VerticalRectSeries,
- Voronoi,
- makeWidthFlexible,
- VerticalGridLines,
-} from 'react-vis';
-import { unit } from '../../../../style/variables';
-import Tooltip from '../Tooltip';
-import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { tint } from 'polished';
-import { getTimeTicksTZ, getDomainTZ } from '../helper/timezone';
-import Legends from '../CustomPlot/Legends';
-import StatusText from '../CustomPlot/StatusText';
-import { i18n } from '@kbn/i18n';
-import { isValidCoordinateValue } from '../../../../utils/isValidCoordinateValue';
-
-const XY_HEIGHT = unit * 10;
-const XY_MARGIN = {
- top: unit,
- left: unit * 5,
- right: unit,
- bottom: unit * 2,
-};
-
-const X_TICK_TOTAL = 8;
-
-// position absolutely to make sure that window resizing/zooming works
-const ChartsWrapper = styled.div`
- user-select: none;
- position: absolute;
- top: 0;
- left: 0;
-`;
-
-export class HistogramInner extends PureComponent {
- constructor(props) {
- super(props);
- this.state = {
- hoveredBucket: {},
- };
- }
-
- onClick = (bucket) => {
- if (this.props.onClick) {
- this.props.onClick(bucket);
- }
- };
-
- onHover = (bucket) => {
- this.setState({ hoveredBucket: bucket });
- };
-
- onBlur = () => {
- this.setState({ hoveredBucket: {} });
- };
-
- getChartData(items, selectedItem) {
- const yMax = d3.max(items, (d) => d.y);
- const MINIMUM_BUCKET_SIZE = yMax * 0.02;
-
- return items.map((item) => {
- const padding = (item.x - item.x0) / 20;
- return {
- ...item,
- color:
- item === selectedItem
- ? theme.euiColorVis1
- : tint(0.5, theme.euiColorVis1),
- x0: item.x0 + padding,
- x: item.x - padding,
- y: item.y > 0 ? Math.max(item.y, MINIMUM_BUCKET_SIZE) : 0,
- };
- });
- }
-
- render() {
- const {
- backgroundHover,
- bucketIndex,
- buckets,
- bucketSize,
- formatX,
- formatYShort,
- formatYLong,
- tooltipFooter,
- tooltipHeader,
- verticalLineHover,
- width: XY_WIDTH,
- height,
- legends,
- } = this.props;
- const { hoveredBucket } = this.state;
- if (isEmpty(buckets) || XY_WIDTH === 0) {
- return null;
- }
-
- const isTimeSeries =
- this.props.xType === 'time' || this.props.xType === 'time-utc';
-
- const xMin = d3.min(buckets, (d) => d.x0);
- const xMax = d3.max(buckets, (d) => d.x);
- const yMin = 0;
- const yMax = d3.max(buckets, (d) => d.y);
- const selectedBucket = buckets[bucketIndex];
- const chartData = this.getChartData(buckets, selectedBucket);
-
- const x = scaleLinear()
- .domain([xMin, xMax])
- .range([XY_MARGIN.left, XY_WIDTH - XY_MARGIN.right]);
-
- const y = scaleLinear().domain([yMin, yMax]).range([XY_HEIGHT, 0]).nice();
-
- const [xMinZone, xMaxZone] = getDomainTZ(xMin, xMax);
- const xTickValues = isTimeSeries
- ? getTimeTicksTZ({
- domain: [xMinZone, xMaxZone],
- totalTicks: X_TICK_TOTAL,
- width: XY_WIDTH,
- })
- : undefined;
-
- const xDomain = x.domain();
- const yDomain = y.domain();
- const yTickValues = [0, yDomain[1] / 2, yDomain[1]];
- const shouldShowTooltip =
- hoveredBucket.x > 0 && (hoveredBucket.y > 0 || isTimeSeries);
-
- const showVerticalLineHover = verticalLineHover(hoveredBucket);
- const showBackgroundHover = backgroundHover(hoveredBucket);
-
- const hasValidCoordinates = buckets.some((bucket) =>
- isValidCoordinateValue(bucket.y)
- );
- const noHits = this.props.noHits || !hasValidCoordinates;
-
- const xyPlotProps = {
- dontCheckIfEmpty: true,
- xType: this.props.xType,
- width: XY_WIDTH,
- height: XY_HEIGHT,
- margin: XY_MARGIN,
- xDomain: xDomain,
- yDomain: yDomain,
- };
-
- const xAxisProps = {
- style: { strokeWidth: '1px' },
- marginRight: 10,
- tickSize: 0,
- tickTotal: X_TICK_TOTAL,
- tickFormat: formatX,
- tickValues: xTickValues,
- };
-
- const emptyStateChart = (
-
-
-
-
-
-
-
-
-
-
- 811 - 927 ms
-
-
-
-
-
-
- 49 occurrences
-
-
-
- {noHits ? (
- <>{emptyStateChart}
- ) : (
- <>
-
- {
- return {
- ...bucket,
- xCenter: (bucket.x0 + bucket.x) / 2,
- };
- })}
- onClick={this.onClick}
- onHover={this.onHover}
- onBlur={this.onBlur}
- x={(d) => x(d.xCenter)}
- y={() => 1}
- />
-
-
- {legends && (
- {}}
- truncateLegends={false}
- noHits={noHits}
- />
- )}
-
- )}
-
-
- );
- }
-}
-
-HistogramInner.propTypes = {
- backgroundHover: PropTypes.func,
- bucketIndex: PropTypes.number,
- buckets: PropTypes.array.isRequired,
- bucketSize: PropTypes.number.isRequired,
- formatX: PropTypes.func,
- formatYLong: PropTypes.func,
- formatYShort: PropTypes.func,
- onClick: PropTypes.func,
- tooltipFooter: PropTypes.func,
- tooltipHeader: PropTypes.func,
- verticalLineHover: PropTypes.func,
- width: PropTypes.number.isRequired,
- height: PropTypes.number,
- xType: PropTypes.string,
- legends: PropTypes.array,
- noHits: PropTypes.bool,
-};
-
-HistogramInner.defaultProps = {
- backgroundHover: () => null,
- formatYLong: (value) => value,
- formatYShort: (value) => value,
- tooltipFooter: () => null,
- tooltipHeader: () => null,
- verticalLineHover: () => null,
- xType: 'linear',
- noHits: false,
- height: XY_HEIGHT,
-};
-
-export default makeWidthFlexible(HistogramInner);
diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/TransactionLineChart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/TransactionLineChart/index.tsx
deleted file mode 100644
index 2e4b51af00d6b..0000000000000
--- a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/TransactionLineChart/index.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useCallback } from 'react';
-import { Coordinate, TimeSeries } from '../../../../../../typings/timeseries';
-import { useLegacyChartsSync as useChartsSync } from '../../../../../hooks/use_charts_sync';
-// @ts-expect-error
-import CustomPlot from '../../CustomPlot';
-
-interface Props {
- series: TimeSeries[];
- truncateLegends?: boolean;
- tickFormatY: (y: number) => React.ReactNode;
- formatTooltipValue: (c: Coordinate) => React.ReactNode;
- yMax?: string | number;
- height?: number;
- stacked?: boolean;
- onHover?: () => void;
- visibleLegendCount?: number;
- onToggleLegend?: (disabledSeriesState: boolean[]) => void;
-}
-
-function TransactionLineChart(props: Props) {
- const {
- series,
- tickFormatY,
- formatTooltipValue,
- yMax = 'max',
- height,
- truncateLegends,
- stacked = false,
- onHover,
- visibleLegendCount,
- onToggleLegend,
- } = props;
-
- const syncedChartsProps = useChartsSync();
-
- // combine callback for syncedChartsProps.onHover and props.onHover
- const combinedOnHover = useCallback(
- (hoverX: number) => {
- if (onHover) {
- onHover();
- }
- return syncedChartsProps.onHover(hoverX);
- },
- [syncedChartsProps, onHover]
- );
-
- return (
-
-
- {formatter(value).formatted}
-
- );
-}
describe('useFormatter', () => {
const timeSeries = ([
{
+ title: 'avg',
data: [
{ x: 1, y: toMicroseconds(11, 'minutes') },
{ x: 2, y: toMicroseconds(1, 'minutes') },
@@ -42,6 +21,7 @@ describe('useFormatter', () => {
],
},
{
+ title: '95th percentile',
data: [
{ x: 1, y: toMicroseconds(120, 'seconds') },
{ x: 2, y: toMicroseconds(1, 'minutes') },
@@ -49,6 +29,7 @@ describe('useFormatter', () => {
],
},
{
+ title: '99th percentile',
data: [
{ x: 1, y: toMicroseconds(60, 'seconds') },
{ x: 2, y: toMicroseconds(5, 'minutes') },
@@ -56,54 +37,47 @@ describe('useFormatter', () => {
],
},
] as unknown) as TimeSeries[];
+
it('returns new formatter when disabled series state changes', () => {
- const { getByText } = render(
- My amazing component
+ My amazing component
+ My amazing component
My amazing component
+ My amazing component
My amazing component
+ {children}
;
+}
+
+function LoadingChartPlaceholder({ height }: { height: number }) {
return (
- {isLoading &&
);
}
+
+function FailedChartPlaceholder({ height }: { height: number }) {
+ return (
+