string | |
| [input](./kibana-plugin-plugins-embeddable-public.embeddable.input.md) | | TEmbeddableInput | |
| [isContainer](./kibana-plugin-plugins-embeddable-public.embeddable.iscontainer.md) | | boolean | |
@@ -43,6 +44,7 @@ export declare abstract class EmbeddableError | |
+
+Returns:
+
+`void`
+
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md
new file mode 100644
index 0000000000000..4b764a6ede079
--- /dev/null
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md
@@ -0,0 +1,13 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-embeddable-public](./kibana-plugin-plugins-embeddable-public.md) > [IEmbeddable](./kibana-plugin-plugins-embeddable-public.iembeddable.md) > [fatalError](./kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md)
+
+## IEmbeddable.fatalError property
+
+If this embeddable has encountered a fatal error, that error will be stored here
+
+Signature:
+
+```typescript
+fatalError?: Error;
+```
diff --git a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md
index b3b6f961e56d1..f96477ed65a04 100644
--- a/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md
+++ b/docs/development/plugins/embeddable/public/kibana-plugin-plugins-embeddable-public.iembeddable.md
@@ -15,6 +15,7 @@ export interface IEmbeddableobject | Extra abilities added to Embeddable by *_enhanced plugins. |
+| [fatalError](./kibana-plugin-plugins-embeddable-public.iembeddable.fatalerror.md) | Error | If this embeddable has encountered a fatal error, that error will be stored here |
| [id](./kibana-plugin-plugins-embeddable-public.iembeddable.id.md) | string | A unique identifier for this embeddable. Mainly only used by containers to map their Panel States to a child embeddable instance. |
| [isContainer](./kibana-plugin-plugins-embeddable-public.iembeddable.iscontainer.md) | boolean | Is this embeddable an instance of a Container class, can it contain nested embeddables? |
| [parent](./kibana-plugin-plugins-embeddable-public.iembeddable.parent.md) | IContainer | If this embeddable is nested inside a container, this will contain a reference to its parent. |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrenderer.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrenderer.md
index 32a7151578658..8cc32ff698b38 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrenderer.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrenderer.md
@@ -7,5 +7,5 @@
Signature:
```typescript
-ReactExpressionRenderer: ({ className, dataAttrs, padding, renderError, expression, onEvent, reload$, debounce, ...expressionLoaderOptions }: ReactExpressionRendererProps) => JSX.Element
+ReactExpressionRenderer: ({ className, dataAttrs, padding, renderError, expression, onEvent, onData$, reload$, debounce, ...expressionLoaderOptions }: ReactExpressionRendererProps) => JSX.Element
```
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md
index e4980ce04b9e2..92ea071b23dfc 100644
--- a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md
@@ -18,6 +18,7 @@ export interface ReactExpressionRendererProps extends IExpressionLoaderParams
| [dataAttrs](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.dataattrs.md) | string[] | |
| [debounce](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.debounce.md) | number | |
| [expression](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.expression.md) | string | ExpressionAstExpression | |
+| [onData$](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md) | <TData, TInspectorAdapters>(data: TData, adapters?: TInspectorAdapters) => void | |
| [onEvent](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.onevent.md) | (event: ExpressionRendererEvent) => void | |
| [padding](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.padding.md) | 'xs' | 's' | 'm' | 'l' | 'xl' | |
| [reload$](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.reload_.md) | Observable<unknown> | An observable which can be used to re-run the expression without destroying the component |
diff --git a/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md
new file mode 100644
index 0000000000000..05ddb0b13a5be
--- /dev/null
+++ b/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md
@@ -0,0 +1,11 @@
+
+
+[Home](./index.md) > [kibana-plugin-plugins-expressions-public](./kibana-plugin-plugins-expressions-public.md) > [ReactExpressionRendererProps](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md) > [onData$](./kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.ondata_.md)
+
+## ReactExpressionRendererProps.onData$ property
+
+Signature:
+
+```typescript
+onData$?:
- {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..a8c5df8d64630 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 { SavedObjectTypeRegistry } from '../../../saved_objects_type_registry'; import { ALL_NAMESPACES_STRING } from '../utils'; 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,53 @@ 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/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
index c7afc157c1452..31df5c5085f8b 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
@@ -43,6 +43,7 @@ export abstract class Embeddable<
public readonly isContainer: boolean = false;
public abstract readonly type: string;
public readonly id: string;
+ public fatalError?: Error;
protected output: TEmbeddableOutput;
protected input: TEmbeddableInput;
@@ -88,9 +89,12 @@ export abstract class Embeddable<
map(({ title }) => title || ''),
distinctUntilChanged()
)
- .subscribe((title) => {
- this.renderComplete.setTitle(title);
- });
+ .subscribe(
+ (title) => {
+ this.renderComplete.setTitle(title);
+ },
+ () => {}
+ );
}
public getIsContainer(): this is IContainer {
@@ -193,6 +197,11 @@ export abstract class Embeddable<
}
}
+ protected onFatalError(e: Error) {
+ this.fatalError = e;
+ this.output$.error(e);
+ }
+
private onResetInput(newInput: TEmbeddableInput) {
if (!isEqual(this.input, newInput)) {
const oldLastReloadRequestTime = this.input.lastReloadRequestTime;
diff --git a/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
index cdbe7af98a4f4..34d971cbb717a 100644
--- a/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/error_embeddable.tsx
@@ -30,7 +30,7 @@ export const ERROR_EMBEDDABLE_TYPE = 'error';
export function isErrorEmbeddable(
embeddable: TEmbeddable | ErrorEmbeddable
): embeddable is ErrorEmbeddable {
- return (embeddable as ErrorEmbeddable).error !== undefined;
+ return Boolean(embeddable.fatalError || (embeddable as ErrorEmbeddable).error !== undefined);
}
export class ErrorEmbeddable extends Embeddable {
diff --git a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
index 3843950c164c9..5a73df2e13861 100644
--- a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
@@ -85,6 +85,11 @@ export interface IEmbeddable<
*/
enhancements?: object;
+ /**
+ * If this embeddable has encountered a fatal error, that error will be stored here
+ **/
+ fatalError?: Error;
+
/**
* A functional representation of the isContainer variable, but helpful for typescript to
* know the shape if this returns true
diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
index 1cd48e85469fd..4a1fd22894e7e 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
@@ -50,7 +50,7 @@ import { EditPanelAction } from '../actions';
import { CustomizePanelModal } from './panel_header/panel_actions/customize_title/customize_panel_modal';
import { EmbeddableStart } from '../../plugin';
import { EmbeddableErrorLabel } from './embeddable_error_label';
-import { EmbeddableStateTransfer } from '..';
+import { EmbeddableStateTransfer, ErrorEmbeddable } from '..';
const sortByOrderField = (
{ order: orderA }: { order?: number },
@@ -85,6 +85,7 @@ interface State {
notifications: Array>;
loading?: boolean;
error?: EmbeddableError;
+ errorEmbeddable?: ErrorEmbeddable;
}
interface PanelUniversalActions {
@@ -199,6 +200,9 @@ export class EmbeddablePanel extends React.Component {
if (this.parentSubscription) {
this.parentSubscription.unsubscribe();
}
+ if (this.state.errorEmbeddable) {
+ this.state.errorEmbeddable.destroy();
+ }
this.props.embeddable.destroy();
}
@@ -257,12 +261,21 @@ export class EmbeddablePanel extends React.Component {
public componentDidMount() {
if (this.embeddableRoot.current) {
this.subscription.add(
- this.props.embeddable.getOutput$().subscribe((output: EmbeddableOutput) => {
- this.setState({
- error: output.error,
- loading: output.loading,
- });
- })
+ this.props.embeddable.getOutput$().subscribe(
+ (output: EmbeddableOutput) => {
+ this.setState({
+ error: output.error,
+ loading: output.loading,
+ });
+ },
+ (error) => {
+ if (this.embeddableRoot.current) {
+ const errorEmbeddable = new ErrorEmbeddable(error, { id: this.props.embeddable.id });
+ errorEmbeddable.render(this.embeddableRoot.current);
+ this.setState({ errorEmbeddable });
+ }
+ }
+ )
);
this.props.embeddable.render(this.embeddableRoot.current);
}
diff --git a/src/plugins/embeddable/public/public.api.md b/src/plugins/embeddable/public/public.api.md
index 8f0f56c4e1a16..4406dded98547 100644
--- a/src/plugins/embeddable/public/public.api.md
+++ b/src/plugins/embeddable/public/public.api.md
@@ -278,6 +278,8 @@ export abstract class Embeddable>;
// (undocumented)
getInput(): Readonly;
@@ -298,6 +300,8 @@ export abstract class Embeddable {
destroy(): void;
enhancements?: object;
+ fatalError?: Error;
getInput$(): Readonly>;
getInput(): Readonly;
getInspectorAdapters(): Adapters | undefined;
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/inspector/public/plugin.tsx b/src/plugins/inspector/public/plugin.tsx
index f906dbcab8043..07ef7c8fbab0d 100644
--- a/src/plugins/inspector/public/plugin.tsx
+++ b/src/plugins/inspector/public/plugin.tsx
@@ -70,7 +70,7 @@ export class InspectorPublicPlugin implements Plugin {
public async setup(core: CoreSetup) {
this.views = new InspectorViewRegistry();
- this.views.register(getDataViewDescription(core.uiSettings));
+ this.views.register(getDataViewDescription());
this.views.register(getRequestsViewDescription());
return {
@@ -101,7 +101,14 @@ export class InspectorPublicPlugin implements Plugin {
}
return core.overlays.openFlyout(
- toMountPoint(
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
-
-
-
-
-
-
-
- - Inspector -
-
+ Inspector
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
- View 1 -
-+ View 1 +
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ loading
+
+
`;
diff --git a/src/plugins/inspector/public/views/data/components/data_view.test.tsx b/src/plugins/inspector/public/views/data/components/data_view.test.tsx
index bd78bca42c479..6a7f878ef807e 100644
--- a/src/plugins/inspector/public/views/data/components/data_view.test.tsx
+++ b/src/plugins/inspector/public/views/data/components/data_view.test.tsx
@@ -17,11 +17,10 @@
* under the License.
*/
-import React from 'react';
+import React, { Suspense } from 'react';
import { getDataViewDescription } from '../index';
import { DataAdapter } from '../../../../common/adapters/data';
import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import { IUiSettingsClient } from '../../../../../../core/public';
jest.mock('../lib/export_csv', () => ({
exportAsCsv: jest.fn(),
@@ -31,9 +30,7 @@ describe('Inspector Data View', () => {
let DataView: any;
beforeEach(() => {
- const uiSettings = {} as IUiSettingsClient;
-
- DataView = getDataViewDescription(uiSettings);
+ DataView = getDataViewDescription();
});
it('should only show if data adapter is present', () => {
@@ -51,7 +48,12 @@ describe('Inspector Data View', () => {
});
it('should render loading state', () => {
- const component = mountWithIntl(
+
+ {(copy) => (
+
+ {copyToClipboardLabel}
+
+ )}
+
+
+ {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}
- />
-
- )}
-
-
-
-