boolean | |
-| [id](./kibana-plugin-plugins-data-public.aggconfigoptions.id.md) | string | |
-| [params](./kibana-plugin-plugins-data-public.aggconfigoptions.params.md) | Record<string, any> | |
-| [schema](./kibana-plugin-plugins-data-public.aggconfigoptions.schema.md) | string | |
-| [type](./kibana-plugin-plugins-data-public.aggconfigoptions.type.md) | IAggType | |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.params.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.params.md
deleted file mode 100644
index 45219a837cc33..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigoptions.params.md
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) > [params](./kibana-plugin-plugins-data-public.aggconfigoptions.params.md)
-
-## AggConfigOptions.params property
-
-Signature:
-
-```typescript
-params?: Recordstring[] | |
-| [makeAgg](./kibana-plugin-plugins-data-public.aggparamtype.makeagg.md) | | (agg: TAggConfig, state?: any) => TAggConfig | |
+| [makeAgg](./kibana-plugin-plugins-data-public.aggparamtype.makeagg.md) | | (agg: TAggConfig, state?: AggConfigSerialized) => TAggConfig | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.createsearchsource.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.createsearchsource.md
deleted file mode 100644
index 5c5aa348eecdf..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.createsearchsource.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [createSearchSource](./kibana-plugin-plugins-data-public.createsearchsource.md)
-
-## createSearchSource variable
-
-Deserializes a json string and a set of referenced objects to a `SearchSource` instance. Use this method to re-create the search source serialized using `searchSource.serialize`.
-
-This function is a factory function that returns the actual utility when calling it with the required service dependency (index patterns contract). A pre-wired version is also exposed in the start contract of the data plugin as part of the search service
-
-Signature:
-
-```typescript
-createSearchSource: (indexPatterns: PickSearchSource instance. Use this method to re-create the search source serialized using searchSource.serialize.This function is a factory function that returns the actual utility when calling it with the required service dependency (index patterns contract). A pre-wired version is also exposed in the start contract of the data plugin as part of the search service |
| [ES\_SEARCH\_STRATEGY](./kibana-plugin-plugins-data-public.es_search_strategy.md) | |
| [esFilters](./kibana-plugin-plugins-data-public.esfilters.md) | |
| [esKuery](./kibana-plugin-plugins-data-public.eskuery.md) | |
@@ -120,6 +117,7 @@
| Type Alias | Description |
| --- | --- |
+| [AggConfigOptions](./kibana-plugin-plugins-data-public.aggconfigoptions.md) | |
| [AggParam](./kibana-plugin-plugins-data-public.aggparam.md) | |
| [CustomFilter](./kibana-plugin-plugins-data-public.customfilter.md) | |
| [EsQuerySortValue](./kibana-plugin-plugins-data-public.esquerysortvalue.md) | |
@@ -140,7 +138,7 @@
| [IpRangeKey](./kibana-plugin-plugins-data-public.iprangekey.md) | |
| [ISearch](./kibana-plugin-plugins-data-public.isearch.md) | |
| [ISearchGeneric](./kibana-plugin-plugins-data-public.isearchgeneric.md) | |
-| [ISearchSource](./kibana-plugin-plugins-data-public.isearchsource.md) | |
+| [ISearchSource](./kibana-plugin-plugins-data-public.isearchsource.md) | \* |
| [MatchAllFilter](./kibana-plugin-plugins-data-public.matchallfilter.md) | |
| [ParsedInterval](./kibana-plugin-plugins-data-public.parsedinterval.md) | |
| [PhraseFilter](./kibana-plugin-plugins-data-public.phrasefilter.md) | |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.search.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.search.md
index 78ac05b9fd386..9a22339fd0530 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.search.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.search.md
@@ -27,8 +27,9 @@ search: {
InvalidEsCalendarIntervalError: typeof InvalidEsCalendarIntervalError;
InvalidEsIntervalFormatError: typeof InvalidEsIntervalFormatError;
isDateHistogramBucketAggConfig: typeof isDateHistogramBucketAggConfig;
+ isNumberType: (agg: import("./search").AggConfig) => boolean;
isStringType: (agg: import("./search").AggConfig) => boolean;
- isType: (type: string) => (agg: import("./search").AggConfig) => boolean;
+ isType: (...types: string[]) => (agg: import("./search").AggConfig) => boolean;
isValidEsInterval: typeof isValidEsInterval;
isValidInterval: typeof isValidInterval;
parentPipelineType: string;
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource._constructor_.md
deleted file mode 100644
index e0c9e77b313a5..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource._constructor_.md
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [(constructor)](./kibana-plugin-plugins-data-public.searchsource._constructor_.md)
-
-## SearchSource.(constructor)
-
-Constructs a new instance of the `SearchSource` class
-
-Signature:
-
-```typescript
-constructor(fields?: SearchSourceFields);
-```
-
-## Parameters
-
-| Parameter | Type | Description |
-| --- | --- | --- |
-| fields | SearchSourceFields | |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.create.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.create.md
deleted file mode 100644
index b0a0201680ca8..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.create.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [create](./kibana-plugin-plugins-data-public.searchsource.create.md)
-
-## SearchSource.create() method
-
-Signature:
-
-```typescript
-create(): SearchSource;
-```
-Returns:
-
-`SearchSource`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.createchild.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.createchild.md
deleted file mode 100644
index 3f17dc21cf514..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.createchild.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [createChild](./kibana-plugin-plugins-data-public.searchsource.createchild.md)
-
-## SearchSource.createChild() method
-
-Signature:
-
-```typescript
-createChild(options?: {}): SearchSource;
-```
-
-## Parameters
-
-| Parameter | Type | Description |
-| --- | --- | --- |
-| options | {} | |
-
-Returns:
-
-`SearchSource`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.createcopy.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.createcopy.md
deleted file mode 100644
index f503a3dfc3299..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.createcopy.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [createCopy](./kibana-plugin-plugins-data-public.searchsource.createcopy.md)
-
-## SearchSource.createCopy() method
-
-Signature:
-
-```typescript
-createCopy(): SearchSource;
-```
-Returns:
-
-`SearchSource`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.destroy.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.destroy.md
deleted file mode 100644
index 8a7cc5ee75d11..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.destroy.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [destroy](./kibana-plugin-plugins-data-public.searchsource.destroy.md)
-
-## SearchSource.destroy() method
-
-Completely destroy the SearchSource. {undefined}
-
-Signature:
-
-```typescript
-destroy(): void;
-```
-Returns:
-
-`void`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch.md
deleted file mode 100644
index 208ce565fac13..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch.md
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [fetch](./kibana-plugin-plugins-data-public.searchsource.fetch.md)
-
-## SearchSource.fetch() method
-
-Fetch this source and reject the returned Promise on error
-
-
-Signature:
-
-```typescript
-fetch(options?: FetchOptions): PromiseFetchOptions | |
-
-Returns:
-
-`PromiseK | |
-| recurse | boolean | |
-
-Returns:
-
-`SearchSourceFields[K]`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getfields.md
deleted file mode 100644
index dce03e7e1a95c..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getfields.md
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [getFields](./kibana-plugin-plugins-data-public.searchsource.getfields.md)
-
-## SearchSource.getFields() method
-
-Signature:
-
-```typescript
-getFields(): {
- type?: string | undefined;
- query?: import("../..").Query | undefined;
- filter?: Filter | Filter[] | (() => Filter | Filter[] | undefined) | undefined;
- sort?: RecordK | |
-
-Returns:
-
-`SearchSourceFields[K]`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getparent.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getparent.md
deleted file mode 100644
index 14578f7949ba6..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getparent.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [getParent](./kibana-plugin-plugins-data-public.searchsource.getparent.md)
-
-## SearchSource.getParent() method
-
-Get the parent of this SearchSource {undefined\|searchSource}
-
-Signature:
-
-```typescript
-getParent(): SearchSource | undefined;
-```
-Returns:
-
-`SearchSource | undefined`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getsearchrequestbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getsearchrequestbody.md
deleted file mode 100644
index f3451c9391074..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.getsearchrequestbody.md
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [getSearchRequestBody](./kibana-plugin-plugins-data-public.searchsource.getsearchrequestbody.md)
-
-## SearchSource.getSearchRequestBody() method
-
-Signature:
-
-```typescript
-getSearchRequestBody(): PromiseSearchSource class |
-
-## Properties
-
-| Property | Modifiers | Type | Description |
-| --- | --- | --- | --- |
-| [history](./kibana-plugin-plugins-data-public.searchsource.history.md) | | SearchRequest[] | |
-
-## Methods
-
-| Method | Modifiers | Description |
-| --- | --- | --- |
-| [create()](./kibana-plugin-plugins-data-public.searchsource.create.md) | | |
-| [createChild(options)](./kibana-plugin-plugins-data-public.searchsource.createchild.md) | | |
-| [createCopy()](./kibana-plugin-plugins-data-public.searchsource.createcopy.md) | | |
-| [destroy()](./kibana-plugin-plugins-data-public.searchsource.destroy.md) | | Completely destroy the SearchSource. {undefined} |
-| [fetch(options)](./kibana-plugin-plugins-data-public.searchsource.fetch.md) | | Fetch this source and reject the returned Promise on error |
-| [getField(field, recurse)](./kibana-plugin-plugins-data-public.searchsource.getfield.md) | | Get fields from the fields |
-| [getFields()](./kibana-plugin-plugins-data-public.searchsource.getfields.md) | | |
-| [getId()](./kibana-plugin-plugins-data-public.searchsource.getid.md) | | |
-| [getOwnField(field)](./kibana-plugin-plugins-data-public.searchsource.getownfield.md) | | Get the field from our own fields, don't traverse up the chain |
-| [getParent()](./kibana-plugin-plugins-data-public.searchsource.getparent.md) | | Get the parent of this SearchSource {undefined\|searchSource} |
-| [getSearchRequestBody()](./kibana-plugin-plugins-data-public.searchsource.getsearchrequestbody.md) | | |
-| [onRequestStart(handler)](./kibana-plugin-plugins-data-public.searchsource.onrequeststart.md) | | Add a handler that will be notified whenever requests start |
-| [serialize()](./kibana-plugin-plugins-data-public.searchsource.serialize.md) | | Serializes the instance to a JSON string and a set of referenced objects. Use this method to get a representation of the search source which can be stored in a saved object.The references returned by this function can be mixed with other references in the same object, however make sure there are no name-collisions. The references will be named kibanaSavedObjectMeta.searchSourceJSON.index and kibanaSavedObjectMeta.searchSourceJSON.filter[<number>].meta.index.Using createSearchSource, the instance can be re-created. |
-| [setField(field, value)](./kibana-plugin-plugins-data-public.searchsource.setfield.md) | | |
-| [setFields(newFields)](./kibana-plugin-plugins-data-public.searchsource.setfields.md) | | |
-| [setParent(parent, options)](./kibana-plugin-plugins-data-public.searchsource.setparent.md) | | Set a searchSource that this source should inherit from |
-| [setPreferredSearchStrategyId(searchStrategyId)](./kibana-plugin-plugins-data-public.searchsource.setpreferredsearchstrategyid.md) | | \*\*\* PUBLIC API \*\*\* |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.onrequeststart.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.onrequeststart.md
deleted file mode 100644
index 092d057c69196..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.onrequeststart.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [onRequestStart](./kibana-plugin-plugins-data-public.searchsource.onrequeststart.md)
-
-## SearchSource.onRequestStart() method
-
-Add a handler that will be notified whenever requests start
-
-Signature:
-
-```typescript
-onRequestStart(handler: (searchSource: ISearchSource, options?: FetchOptions) => Promise(searchSource: ISearchSource, options?: FetchOptions) => Promise<unknown> | |
-
-Returns:
-
-`void`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.serialize.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.serialize.md
deleted file mode 100644
index 52d25dec01dfd..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.serialize.md
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [serialize](./kibana-plugin-plugins-data-public.searchsource.serialize.md)
-
-## SearchSource.serialize() method
-
-Serializes the instance to a JSON string and a set of referenced objects. Use this method to get a representation of the search source which can be stored in a saved object.
-
-The references returned by this function can be mixed with other references in the same object, however make sure there are no name-collisions. The references will be named `kibanaSavedObjectMeta.searchSourceJSON.index` and `kibanaSavedObjectMeta.searchSourceJSON.filter[K | |
-| value | SearchSourceFields[K] | |
-
-Returns:
-
-`this`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.setfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.setfields.md
deleted file mode 100644
index fa9b265aa43b7..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.setfields.md
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [setFields](./kibana-plugin-plugins-data-public.searchsource.setfields.md)
-
-## SearchSource.setFields() method
-
-Signature:
-
-```typescript
-setFields(newFields: SearchSourceFields): this;
-```
-
-## Parameters
-
-| Parameter | Type | Description |
-| --- | --- | --- |
-| newFields | SearchSourceFields | |
-
-Returns:
-
-`this`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.setparent.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.setparent.md
deleted file mode 100644
index 19bf10bec210f..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.setparent.md
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [setParent](./kibana-plugin-plugins-data-public.searchsource.setparent.md)
-
-## SearchSource.setParent() method
-
-Set a searchSource that this source should inherit from
-
-Signature:
-
-```typescript
-setParent(parent?: ISearchSource, options?: SearchSourceOptions): this;
-```
-
-## Parameters
-
-| Parameter | Type | Description |
-| --- | --- | --- |
-| parent | ISearchSource | |
-| options | SearchSourceOptions | |
-
-Returns:
-
-`this`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.setpreferredsearchstrategyid.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.setpreferredsearchstrategyid.md
deleted file mode 100644
index 8d8dbce9e60f6..0000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.setpreferredsearchstrategyid.md
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-[Home](./index.md) > [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) > [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) > [setPreferredSearchStrategyId](./kibana-plugin-plugins-data-public.searchsource.setpreferredsearchstrategyid.md)
-
-## SearchSource.setPreferredSearchStrategyId() method
-
-\*\*\* PUBLIC API \*\*\*
-
-Signature:
-
-```typescript
-setPreferredSearchStrategyId(searchStrategyId: string): void;
-```
-
-## Parameters
-
-| Parameter | Type | Description |
-| --- | --- | --- |
-| searchStrategyId | string | |
-
-Returns:
-
-`void`
-
diff --git a/docs/images/report-automate-csv.png b/docs/images/report-automate-csv.png
new file mode 100644
index 0000000000000..fba77821ae29f
Binary files /dev/null and b/docs/images/report-automate-csv.png differ
diff --git a/docs/images/report-automate-pdf.png b/docs/images/report-automate-pdf.png
new file mode 100644
index 0000000000000..f96eebe6fe02d
Binary files /dev/null and b/docs/images/report-automate-pdf.png differ
diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc
index ddabce3d5b842..12ee96b21b0c7 100644
--- a/docs/setup/docker.asciidoc
+++ b/docs/setup/docker.asciidoc
@@ -94,7 +94,7 @@ Some example translations are shown here:
**Environment Variable**:: **Kibana Setting**
`SERVER_NAME`:: `server.name`
`KIBANA_DEFAULTAPPID`:: `kibana.defaultAppId`
-`XPACK_MONITORING_ENABLED`:: `xpack.monitoring.enabled`
+`MONITORING_ENABLED`:: `monitoring.enabled`
In general, any setting listed in <
-
-
-
-`;
diff --git a/src/core/public/legacy/legacy_service.test.ts b/src/core/public/legacy/legacy_service.test.ts
index c3de645c6b17e..fa29320aab4e6 100644
--- a/src/core/public/legacy/legacy_service.test.ts
+++ b/src/core/public/legacy/legacy_service.test.ts
@@ -19,34 +19,6 @@
import angular from 'angular';
-const mockLoadOrder: string[] = [];
-
-const mockUiNewPlatformSetup = jest.fn();
-const mockUiNewPlatformStart = jest.fn();
-jest.mock('ui/new_platform', () => {
- mockLoadOrder.push('ui/new_platform');
- return {
- __setup__: mockUiNewPlatformSetup,
- __start__: mockUiNewPlatformStart,
- };
-});
-
-const mockUiChromeBootstrap = jest.fn();
-jest.mock('ui/chrome', () => {
- mockLoadOrder.push('ui/chrome');
- return {
- bootstrap: mockUiChromeBootstrap,
- };
-});
-
-const mockUiTestHarnessBootstrap = jest.fn();
-jest.mock('ui/test_harness', () => {
- mockLoadOrder.push('ui/test_harness');
- return {
- bootstrap: mockUiTestHarnessBootstrap,
- };
-});
-
import { chromeServiceMock } from '../chrome/chrome_service.mock';
import { fatalErrorsServiceMock } from '../fatal_errors/fatal_errors_service.mock';
import { httpServiceMock } from '../http/http_service.mock';
@@ -69,10 +41,24 @@ const injectedMetadataSetup = injectedMetadataServiceMock.createSetupContract();
const notificationsSetup = notificationServiceMock.createSetupContract();
const uiSettingsSetup = uiSettingsServiceMock.createSetupContract();
+const mockLoadOrder: string[] = [];
+const mockUiNewPlatformSetup = jest.fn();
+const mockUiNewPlatformStart = jest.fn();
+const mockUiChromeBootstrap = jest.fn();
const defaultParams = {
requireLegacyFiles: jest.fn(() => {
mockLoadOrder.push('legacy files');
}),
+ requireLegacyBootstrapModule: jest.fn(() => {
+ mockLoadOrder.push('ui/chrome');
+ return {
+ bootstrap: mockUiChromeBootstrap,
+ };
+ }),
+ requireNewPlatformShimModule: jest.fn(() => ({
+ __setup__: mockUiNewPlatformSetup,
+ __start__: mockUiNewPlatformStart,
+ })),
};
const defaultSetupDeps = {
@@ -128,7 +114,7 @@ afterEach(() => {
describe('#setup()', () => {
describe('default', () => {
- it('initializes ui/new_platform with core APIs', () => {
+ it('initializes new platform shim module with core APIs', () => {
const legacyPlatform = new LegacyPlatformService({
...defaultParams,
});
@@ -138,6 +124,21 @@ describe('#setup()', () => {
expect(mockUiNewPlatformSetup).toHaveBeenCalledTimes(1);
expect(mockUiNewPlatformSetup).toHaveBeenCalledWith(expect.any(Object), {});
});
+
+ it('throws error if requireNewPlatformShimModule is undefined', () => {
+ const legacyPlatform = new LegacyPlatformService({
+ ...defaultParams,
+ requireNewPlatformShimModule: undefined,
+ });
+
+ expect(() => {
+ legacyPlatform.setup(defaultSetupDeps);
+ }).toThrowErrorMatchingInlineSnapshot(
+ `"requireNewPlatformShimModule must be specified when rendering a legacy application"`
+ );
+
+ expect(mockUiNewPlatformSetup).not.toHaveBeenCalled();
+ });
});
});
@@ -171,6 +172,21 @@ describe('#start()', () => {
expect(mockUiNewPlatformStart).toHaveBeenCalledWith(expect.any(Object), {});
});
+ it('throws error if requireNewPlatformShimeModule is undefined', () => {
+ const legacyPlatform = new LegacyPlatformService({
+ ...defaultParams,
+ requireNewPlatformShimModule: undefined,
+ });
+
+ expect(() => {
+ legacyPlatform.start(defaultStartDeps);
+ }).toThrowErrorMatchingInlineSnapshot(
+ `"requireNewPlatformShimModule must be specified when rendering a legacy application"`
+ );
+
+ expect(mockUiNewPlatformStart).not.toHaveBeenCalled();
+ });
+
it('resolves getStartServices with core and plugin APIs', async () => {
const legacyPlatform = new LegacyPlatformService({
...defaultParams,
@@ -185,67 +201,35 @@ describe('#start()', () => {
expect(pluginsStart).toBe(defaultStartDeps.plugins);
});
- describe('useLegacyTestHarness = false', () => {
- it('passes the targetDomElement to ui/chrome', () => {
- const legacyPlatform = new LegacyPlatformService({
- ...defaultParams,
- });
+ it('passes the targetDomElement to legacy bootstrap module', () => {
+ const legacyPlatform = new LegacyPlatformService({
+ ...defaultParams,
+ });
- legacyPlatform.setup(defaultSetupDeps);
- legacyPlatform.start(defaultStartDeps);
+ legacyPlatform.setup(defaultSetupDeps);
+ legacyPlatform.start(defaultStartDeps);
- expect(mockUiTestHarnessBootstrap).not.toHaveBeenCalled();
- expect(mockUiChromeBootstrap).toHaveBeenCalledTimes(1);
- expect(mockUiChromeBootstrap).toHaveBeenCalledWith(defaultStartDeps.targetDomElement);
- });
+ expect(mockUiChromeBootstrap).toHaveBeenCalledTimes(1);
+ expect(mockUiChromeBootstrap).toHaveBeenCalledWith(defaultStartDeps.targetDomElement);
});
- describe('useLegacyTestHarness = true', () => {
- it('passes the targetDomElement to ui/test_harness', () => {
+ describe('load order', () => {
+ it('loads ui/modules before ui/chrome, and both before legacy files', () => {
const legacyPlatform = new LegacyPlatformService({
...defaultParams,
- useLegacyTestHarness: true,
});
+ expect(mockLoadOrder).toEqual([]);
+
legacyPlatform.setup(defaultSetupDeps);
legacyPlatform.start(defaultStartDeps);
- expect(mockUiChromeBootstrap).not.toHaveBeenCalled();
- expect(mockUiTestHarnessBootstrap).toHaveBeenCalledTimes(1);
- expect(mockUiTestHarnessBootstrap).toHaveBeenCalledWith(defaultStartDeps.targetDomElement);
- });
- });
-
- describe('load order', () => {
- describe('useLegacyTestHarness = false', () => {
- it('loads ui/modules before ui/chrome, and both before legacy files', () => {
- const legacyPlatform = new LegacyPlatformService({
- ...defaultParams,
- });
-
- expect(mockLoadOrder).toEqual([]);
-
- legacyPlatform.setup(defaultSetupDeps);
- legacyPlatform.start(defaultStartDeps);
-
- expect(mockLoadOrder).toMatchSnapshot();
- });
- });
-
- describe('useLegacyTestHarness = true', () => {
- it('loads ui/modules before ui/test_harness, and both before legacy files', () => {
- const legacyPlatform = new LegacyPlatformService({
- ...defaultParams,
- useLegacyTestHarness: true,
- });
-
- expect(mockLoadOrder).toEqual([]);
-
- legacyPlatform.setup(defaultSetupDeps);
- legacyPlatform.start(defaultStartDeps);
-
- expect(mockLoadOrder).toMatchSnapshot();
- });
+ expect(mockLoadOrder).toMatchInlineSnapshot(`
+ Array [
+ "ui/chrome",
+ "legacy files",
+ ]
+ `);
});
});
});
@@ -262,7 +246,17 @@ describe('#stop()', () => {
});
legacyPlatform.stop();
- expect(targetDomElement).toMatchSnapshot();
+ expect(targetDomElement).toMatchInlineSnapshot(`
+ - this should not be removed -
- - -
+
+
+
+ `);
});
it('destroys the angular scope and empties the targetDomElement if angular is bootstrapped to targetDomElement', async () => {
@@ -291,7 +285,11 @@ describe('#stop()', () => {
legacyPlatform.start({ ...defaultStartDeps, targetDomElement });
legacyPlatform.stop();
- expect(targetDomElement).toMatchSnapshot();
+ expect(targetDomElement).toMatchInlineSnapshot(`
+
+ `);
expect(scopeDestroySpy).toHaveBeenCalledTimes(1);
});
});
diff --git a/src/core/public/legacy/legacy_service.ts b/src/core/public/legacy/legacy_service.ts
index 39ca7bdf54b7c..01837ba6f5940 100644
--- a/src/core/public/legacy/legacy_service.ts
+++ b/src/core/public/legacy/legacy_service.ts
@@ -25,8 +25,12 @@ import { LegacyCoreSetup, LegacyCoreStart, MountPoint } from '../';
/** @internal */
export interface LegacyPlatformParams {
- requireLegacyFiles: () => void;
- useLegacyTestHarness?: boolean;
+ requireLegacyFiles?: () => void;
+ requireLegacyBootstrapModule?: () => BootstrapModule;
+ requireNewPlatformShimModule?: () => {
+ __setup__: (legacyCore: LegacyCoreSetup, plugins: Record+ this should not be removed +
+ + +
{children}
@@ -61,6 +65,12 @@ jest.mock('@elastic/eui/packages/react-datepicker', () => {
};
});
+
+// Mock React Portal for components that use modals, tooltips, etc
+ReactDOM.createPortal = jest.fn((element) => {
+ return element;
+});
+
jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
return {
htmlIdGenerator: () => () => `generated-id`,
@@ -71,7 +81,7 @@ jest.mock('plugins/interpreter/registries', () => ({}));
// Disabling this test due to https://github.com/elastic/eui/issues/2242
jest.mock(
- '../public/components/workpad_header/workpad_export/flyout/__examples__/share_website_flyout.stories',
+ '../public/components/workpad_header/share_menu/flyout/__examples__/share_website_flyout.stories',
() => {
return 'Disabled Panel';
}
diff --git a/x-pack/legacy/plugins/canvas/.storybook/webpack.config.js b/x-pack/legacy/plugins/canvas/.storybook/webpack.config.js
index cc74faeac6a96..963cf831ef698 100644
--- a/x-pack/legacy/plugins/canvas/.storybook/webpack.config.js
+++ b/x-pack/legacy/plugins/canvas/.storybook/webpack.config.js
@@ -177,8 +177,10 @@ module.exports = async ({ config }) => {
}),
// Mock out libs used by a few componets to avoid loading in kibana_legacy and platform
- new webpack.NormalModuleReplacementPlugin(/lib\/notify/, path.resolve(__dirname, '../tasks/mocks/uiNotify')),
+ new webpack.NormalModuleReplacementPlugin(/(lib)?\/notify/, path.resolve(__dirname, '../tasks/mocks/uiNotify')),
new webpack.NormalModuleReplacementPlugin(/lib\/download_workpad/, path.resolve(__dirname, '../tasks/mocks/downloadWorkpad')),
+ new webpack.NormalModuleReplacementPlugin(/(lib)?\/custom_element_service/, path.resolve(__dirname, '../tasks/mocks/customElementService')),
+ new webpack.NormalModuleReplacementPlugin(/(lib)?\/ui_metric/, path.resolve(__dirname, '../tasks/mocks/uiMetric')),
);
// Tell Webpack about relevant extensions
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/area_chart/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/area_chart/header.png
deleted file mode 100644
index 93456066429d9..0000000000000
Binary files a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/area_chart/header.png and /dev/null differ
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/area_chart/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/area_chart/index.ts
index 0650ac15c656e..df829e8b97676 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/area_chart/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/area_chart/index.ts
@@ -5,14 +5,13 @@
*/
import { ElementFactory } from '../../../types';
-import header from './header.png';
export const areaChart: ElementFactory = () => ({
name: 'areaChart',
- displayName: 'Area chart',
+ displayName: 'Area',
help: 'A line chart with a filled body',
- tags: ['chart'],
- image: header,
+ type: 'chart',
+ icon: 'visArea',
expression: `filters
| demodata
| pointseries x="time" y="mean(price)"
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/bubble_chart/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/bubble_chart/header.png
deleted file mode 100644
index db541fe7c53b8..0000000000000
Binary files a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/bubble_chart/header.png and /dev/null differ
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.ts
index 7ab510e419769..7ac1d0ac83b0b 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.ts
@@ -5,16 +5,15 @@
*/
import { ElementFactory } from '../../../types';
-import header from './header.png';
export const bubbleChart: ElementFactory = () => ({
name: 'bubbleChart',
- displayName: 'Bubble chart',
- tags: ['chart'],
+ displayName: 'Bubble',
+ type: 'chart',
help: 'A customizable bubble chart',
width: 700,
height: 300,
- image: header,
+ icon: 'heatmap',
expression: `filters
| demodata
| pointseries x="project" y="sum(price)" color="state" size="size(username)"
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/debug/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/debug/header.png
deleted file mode 100644
index 37ab329a49bb8..0000000000000
Binary files a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/debug/header.png and /dev/null differ
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/debug/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/debug/index.ts
index 914982951d664..ec8477f8f1017 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/debug/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/debug/index.ts
@@ -5,14 +5,12 @@
*/
import { ElementFactory } from '../../../types';
-import header from './header.png';
export const debug: ElementFactory = () => ({
name: 'debug',
- displayName: 'Debug',
- tags: ['text'],
+ displayName: 'Debug data',
help: 'Just dumps the configuration of the element',
- image: header,
+ icon: 'bug',
expression: `demodata
| render as=debug`,
});
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/donut/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/donut/header.png
deleted file mode 100644
index 4bbfb6f8f68fc..0000000000000
Binary files a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/donut/header.png and /dev/null differ
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/donut/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/donut/index.ts
deleted file mode 100644
index 4ea8037d2073e..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/donut/index.ts
+++ /dev/null
@@ -1,21 +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 { ElementFactory } from '../../../types';
-import header from './header.png';
-
-export const donut: ElementFactory = () => ({
- name: 'donut',
- displayName: 'Donut chart',
- tags: ['chart', 'proportion'],
- help: 'A customizable donut chart',
- image: header,
- expression: `filters
-| demodata
-| pointseries color="project" size="max(price)"
-| pie hole=50 labels=false legend="ne"
-| render`,
-});
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/header.png
deleted file mode 100644
index 727b4d23941fd..0000000000000
Binary files a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/header.png and /dev/null differ
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.ts
index bde223d2a606e..bb1c13ca618be 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.ts
@@ -5,14 +5,13 @@
*/
import { ElementFactory } from '../../../types';
-import header from './header.png';
export const dropdownFilter: ElementFactory = () => ({
- name: 'dropdown_filter',
- displayName: 'Dropdown filter',
- tags: ['filter'],
+ name: 'dropdownFilter',
+ displayName: 'Dropdown select',
+ type: 'filter',
help: 'A dropdown from which you can select values for an "exactly" filter',
- image: header,
+ icon: 'filter',
height: 50,
expression: `demodata
| dropdownControl valueColumn=project filterColumn=project | render`,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/filter_debug/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/filter_debug/index.ts
new file mode 100644
index 0000000000000..35a4a75f49c4e
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/filter_debug/index.ts
@@ -0,0 +1,16 @@
+/*
+ * 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 { ElementFactory } from '../../../types';
+
+export const filterDebug: ElementFactory = () => ({
+ name: 'filterDebug',
+ displayName: 'Debug filter',
+ help: 'Shows the underlying global filters in a workpad',
+ icon: 'bug',
+ expression: `filters
+| render as=debug`,
+});
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/header.png
deleted file mode 100644
index 9b6ee47d88698..0000000000000
Binary files a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/header.png and /dev/null differ
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/index.ts
index 7fddf48c70385..9567336decd5d 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/index.ts
@@ -5,14 +5,13 @@
*/
import { ElementFactory } from '../../../types';
-import header from './header.png';
export const horizontalBarChart: ElementFactory = () => ({
name: 'horizontalBarChart',
- displayName: 'Horizontal bar chart',
- tags: ['chart'],
+ displayName: 'Bar horizontal',
+ type: 'chart',
help: 'A customizable horizontal bar chart',
- image: header,
+ icon: 'visBarHorizontal',
expression: `filters
| demodata
| pointseries x="size(cost)" y="project" color="project"
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/header.png
deleted file mode 100644
index f28ad4a3ce4be..0000000000000
Binary files a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/header.png and /dev/null differ
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.ts
index f4a50a007c5de..529a74893a5de 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.ts
@@ -6,16 +6,14 @@
import { openSans } from '../../../common/lib/fonts';
import { ElementFactory } from '../../../types';
-import header from './header.png';
export const horizontalProgressBar: ElementFactory = () => ({
name: 'horizontalProgressBar',
- displayName: 'Horizontal progress bar',
- tags: ['chart', 'proportion'],
+ displayName: 'Horizontal bar',
+ type: 'progress',
help: 'Displays progress as a portion of a horizontal bar',
width: 400,
height: 30,
- image: header,
expression: `filters
| demodata
| math "mean(percent_uptime)"
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/header.png
deleted file mode 100644
index 2eaeb2e976a78..0000000000000
Binary files a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/header.png and /dev/null differ
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.ts
index 9b3aea2e55324..d5eba32325d1a 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.ts
@@ -6,16 +6,14 @@
import { openSans } from '../../../common/lib/fonts';
import { ElementFactory } from '../../../types';
-import header from './header.png';
export const horizontalProgressPill: ElementFactory = () => ({
name: 'horizontalProgressPill',
- displayName: 'Horizontal progress pill',
- tags: ['chart', 'proportion'],
+ displayName: 'Horizontal pill',
+ type: 'progress',
help: 'Displays progress as a portion of a horizontal pill',
width: 400,
height: 30,
- image: header,
expression: `filters
| demodata
| math "mean(percent_uptime)"
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/image/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/image/header.png
deleted file mode 100644
index 7f29fc64c36b9..0000000000000
Binary files a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/image/header.png and /dev/null differ
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/image/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/image/index.ts
index eec1e2af61aad..ed7f6a99ddc32 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/image/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/image/index.ts
@@ -5,14 +5,13 @@
*/
import { ElementFactory } from '../../../types';
-import header from './header.png';
export const image: ElementFactory = () => ({
name: 'image',
displayName: 'Image',
- tags: ['graphic'],
+ type: 'image',
help: 'A static image',
- image: header,
+ icon: 'image',
expression: `image dataurl=null mode="contain"
| render`,
});
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/index.ts
index feba88dbe8b90..ec3b8a7798be1 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/index.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/index.ts
@@ -8,15 +8,15 @@ import { applyElementStrings } from '../../i18n/elements';
import { areaChart } from './area_chart';
import { bubbleChart } from './bubble_chart';
import { debug } from './debug';
-import { donut } from './donut';
import { dropdownFilter } from './dropdown_filter';
+import { filterDebug } from './filter_debug';
import { horizontalBarChart } from './horizontal_bar_chart';
import { horizontalProgressBar } from './horizontal_progress_bar';
import { horizontalProgressPill } from './horizontal_progress_pill';
import { image } from './image';
import { lineChart } from './line_chart';
import { markdown } from './markdown';
-import { metric } from './metric';
+import { metricElementInitializer } from './metric';
import { pie } from './pie';
import { plot } from './plot';
import { progressGauge } from './progress_gauge';
@@ -26,25 +26,26 @@ import { repeatImage } from './repeat_image';
import { revealImage } from './reveal_image';
import { shape } from './shape';
import { table } from './table';
-import { tiltedPie } from './tilted_pie';
import { timeFilter } from './time_filter';
import { verticalBarChart } from './vert_bar_chart';
import { verticalProgressBar } from './vertical_progress_bar';
import { verticalProgressPill } from './vertical_progress_pill';
-export const elementSpecs = applyElementStrings([
+import { SetupInitializer } from '../plugin';
+import { ElementFactory } from '../../types';
+
+const elementSpecs = [
areaChart,
bubbleChart,
debug,
- donut,
dropdownFilter,
+ filterDebug,
image,
horizontalBarChart,
horizontalProgressBar,
horizontalProgressPill,
lineChart,
markdown,
- metric,
pie,
plot,
progressGauge,
@@ -54,9 +55,19 @@ export const elementSpecs = applyElementStrings([
revealImage,
shape,
table,
- tiltedPie,
timeFilter,
verticalBarChart,
verticalProgressBar,
verticalProgressPill,
-]);
+];
+
+const initializeElementFactories = [metricElementInitializer];
+
+export const initializeElements: SetupInitializer
+
,
+ ,
+]
+`;
+
+exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
+Array [
+ ,
+ ,
+
+
+
+
+
+
+
+
+ Manage workpad assets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Select or drag and drop images
+
+
+
+
+
+
+
+
+
+
+ + Below are the image assets in this workpad. Any assets that are currently in use cannot be determined at this time. To reclaim space, delete assets. +
+
+
+
+
+
+
+
+ + Import your assets to get started +
+ + +
+
+
+
+
+
+
+
+
+
+
+ 0% space used
+
+
+
,
+ ,
+]
+`;
diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.examples.tsx b/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.stories.tsx
similarity index 97%
rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.examples.tsx
rename to x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.stories.tsx
index 045a3b4f64a44..cb42823ccab7b 100644
--- a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.examples.tsx
+++ b/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.stories.tsx
@@ -28,12 +28,12 @@ const MARKER: AssetType = {
storiesOf('components/Assets/AssetManager', module)
.add('no assets', () => (
- // @ts-ignore @types/react has not been updated to support defaultProps yet.
+
+
+
+
+
+
+
+ Manage workpad assets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Select or drag and drop images
+
+
+
+
+
+
+
+
+
+
+ + Below are the image assets in this workpad. Any assets that are currently in use cannot be determined at this time. To reclaim space, delete assets. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ airplane
+
+
+
+
+ (
+ 1
+ kb)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ marker
+
+
+
+
+ (
+ 1
+ kb)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0% space used
+
+
-
-
-`;
-
-exports[`Storyshots components/Elements/ElementGrid with controls and filter 1`] = `
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
- - sample description -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Aenean eu justo auctor, placerat felis non, scelerisque dolor. -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce lobortis aliquet arcu ut turpis duis. -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`Storyshots components/Elements/ElementGrid with tags filter 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce lobortis aliquet arcu ut turpis duis. -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`Storyshots components/Elements/ElementGrid with text filter 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - A static image -
-
-
-
-
- graphic
-
-
-
-
-
-
-`;
-
-exports[`Storyshots components/Elements/ElementGrid without controls 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - A scrollable grid for displaying data in a tabular format -
-
-
-
-
- text
-
-
-
-
-
-
-`;
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_types/element_grid.tsx b/x-pack/legacy/plugins/canvas/public/components/element_types/element_grid.tsx
deleted file mode 100644
index 852b987fcfd24..0000000000000
--- a/x-pack/legacy/plugins/canvas/public/components/element_types/element_grid.tsx
+++ /dev/null
@@ -1,110 +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 from 'react';
-import PropTypes from 'prop-types';
-import { map } from 'lodash';
-import { EuiFlexItem, EuiFlexGrid } from '@elastic/eui';
-import { ElementControls } from './element_controls';
-import { CustomElement, ElementSpec } from '../../../types';
-import { ElementCard } from '../element_card';
-
-export interface Props {
- /**
- * list of elements to generate cards for
- */
- elements: Array
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - A line chart with a filled body -
-
-
-
-
- chart
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - A static image -
-
-
-
-
- graphic
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - A scrollable grid for displaying data in a tabular format -
-
-
-
-
- text
-
-
-
-
- {strings.getAddNewElementDescription()}
} - titleSize="s" - /> - ); - - if (customElements.length) { - customElements = this._sortElements(customElements); - customElementContent = ( -
-
- ),
- },
- {
- id: 'customElements',
- name: strings.getMyElementsTitle(),
- content: (
-
+
+`;
+
+exports[`Storyshots components/SavedElementsModal/ElementGrid with text filter 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + sample description +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Aenean eu justo auctor, placerat felis non, scelerisque dolor. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce lobortis aliquet arcu ut turpis duis. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/saved_elements_modal.stories.storyshot b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/saved_elements_modal.stories.storyshot
new file mode 100644
index 0000000000000..c73309ad8b14c
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/saved_elements_modal.stories.storyshot
@@ -0,0 +1,933 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots components/SavedElementsModal no custom elements 1`] = `
+Array [
+ ,
+ ,
+
+
,
+ ,
+]
+`;
+
+exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
+Array [
+ ,
+ ,
+
+
+
+
+
+
+
+
+ My elements
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Add new elements +
+ +
+
+
+ + Group and save workpad elements to create new elements +
+
+
+
+
+
,
+ ,
+]
+`;
+
+exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
+Array [
+ ,
+ ,
+
+
+
+
+
+
+
+
+ My elements
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + sample description +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Aenean eu justo auctor, placerat felis non, scelerisque dolor. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce lobortis aliquet arcu ut turpis duis. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
,
+ ,
+]
+`;
diff --git a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/element_controls.stories.tsx b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/element_controls.stories.tsx
similarity index 90%
rename from x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/element_controls.stories.tsx
rename to x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/element_controls.stories.tsx
index 52736ac952e53..5210210ebaa74 100644
--- a/x-pack/legacy/plugins/canvas/public/components/element_types/__examples__/element_controls.stories.tsx
+++ b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/element_controls.stories.tsx
@@ -9,7 +9,7 @@ import { storiesOf } from '@storybook/react';
import { action } from '@storybook/addon-actions';
import { ElementControls } from '../element_controls';
-storiesOf('components/Elements/ElementControls', module)
+storiesOf('components/SavedElementsModal/ElementControls', module)
.addDecorator(story => (
+
+
+
+
+
+
+
+ My elements
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Aenean eu justo auctor, placerat felis non, scelerisque dolor. +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ (
))
- .add('without controls', () => (
- = ({ onDelete, onEdit })
>
-
@@ -40,6 +45,7 @@ export const ElementControls: FunctionComponent = ({ onDelete, onEdit })
iconType="trash"
aria-label={strings.getDeleteAriaLabel()}
onClick={onDelete}
+ data-test-subj="canvasElementCard__deleteButton"
/>
diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/element_grid.tsx b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/element_grid.tsx
new file mode 100644
index 0000000000000..f86e2c0147035
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/element_grid.tsx
@@ -0,0 +1,81 @@
+/*
+ * 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 from 'react';
+import PropTypes from 'prop-types';
+import { map } from 'lodash';
+import { EuiFlexItem, EuiFlexGrid } from '@elastic/eui';
+import { ElementControls } from './element_controls';
+import { CustomElement } from '../../../types';
+import { ElementCard } from '../element_card';
+
+export interface Props {
+ /**
+ * list of elements to generate cards for
+ */
+ elements: CustomElement[];
+ /**
+ * text to filter out cards
+ */
+ filterText: string;
+ /**
+ * handler invoked when clicking a card
+ */
+ onClick: (element: CustomElement) => void;
+ /**
+ * click handler for the edit button
+ */
+ onEdit: (element: CustomElement) => void;
+ /**
+ * click handler for the delete button
+ */
+ onDelete: (element: CustomElement) => void;
+}
+
+export const ElementGrid = ({ elements, filterText, onClick, onEdit, onDelete }: Props) => {
+ filterText = filterText.toLowerCase();
+
+ return (
+
+ {map(elements, (element: CustomElement, index) => {
+ const { name, displayName = '', help = '', image } = element;
+ const whenClicked = () => onClick(element);
+
+ if (
+ filterText.length &&
+ !name.toLowerCase().includes(filterText) &&
+ !displayName.toLowerCase().includes(filterText) &&
+ !help.toLowerCase().includes(filterText)
+ ) {
+ return null;
+ }
+
+ return (
+
+ onEdit(element)} onDelete={() => onDelete(element)} />
+
+ );
+ })}
+
+ );
+};
+
+ElementGrid.propTypes = {
+ elements: PropTypes.array.isRequired,
+ filterText: PropTypes.string.isRequired,
+ onClick: PropTypes.func.isRequired,
+ onEdit: PropTypes.func.isRequired,
+ onDelete: PropTypes.func.isRequired,
+};
+
+ElementGrid.defaultProps = {
+ filterText: '',
+};
diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/index.ts b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/index.ts
new file mode 100644
index 0000000000000..60d1d7462daa9
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/index.ts
@@ -0,0 +1,135 @@
+/*
+ * 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 { connect } from 'react-redux';
+import { Dispatch } from 'redux';
+import { compose, withState } from 'recompose';
+import { camelCase } from 'lodash';
+// @ts-ignore Untyped local
+import { cloneSubgraphs } from '../../lib/clone_subgraphs';
+import * as customElementService from '../../lib/custom_element_service';
+import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { WithKibanaProps } from '../../';
+// @ts-ignore Untyped local
+import { selectToplevelNodes } from '../../state/actions/transient';
+// @ts-ignore Untyped local
+import { insertNodes } from '../../state/actions/elements';
+import { getSelectedPage } from '../../state/selectors/workpad';
+import { trackCanvasUiMetric, METRIC_TYPE } from '../../lib/ui_metric';
+import { SavedElementsModal as Component, Props as ComponentProps } from './saved_elements_modal';
+import { State, PositionedElement, CustomElement } from '../../../types';
+
+const customElementAdded = 'elements-custom-added';
+
+interface OwnProps {
+ onClose: () => void;
+}
+
+interface OwnPropsWithState extends OwnProps {
+ customElements: CustomElement[];
+ setCustomElements: (customElements: CustomElement[]) => void;
+ search: string;
+ setSearch: (search: string) => void;
+}
+
+interface DispatchProps {
+ selectToplevelNodes: (nodes: PositionedElement[]) => void;
+ insertNodes: (selectedNodes: PositionedElement[], pageId: string) => void;
+}
+
+interface StateProps {
+ pageId: string;
+}
+
+const mapStateToProps = (state: State): StateProps => ({
+ pageId: getSelectedPage(state),
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({
+ selectToplevelNodes: (nodes: PositionedElement[]) =>
+ dispatch(
+ selectToplevelNodes(
+ nodes
+ .filter((e: PositionedElement): boolean => !e.position.parent)
+ .map((e: PositionedElement): string => e.id)
+ )
+ ),
+ insertNodes: (selectedNodes: PositionedElement[], pageId: string) =>
+ dispatch(insertNodes(selectedNodes, pageId)),
+});
+
+const mergeProps = (
+ stateProps: StateProps,
+ dispatchProps: DispatchProps,
+ ownProps: OwnPropsWithState & WithKibanaProps
+): ComponentProps => {
+ const { pageId } = stateProps;
+ const { onClose, search, setCustomElements } = ownProps;
+
+ const findCustomElements = async () => {
+ const { customElements } = await customElementService.find(search);
+ setCustomElements(customElements);
+ };
+
+ return {
+ ...ownProps,
+ // add custom element to the page
+ addCustomElement: (customElement: CustomElement) => {
+ const { selectedNodes = [] } = JSON.parse(customElement.content) || {};
+ const clonedNodes = selectedNodes && cloneSubgraphs(selectedNodes);
+ if (clonedNodes) {
+ dispatchProps.insertNodes(clonedNodes, pageId); // first clone and persist the new node(s)
+ dispatchProps.selectToplevelNodes(clonedNodes); // then select the cloned node(s)
+ }
+ onClose();
+ trackCanvasUiMetric(METRIC_TYPE.LOADED, customElementAdded);
+ },
+ // custom element search
+ findCustomElements: async (text?: string) => {
+ try {
+ await findCustomElements();
+ } catch (err) {
+ ownProps.kibana.services.canvas.notify.error(err, {
+ title: `Couldn't find custom elements`,
+ });
+ }
+ },
+ // remove custom element
+ removeCustomElement: async (id: string) => {
+ try {
+ await customElementService.remove(id);
+ await findCustomElements();
+ } catch (err) {
+ ownProps.kibana.services.canvas.notify.error(err, {
+ title: `Couldn't delete custom elements`,
+ });
+ }
+ },
+ // update custom element
+ updateCustomElement: async (id: string, name: string, description: string, image: string) => {
+ try {
+ await customElementService.update(id, {
+ name: camelCase(name),
+ displayName: name,
+ image,
+ help: description,
+ });
+ await findCustomElements();
+ } catch (err) {
+ ownProps.kibana.services.canvas.notify.error(err, {
+ title: `Couldn't update custom elements`,
+ });
+ }
+ },
+ };
+};
+
+export const SavedElementsModal = compose(
+ withKibana,
+ withState('search', 'setSearch', ''),
+ withState('customElements', 'setCustomElements', []),
+ connect(mapStateToProps, mapDispatchToProps, mergeProps)
+)(Component);
diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx
new file mode 100644
index 0000000000000..dba97a15fee5c
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx
@@ -0,0 +1,217 @@
+/*
+ * 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, { Fragment, ChangeEvent, FunctionComponent, useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import {
+ EuiModal,
+ EuiModalBody,
+ EuiModalFooter,
+ EuiModalHeader,
+ EuiModalHeaderTitle,
+ EuiEmptyPrompt,
+ EuiFieldSearch,
+ EuiSpacer,
+ EuiOverlayMask,
+ EuiButton,
+} from '@elastic/eui';
+import { map, sortBy } from 'lodash';
+import { ComponentStrings } from '../../../i18n';
+import { CustomElement } from '../../../types';
+import { ConfirmModal } from '../confirm_modal/confirm_modal';
+import { CustomElementModal } from '../custom_element_modal';
+import { ElementGrid } from './element_grid';
+
+const { SavedElementsModal: strings } = ComponentStrings;
+
+export interface Props {
+ /**
+ * Adds the custom element to the workpad
+ */
+ addCustomElement: (customElement: CustomElement) => void;
+ /**
+ * Queries ES for custom element saved objects
+ */
+ findCustomElements: () => void;
+ /**
+ * Handler invoked when the modal closes
+ */
+ onClose: () => void;
+ /**
+ * Deletes the custom element
+ */
+ removeCustomElement: (id: string) => void;
+ /**
+ * Saved edits to the custom element
+ */
+ updateCustomElement: (id: string, name: string, description: string, image: string) => void;
+ /**
+ * Array of custom elements to display
+ */
+ customElements: CustomElement[];
+ /**
+ * Text used to filter custom elements list
+ */
+ search: string;
+ /**
+ * Setter for search text
+ */
+ setSearch: (search: string) => void;
+}
+
+export const SavedElementsModal: FunctionComponent = ({
+ search,
+ setSearch,
+ customElements,
+ addCustomElement,
+ findCustomElements,
+ onClose,
+ removeCustomElement,
+ updateCustomElement,
+}) => {
+ const [elementToDelete, setElementToDelete] = useState(null);
+ const [elementToEdit, setElementToEdit] = useState(null);
+
+ useEffect(() => {
+ findCustomElements();
+ });
+
+ const showEditModal = (element: CustomElement) => setElementToEdit(element);
+ const hideEditModal = () => setElementToEdit(null);
+
+ const handleEdit = async (name: string, description: string, image: string) => {
+ if (elementToEdit) {
+ await updateCustomElement(elementToEdit.id, name, description, image);
+ }
+ hideEditModal();
+ };
+
+ const showDeleteModal = (element: CustomElement) => setElementToDelete(element);
+ const hideDeleteModal = () => setElementToDelete(null);
+
+ const handleDelete = async () => {
+ if (elementToDelete) {
+ await removeCustomElement(elementToDelete.id);
+ }
+ hideDeleteModal();
+ };
+
+ const renderEditModal = () => {
+ if (!elementToEdit) {
+ return null;
+ }
+
+ return (
+
+
+ );
+ };
+
+ const renderDeleteModal = () => {
+ if (!elementToDelete) {
+ return null;
+ }
+
+ return (
+ ) => setSearch(e.target.value);
+
+ let customElementContent = (
+ {strings.getAddNewElementTitle()}}
+ body={
+
+
+
+
+ {strings.getModalTitle()}
+
+
+
+
+
+
+
+ {strings.getSavedElementsModalCloseButtonLabel()}
+
+
+
+
+
+ {renderDeleteModal()}
+ {renderEditModal()}
+
+ );
+};
+
+SavedElementsModal.propTypes = {
+ addCustomElement: PropTypes.func.isRequired,
+ findCustomElements: PropTypes.func.isRequired,
+ onClose: PropTypes.func.isRequired,
+ removeCustomElement: PropTypes.func.isRequired,
+ updateCustomElement: PropTypes.func.isRequired,
+};
diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.stories.storyshot b/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.stories.storyshot
index d46a509251d35..ac25cbe0b6832 100644
--- a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.stories.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.stories.storyshot
@@ -37,6 +37,7 @@ exports[`Storyshots components/Sidebar/SidebarHeader default 1`] = `
{strings.getAddNewElementDescription()}
} + titleSize="s" + /> + ); + + if (customElements.length) { + customElementContent = ( +