- {this.state.isFullScreenMode && (
+ {isFullScreenMode && (
@@ -103,4 +133,13 @@ export class DashboardViewport extends React.Component
);
}
+
+ public render() {
+ return (
+
+ {this.state.isEmptyState ? this.renderEmptyScreen() : null}
+ {this.renderContainerScreen()}
+
+ );
+ }
}
diff --git a/src/plugins/dashboard_embeddable_container/public/plugin.tsx b/src/plugins/dashboard_embeddable_container/public/plugin.tsx
index 79cc9b6980545e..d18fbba239ec08 100644
--- a/src/plugins/dashboard_embeddable_container/public/plugin.tsx
+++ b/src/plugins/dashboard_embeddable_container/public/plugin.tsx
@@ -27,7 +27,7 @@ import { ExpandPanelAction, ReplacePanelAction } from '.';
import { DashboardContainerFactory } from './embeddable/dashboard_container_factory';
import { Start as InspectorStartContract } from '../../../plugins/inspector/public';
import {
- SavedObjectFinder as SavedObjectFinderUi,
+ SavedObjectFinderUi,
SavedObjectFinderProps,
ExitFullScreenButton as ExitFullScreenButtonUi,
ExitFullScreenButtonProps,
diff --git a/src/plugins/data/common/es_query/__fixtures__/index_pattern_response.ts b/src/plugins/data/common/es_query/__fixtures__/index_pattern_response.ts
new file mode 100644
index 00000000000000..1784a2650a95a9
--- /dev/null
+++ b/src/plugins/data/common/es_query/__fixtures__/index_pattern_response.ts
@@ -0,0 +1,322 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const indexPatternResponse = {
+ id: 'logstash-*',
+ title: 'logstash-*',
+ fields: [
+ {
+ name: 'bytes',
+ type: 'number',
+ esTypes: ['long'],
+ count: 10,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'ssl',
+ type: 'boolean',
+ esTypes: ['boolean'],
+ count: 20,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: '@timestamp',
+ type: 'date',
+ esTypes: ['date'],
+ count: 30,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'time',
+ type: 'date',
+ esTypes: ['date'],
+ count: 30,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: '@tags',
+ type: 'string',
+ esTypes: ['keyword'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'utc_time',
+ type: 'date',
+ esTypes: ['date'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'phpmemory',
+ type: 'number',
+ esTypes: ['integer'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'ip',
+ type: 'ip',
+ esTypes: ['ip'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'request_body',
+ type: 'attachment',
+ esTypes: ['attachment'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'point',
+ type: 'geo_point',
+ esTypes: ['geo_point'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'area',
+ type: 'geo_shape',
+ esTypes: ['geo_shape'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'hashed',
+ type: 'murmur3',
+ esTypes: ['murmur3'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: false,
+ readFromDocValues: false,
+ },
+ {
+ name: 'geo.coordinates',
+ type: 'geo_point',
+ esTypes: ['geo_point'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'extension',
+ type: 'string',
+ esTypes: ['keyword'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'machine.os',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'machine.os.raw',
+ type: 'string',
+ esTypes: ['keyword'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ subType: { multi: { parent: 'machine.os' } },
+ },
+ {
+ name: 'geo.src',
+ type: 'string',
+ esTypes: ['keyword'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: '_id',
+ type: 'string',
+ esTypes: ['_id'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: '_type',
+ type: 'string',
+ esTypes: ['_type'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: '_source',
+ type: '_source',
+ esTypes: ['_source'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'non-filterable',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: false,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'non-sortable',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: false,
+ aggregatable: false,
+ readFromDocValues: false,
+ },
+ {
+ name: 'custom_user_field',
+ type: 'conflict',
+ esTypes: ['long', 'text'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: true,
+ },
+ {
+ name: 'script string',
+ type: 'string',
+ count: 0,
+ scripted: true,
+ script: "'i am a string'",
+ lang: 'expression',
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'script number',
+ type: 'number',
+ count: 0,
+ scripted: true,
+ script: '1234',
+ lang: 'expression',
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'script date',
+ type: 'date',
+ count: 0,
+ scripted: true,
+ script: '1234',
+ lang: 'painless',
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'script murmur3',
+ type: 'murmur3',
+ count: 0,
+ scripted: true,
+ script: '1234',
+ lang: 'expression',
+ searchable: true,
+ aggregatable: true,
+ readFromDocValues: false,
+ },
+ {
+ name: 'nestedField.child',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: false,
+ readFromDocValues: false,
+ subType: { nested: { path: 'nestedField' } },
+ },
+ {
+ name: 'nestedField.nestedChild.doublyNestedChild',
+ type: 'string',
+ esTypes: ['text'],
+ count: 0,
+ scripted: false,
+ searchable: true,
+ aggregatable: false,
+ readFromDocValues: false,
+ subType: { nested: { path: 'nestedField.nestedChild' } },
+ },
+ ],
+};
diff --git a/src/plugins/data/common/es_query/es_query/from_filters.test.ts b/src/plugins/data/common/es_query/es_query/from_filters.test.ts
index 8c1d990c389b8f..a93a91a42dbf38 100644
--- a/src/plugins/data/common/es_query/es_query/from_filters.test.ts
+++ b/src/plugins/data/common/es_query/es_query/from_filters.test.ts
@@ -144,5 +144,30 @@ describe('build query', () => {
expect(result.filter).toEqual(expectedESQueries);
});
+
+ test('should wrap filters targeting nested fields in a nested query', () => {
+ const filters = [
+ {
+ exists: { field: 'nestedField.child' },
+ meta: { type: 'exists', alias: '', disabled: false, negate: false },
+ },
+ ];
+
+ const expectedESQueries = [
+ {
+ nested: {
+ path: 'nestedField',
+ query: {
+ exists: {
+ field: 'nestedField.child',
+ },
+ },
+ },
+ },
+ ];
+
+ const result = buildQueryFromFilters(filters, indexPattern);
+ expect(result.filter).toEqual(expectedESQueries);
+ });
});
});
diff --git a/src/plugins/data/common/es_query/es_query/from_filters.ts b/src/plugins/data/common/es_query/es_query/from_filters.ts
index e33040485bf47d..ed91d391fc1fda 100644
--- a/src/plugins/data/common/es_query/es_query/from_filters.ts
+++ b/src/plugins/data/common/es_query/es_query/from_filters.ts
@@ -21,6 +21,7 @@ import { migrateFilter } from './migrate_filter';
import { filterMatchesIndex } from './filter_matches_index';
import { Filter, cleanFilter, isFilterDisabled } from '../filters';
import { IIndexPattern } from '../../index_patterns';
+import { handleNestedFilter } from './handle_nested_filter';
/**
* Create a filter that can be reversed for filters with negate set
@@ -59,20 +60,22 @@ export const buildQueryFromFilters = (
) => {
filters = filters.filter(filter => filter && !isFilterDisabled(filter));
- return {
- must: [],
- filter: filters
- .filter(filterNegate(false))
+ const filtersToESQueries = (negate: boolean) => {
+ return filters
+ .filter(filterNegate(negate))
.filter(filter => !ignoreFilterIfFieldNotInIndex || filterMatchesIndex(filter, indexPattern))
+ .map(filter => {
+ return migrateFilter(filter, indexPattern);
+ })
+ .map(filter => handleNestedFilter(filter, indexPattern))
.map(translateToQuery)
- .map(cleanFilter)
- .map(filter => migrateFilter(filter, indexPattern)),
+ .map(cleanFilter);
+ };
+
+ return {
+ must: [],
+ filter: filtersToESQueries(false),
should: [],
- must_not: filters
- .filter(filterNegate(true))
- .filter(filter => !ignoreFilterIfFieldNotInIndex || filterMatchesIndex(filter, indexPattern))
- .map(translateToQuery)
- .map(cleanFilter)
- .map(filter => migrateFilter(filter, indexPattern)),
+ must_not: filtersToESQueries(true),
};
};
diff --git a/src/plugins/data/common/es_query/es_query/handle_nested_filter.test.ts b/src/plugins/data/common/es_query/es_query/handle_nested_filter.test.ts
new file mode 100644
index 00000000000000..594b2641c39be7
--- /dev/null
+++ b/src/plugins/data/common/es_query/es_query/handle_nested_filter.test.ts
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { handleNestedFilter } from './handle_nested_filter';
+import { fields } from '../../index_patterns/mocks';
+import { buildPhraseFilter, buildQueryFilter } from '../filters';
+import { IFieldType, IIndexPattern } from '../../index_patterns';
+
+describe('handleNestedFilter', function() {
+ const indexPattern: IIndexPattern = ({
+ id: 'logstash-*',
+ fields,
+ } as unknown) as IIndexPattern;
+
+ it("should return the filter's query wrapped in nested query if the target field is nested", () => {
+ const field = getField('nestedField.child');
+ const filter = buildPhraseFilter(field!, 'foo', indexPattern);
+ const result = handleNestedFilter(filter, indexPattern);
+ expect(result).toEqual({
+ meta: {
+ index: 'logstash-*',
+ },
+ nested: {
+ path: 'nestedField',
+ query: {
+ match_phrase: {
+ 'nestedField.child': 'foo',
+ },
+ },
+ },
+ });
+ });
+
+ it('should return filter untouched if it does not target a nested field', () => {
+ const field = getField('extension');
+ const filter = buildPhraseFilter(field!, 'jpg', indexPattern);
+ const result = handleNestedFilter(filter, indexPattern);
+ expect(result).toBe(filter);
+ });
+
+ it('should return filter untouched if it does not target a field from the given index pattern', () => {
+ const field = { ...getField('extension'), name: 'notarealfield' };
+ const filter = buildPhraseFilter(field as IFieldType, 'jpg', indexPattern);
+ const result = handleNestedFilter(filter, indexPattern);
+ expect(result).toBe(filter);
+ });
+
+ it('should return filter untouched if no index pattern is provided', () => {
+ const field = getField('extension');
+ const filter = buildPhraseFilter(field!, 'jpg', indexPattern);
+ const result = handleNestedFilter(filter);
+ expect(result).toBe(filter);
+ });
+
+ it('should return the filter untouched if a target field cannot be determined', () => {
+ // for example, we don't support query_string queries
+ const filter = buildQueryFilter(
+ {
+ query: {
+ query_string: {
+ query: 'response:200',
+ },
+ },
+ },
+ 'logstash-*',
+ 'foo'
+ );
+ const result = handleNestedFilter(filter);
+ expect(result).toBe(filter);
+ });
+
+ function getField(name: string) {
+ return indexPattern.fields.find(field => field.name === name);
+ }
+});
diff --git a/src/plugins/data/common/es_query/es_query/handle_nested_filter.ts b/src/plugins/data/common/es_query/es_query/handle_nested_filter.ts
new file mode 100644
index 00000000000000..27be7925fe00cc
--- /dev/null
+++ b/src/plugins/data/common/es_query/es_query/handle_nested_filter.ts
@@ -0,0 +1,45 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getFilterField, cleanFilter, Filter } from '../filters';
+import { IIndexPattern } from '../../index_patterns';
+
+export const handleNestedFilter = (filter: Filter, indexPattern?: IIndexPattern) => {
+ if (!indexPattern) return filter;
+
+ const fieldName = getFilterField(filter);
+ if (!fieldName) {
+ return filter;
+ }
+
+ const field = indexPattern.fields.find(indexPatternField => indexPatternField.name === fieldName);
+ if (!field || !field.subType || !field.subType.nested || !field.subType.nested.path) {
+ return filter;
+ }
+
+ const query = cleanFilter(filter);
+
+ return {
+ meta: filter.meta,
+ nested: {
+ path: field.subType.nested.path,
+ query: query.query || query,
+ },
+ };
+};
diff --git a/src/plugins/data/common/es_query/es_query/migrate_filter.test.ts b/src/plugins/data/common/es_query/es_query/migrate_filter.test.ts
index e01240da87543b..698d7bb48e685d 100644
--- a/src/plugins/data/common/es_query/es_query/migrate_filter.test.ts
+++ b/src/plugins/data/common/es_query/es_query/migrate_filter.test.ts
@@ -23,26 +23,32 @@ import { PhraseFilter, MatchAllFilter } from '../filters';
describe('migrateFilter', function() {
const oldMatchPhraseFilter = ({
- match: {
- fieldFoo: {
- query: 'foobar',
- type: 'phrase',
+ query: {
+ match: {
+ fieldFoo: {
+ query: 'foobar',
+ type: 'phrase',
+ },
},
},
+ meta: {},
} as unknown) as DeprecatedMatchPhraseFilter;
const newMatchPhraseFilter = ({
- match_phrase: {
- fieldFoo: {
- query: 'foobar',
+ query: {
+ match_phrase: {
+ fieldFoo: {
+ query: 'foobar',
+ },
},
},
+ meta: {},
} as unknown) as PhraseFilter;
it('should migrate match filters of type phrase', function() {
const migratedFilter = migrateFilter(oldMatchPhraseFilter, undefined);
- expect(isEqual(migratedFilter, newMatchPhraseFilter)).toBe(true);
+ expect(migratedFilter).toEqual(newMatchPhraseFilter);
});
it('should not modify the original filter', function() {
diff --git a/src/plugins/data/common/es_query/es_query/migrate_filter.ts b/src/plugins/data/common/es_query/es_query/migrate_filter.ts
index fdc40768ebe41c..22fbfe0e1ab083 100644
--- a/src/plugins/data/common/es_query/es_query/migrate_filter.ts
+++ b/src/plugins/data/common/es_query/es_query/migrate_filter.ts
@@ -22,31 +22,27 @@ import { getConvertedValueForField } from '../filters';
import { Filter } from '../filters';
import { IIndexPattern } from '../../index_patterns';
-/** @deprecated
- * see https://github.com/elastic/elasticsearch/pull/17508
- * */
export interface DeprecatedMatchPhraseFilter extends Filter {
- match: {
- [field: string]: {
- query: any;
- type: 'phrase';
+ query: {
+ match: {
+ [field: string]: {
+ query: any;
+ type: 'phrase';
+ };
};
};
}
-/** @deprecated
- * see https://github.com/elastic/elasticsearch/pull/17508
- * */
-function isMatchPhraseFilter(filter: any): filter is DeprecatedMatchPhraseFilter {
- const fieldName = filter.match && Object.keys(filter.match)[0];
+function isDeprecatedMatchPhraseFilter(filter: any): filter is DeprecatedMatchPhraseFilter {
+ const fieldName = filter.query && filter.query.match && Object.keys(filter.query.match)[0];
- return Boolean(fieldName && get(filter, ['match', fieldName, 'type']) === 'phrase');
+ return Boolean(fieldName && get(filter, ['query', 'match', fieldName, 'type']) === 'phrase');
}
export function migrateFilter(filter: Filter, indexPattern?: IIndexPattern) {
- if (isMatchPhraseFilter(filter)) {
- const fieldName = Object.keys(filter.match)[0];
- const params: Record = get(filter, ['match', fieldName]);
+ if (isDeprecatedMatchPhraseFilter(filter)) {
+ const fieldName = Object.keys(filter.query.match)[0];
+ const params: Record = get(filter, ['query', 'match', fieldName]);
if (indexPattern) {
const field = indexPattern.fields.find(f => f.name === fieldName);
@@ -55,8 +51,11 @@ export function migrateFilter(filter: Filter, indexPattern?: IIndexPattern) {
}
}
return {
- match_phrase: {
- [fieldName]: omit(params, 'type'),
+ ...filter,
+ query: {
+ match_phrase: {
+ [fieldName]: omit(params, 'type'),
+ },
},
};
}
diff --git a/src/plugins/data/common/es_query/filters/exists_filter.test.ts b/src/plugins/data/common/es_query/filters/exists_filter.test.ts
new file mode 100644
index 00000000000000..af52192dd85e4a
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/exists_filter.test.ts
@@ -0,0 +1,37 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { buildExistsFilter, getExistsFilterField } from './exists_filter';
+import { IIndexPattern } from '../../index_patterns';
+import { fields } from '../../index_patterns/fields/fields.mocks.ts';
+
+describe('exists filter', function() {
+ const indexPattern: IIndexPattern = ({
+ fields,
+ } as unknown) as IIndexPattern;
+
+ describe('getExistsFilterField', function() {
+ it('should return the name of the field an exists query is targeting', () => {
+ const field = indexPattern.fields.find(patternField => patternField.name === 'extension');
+ const filter = buildExistsFilter(field!, indexPattern);
+ const result = getExistsFilterField(filter);
+ expect(result).toBe('extension');
+ });
+ });
+});
diff --git a/src/plugins/data/common/es_query/filters/exists_filter.ts b/src/plugins/data/common/es_query/filters/exists_filter.ts
index a20a4f0634766d..035983dc446dc3 100644
--- a/src/plugins/data/common/es_query/filters/exists_filter.ts
+++ b/src/plugins/data/common/es_query/filters/exists_filter.ts
@@ -33,6 +33,10 @@ export type ExistsFilter = Filter & {
export const isExistsFilter = (filter: any): filter is ExistsFilter => filter && filter.exists;
+export const getExistsFilterField = (filter: ExistsFilter) => {
+ return filter.exists && filter.exists.field;
+};
+
export const buildExistsFilter = (field: IFieldType, indexPattern: IIndexPattern) => {
return {
meta: {
diff --git a/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.test.ts b/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.test.ts
new file mode 100644
index 00000000000000..63c3a59044c1f2
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.test.ts
@@ -0,0 +1,47 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getGeoBoundingBoxFilterField } from './geo_bounding_box_filter';
+
+describe('geo_bounding_box filter', function() {
+ describe('getGeoBoundingBoxFilterField', function() {
+ it('should return the name of the field a geo_bounding_box query is targeting', () => {
+ const filter = {
+ geo_bounding_box: {
+ geoPointField: {
+ bottom_right: { lat: 1, lon: 1 },
+ top_left: { lat: 1, lon: 1 },
+ },
+ ignore_unmapped: true,
+ },
+ meta: {
+ disabled: false,
+ negate: false,
+ alias: null,
+ params: {
+ bottom_right: { lat: 1, lon: 1 },
+ top_left: { lat: 1, lon: 1 },
+ },
+ },
+ };
+ const result = getGeoBoundingBoxFilterField(filter);
+ expect(result).toBe('geoPointField');
+ });
+ });
+});
diff --git a/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts b/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts
index f4673af96b2cd6..619903954ff551 100644
--- a/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts
+++ b/src/plugins/data/common/es_query/filters/geo_bounding_box_filter.ts
@@ -33,3 +33,10 @@ export type GeoBoundingBoxFilter = Filter & {
export const isGeoBoundingBoxFilter = (filter: any): filter is GeoBoundingBoxFilter =>
filter && filter.geo_bounding_box;
+
+export const getGeoBoundingBoxFilterField = (filter: GeoBoundingBoxFilter) => {
+ return (
+ filter.geo_bounding_box &&
+ Object.keys(filter.geo_bounding_box).find(key => key !== 'ignore_unmapped')
+ );
+};
diff --git a/src/plugins/data/common/es_query/filters/geo_polygon_filter.test.ts b/src/plugins/data/common/es_query/filters/geo_polygon_filter.test.ts
new file mode 100644
index 00000000000000..ba8e43b0cea856
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/geo_polygon_filter.test.ts
@@ -0,0 +1,45 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getGeoPolygonFilterField } from './geo_polygon_filter';
+
+describe('geo_polygon filter', function() {
+ describe('getGeoPolygonFilterField', function() {
+ it('should return the name of the field a geo_polygon query is targeting', () => {
+ const filter = {
+ geo_polygon: {
+ geoPointField: {
+ points: [{ lat: 1, lon: 1 }],
+ },
+ ignore_unmapped: true,
+ },
+ meta: {
+ disabled: false,
+ negate: false,
+ alias: null,
+ params: {
+ points: [{ lat: 1, lon: 1 }],
+ },
+ },
+ };
+ const result = getGeoPolygonFilterField(filter);
+ expect(result).toBe('geoPointField');
+ });
+ });
+});
diff --git a/src/plugins/data/common/es_query/filters/geo_polygon_filter.ts b/src/plugins/data/common/es_query/filters/geo_polygon_filter.ts
index 4cf82a92d2cef4..03367feb83ee4e 100644
--- a/src/plugins/data/common/es_query/filters/geo_polygon_filter.ts
+++ b/src/plugins/data/common/es_query/filters/geo_polygon_filter.ts
@@ -32,3 +32,9 @@ export type GeoPolygonFilter = Filter & {
export const isGeoPolygonFilter = (filter: any): filter is GeoPolygonFilter =>
filter && filter.geo_polygon;
+
+export const getGeoPolygonFilterField = (filter: GeoPolygonFilter) => {
+ return (
+ filter.geo_polygon && Object.keys(filter.geo_polygon).find(key => key !== 'ignore_unmapped')
+ );
+};
diff --git a/src/plugins/data/common/es_query/filters/get_filter_field.test.ts b/src/plugins/data/common/es_query/filters/get_filter_field.test.ts
new file mode 100644
index 00000000000000..2fc8ffef9713b5
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/get_filter_field.test.ts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { buildPhraseFilter } from './phrase_filter';
+import { buildQueryFilter } from './query_string_filter';
+import { getFilterField } from './get_filter_field';
+import { IIndexPattern } from '../../index_patterns';
+import { fields } from '../../index_patterns/fields/fields.mocks.ts';
+
+describe('getFilterField', function() {
+ const indexPattern: IIndexPattern = ({
+ id: 'logstash-*',
+ fields,
+ } as unknown) as IIndexPattern;
+
+ it('should return the field name from known filter types that target a specific field', () => {
+ const field = indexPattern.fields.find(patternField => patternField.name === 'extension');
+ const filter = buildPhraseFilter(field!, 'jpg', indexPattern);
+ const result = getFilterField(filter);
+ expect(result).toBe('extension');
+ });
+
+ it('should return undefined for filters that do not target a specific field', () => {
+ const filter = buildQueryFilter(
+ {
+ query: {
+ query_string: {
+ query: 'response:200 and extension:jpg',
+ },
+ },
+ },
+ indexPattern.id!,
+ ''
+ );
+ const result = getFilterField(filter);
+ expect(result).toBe(undefined);
+ });
+});
diff --git a/src/plugins/data/common/es_query/filters/get_filter_field.ts b/src/plugins/data/common/es_query/filters/get_filter_field.ts
new file mode 100644
index 00000000000000..dfb575157d3620
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/get_filter_field.ts
@@ -0,0 +1,53 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Filter } from './meta_filter';
+import { getExistsFilterField, isExistsFilter } from './exists_filter';
+import { getGeoBoundingBoxFilterField, isGeoBoundingBoxFilter } from './geo_bounding_box_filter';
+import { getGeoPolygonFilterField, isGeoPolygonFilter } from './geo_polygon_filter';
+import { getPhraseFilterField, isPhraseFilter } from './phrase_filter';
+import { getPhrasesFilterField, isPhrasesFilter } from './phrases_filter';
+import { getRangeFilterField, isRangeFilter } from './range_filter';
+import { getMissingFilterField, isMissingFilter } from './missing_filter';
+
+export const getFilterField = (filter: Filter) => {
+ if (isExistsFilter(filter)) {
+ return getExistsFilterField(filter);
+ }
+ if (isGeoBoundingBoxFilter(filter)) {
+ return getGeoBoundingBoxFilterField(filter);
+ }
+ if (isGeoPolygonFilter(filter)) {
+ return getGeoPolygonFilterField(filter);
+ }
+ if (isPhraseFilter(filter)) {
+ return getPhraseFilterField(filter);
+ }
+ if (isPhrasesFilter(filter)) {
+ return getPhrasesFilterField(filter);
+ }
+ if (isRangeFilter(filter)) {
+ return getRangeFilterField(filter);
+ }
+ if (isMissingFilter(filter)) {
+ return getMissingFilterField(filter);
+ }
+
+ return;
+};
diff --git a/src/plugins/data/common/es_query/filters/index.ts b/src/plugins/data/common/es_query/filters/index.ts
index 1bd534bf74ff7c..403ff2b79b55f9 100644
--- a/src/plugins/data/common/es_query/filters/index.ts
+++ b/src/plugins/data/common/es_query/filters/index.ts
@@ -22,6 +22,7 @@ import { Filter } from './meta_filter';
export * from './build_filters';
export * from './get_filter_params';
+export * from './get_filter_field';
export * from './custom_filter';
export * from './exists_filter';
diff --git a/src/legacy/server/url_shortening/routes/shorten_url.js b/src/plugins/data/common/es_query/filters/missing_filter.test.ts
similarity index 60%
rename from src/legacy/server/url_shortening/routes/shorten_url.js
rename to src/plugins/data/common/es_query/filters/missing_filter.test.ts
index 0203e9373384a8..240d8fb26f3e0a 100644
--- a/src/legacy/server/url_shortening/routes/shorten_url.js
+++ b/src/plugins/data/common/es_query/filters/missing_filter.test.ts
@@ -17,19 +17,23 @@
* under the License.
*/
-import { handleShortUrlError } from './lib/short_url_error';
-import { shortUrlAssertValid } from './lib/short_url_assert_valid';
+import { getMissingFilterField } from './missing_filter';
-export const createShortenUrlRoute = ({ shortUrlLookup }) => ({
- method: 'POST',
- path: '/api/shorten_url',
- handler: async function (request) {
- try {
- shortUrlAssertValid(request.payload.url);
- const urlId = await shortUrlLookup.generateUrlId(request.payload.url, request);
- return { urlId };
- } catch (err) {
- throw handleShortUrlError(err);
- }
- }
+describe('missing filter', function() {
+ describe('getMissingFilterField', function() {
+ it('should return the name of the field an missing query is targeting', () => {
+ const filter = {
+ missing: {
+ field: 'extension',
+ },
+ meta: {
+ disabled: false,
+ negate: false,
+ alias: null,
+ },
+ };
+ const result = getMissingFilterField(filter);
+ expect(result).toBe('extension');
+ });
+ });
});
diff --git a/src/plugins/data/common/es_query/filters/missing_filter.ts b/src/plugins/data/common/es_query/filters/missing_filter.ts
index 5411187cbcfd73..c8e1194a8f3cc4 100644
--- a/src/plugins/data/common/es_query/filters/missing_filter.ts
+++ b/src/plugins/data/common/es_query/filters/missing_filter.ts
@@ -27,3 +27,7 @@ export type MissingFilter = Filter & {
};
export const isMissingFilter = (filter: any): filter is MissingFilter => filter && filter.missing;
+
+export const getMissingFilterField = (filter: MissingFilter) => {
+ return filter.missing && filter.missing.field;
+};
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.test.ts b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
index 3c7d00a80fecf8..9f90097e55475c 100644
--- a/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.test.ts
@@ -17,8 +17,12 @@
* under the License.
*/
-import { buildInlineScriptForPhraseFilter, buildPhraseFilter } from './phrase_filter';
-import { getField } from '../../index_patterns/mocks';
+import {
+ buildInlineScriptForPhraseFilter,
+ buildPhraseFilter,
+ getPhraseFilterField,
+} from './phrase_filter';
+import { fields, getField } from '../../index_patterns/mocks';
import { IIndexPattern } from '../../index_patterns';
describe('Phrase filter builder', () => {
@@ -95,3 +99,16 @@ describe('buildInlineScriptForPhraseFilter', () => {
expect(buildInlineScriptForPhraseFilter(field)).toBe(expected);
});
});
+
+describe('getPhraseFilterField', function() {
+ const indexPattern: IIndexPattern = ({
+ fields,
+ } as unknown) as IIndexPattern;
+
+ it('should return the name of the field a phrase query is targeting', () => {
+ const field = indexPattern.fields.find(patternField => patternField.name === 'extension');
+ const filter = buildPhraseFilter(field!, 'jpg', indexPattern);
+ const result = getPhraseFilterField(filter);
+ expect(result).toBe('extension');
+ });
+});
diff --git a/src/plugins/data/common/es_query/filters/phrases_filter.test.ts b/src/plugins/data/common/es_query/filters/phrases_filter.test.ts
new file mode 100644
index 00000000000000..3a121eb9da034a
--- /dev/null
+++ b/src/plugins/data/common/es_query/filters/phrases_filter.test.ts
@@ -0,0 +1,37 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { buildPhrasesFilter, getPhrasesFilterField } from './phrases_filter';
+import { IIndexPattern } from '../../index_patterns';
+import { fields } from '../../index_patterns/fields/fields.mocks.ts';
+
+describe('phrases filter', function() {
+ const indexPattern: IIndexPattern = ({
+ fields,
+ } as unknown) as IIndexPattern;
+
+ describe('getPhrasesFilterField', function() {
+ it('should return the name of the field a phrases query is targeting', () => {
+ const field = indexPattern.fields.find(patternField => patternField.name === 'extension');
+ const filter = buildPhrasesFilter(field!, ['jpg', 'png'], indexPattern);
+ const result = getPhrasesFilterField(filter);
+ expect(result).toBe('extension');
+ });
+ });
+});
diff --git a/src/plugins/data/common/es_query/filters/phrases_filter.ts b/src/plugins/data/common/es_query/filters/phrases_filter.ts
index f7164f0ad3c836..006e0623be9139 100644
--- a/src/plugins/data/common/es_query/filters/phrases_filter.ts
+++ b/src/plugins/data/common/es_query/filters/phrases_filter.ts
@@ -32,7 +32,13 @@ export type PhrasesFilter = Filter & {
};
export const isPhrasesFilter = (filter: any): filter is PhrasesFilter =>
- filter && filter.meta.type === FILTERS.PHRASES;
+ filter?.meta?.type === FILTERS.PHRASES;
+
+export const getPhrasesFilterField = (filter: PhrasesFilter) => {
+ // Phrases is a newer filter type that has always been created via a constructor that ensures
+ // `meta.key` is set to the field name
+ return filter.meta.key;
+};
// Creates a filter where the given field matches one or more of the given values
// params should be an array of values
diff --git a/src/plugins/data/common/es_query/filters/query_string_filter.test.ts b/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
index 4fcb15ccac44a4..18285194c60548 100644
--- a/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
+++ b/src/plugins/data/common/es_query/filters/query_string_filter.test.ts
@@ -19,7 +19,7 @@
import { buildQueryFilter } from './query_string_filter';
-describe('Phrase filter builder', () => {
+describe('Query string filter builder', () => {
it('should be a function', () => {
expect(typeof buildQueryFilter).toBe('function');
});
diff --git a/src/plugins/data/common/es_query/filters/range_filter.test.ts b/src/plugins/data/common/es_query/filters/range_filter.test.ts
index 56b63018b51533..45d59c97941b3c 100644
--- a/src/plugins/data/common/es_query/filters/range_filter.test.ts
+++ b/src/plugins/data/common/es_query/filters/range_filter.test.ts
@@ -18,8 +18,8 @@
*/
import { each } from 'lodash';
-import { buildRangeFilter, RangeFilter } from './range_filter';
-import { getField } from '../../index_patterns/mocks';
+import { buildRangeFilter, getRangeFilterField, RangeFilter } from './range_filter';
+import { fields, getField } from '../../index_patterns/mocks';
import { IIndexPattern, IFieldType } from '../../index_patterns';
describe('Range filter builder', () => {
@@ -172,3 +172,16 @@ describe('Range filter builder', () => {
});
});
});
+
+describe('getRangeFilterField', function() {
+ const indexPattern: IIndexPattern = ({
+ fields,
+ } as unknown) as IIndexPattern;
+
+ test('should return the name of the field a range query is targeting', () => {
+ const field = indexPattern.fields.find(patternField => patternField.name === 'bytes');
+ const filter = buildRangeFilter(field!, {}, indexPattern);
+ const result = getRangeFilterField(filter);
+ expect(result).toBe('bytes');
+ });
+});
diff --git a/src/plugins/data/common/es_query/filters/range_filter.ts b/src/plugins/data/common/es_query/filters/range_filter.ts
index 3d819bd145fa63..b300539f4280a5 100644
--- a/src/plugins/data/common/es_query/filters/range_filter.ts
+++ b/src/plugins/data/common/es_query/filters/range_filter.ts
@@ -88,6 +88,10 @@ export const isScriptedRangeFilter = (filter: any): filter is RangeFilter => {
return hasRangeKeys(params);
};
+export const getRangeFilterField = (filter: RangeFilter) => {
+ return filter.range && Object.keys(filter.range)[0];
+};
+
const formatValue = (field: IFieldType, params: any[]) =>
map(params, (val: any, key: string) => get(operators, key) + format(field, val)).join(' ');
diff --git a/src/plugins/data/kibana.json b/src/plugins/data/kibana.json
index bd2bc1bab2a1a0..998eaa55858d22 100644
--- a/src/plugins/data/kibana.json
+++ b/src/plugins/data/kibana.json
@@ -2,5 +2,6 @@
"id": "data",
"version": "kibana",
"server": true,
- "ui": true
+ "ui": true,
+ "requiredPlugins": ["uiActions"]
}
diff --git a/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts b/src/plugins/data/public/actions/apply_filter_action.ts
similarity index 84%
rename from src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts
rename to src/plugins/data/public/actions/apply_filter_action.ts
index c65ae3a0ec7b93..b006889637c507 100644
--- a/src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts
+++ b/src/plugins/data/public/actions/apply_filter_action.ts
@@ -18,22 +18,17 @@
*/
import { i18n } from '@kbn/i18n';
-import { CoreStart } from 'src/core/public';
-import { toMountPoint } from '../../../../../../plugins/kibana_react/public';
-import {
- IAction,
- createAction,
- IncompatibleActionError,
-} from '../../../../../../plugins/ui_actions/public';
+import { toMountPoint } from '../../../kibana_react/public';
+import { IAction, createAction, IncompatibleActionError } from '../../../ui_actions/public';
+import { getOverlays, getIndexPatterns } from '../services';
+import { applyFiltersPopover } from '../ui/apply_filters';
import {
esFilters,
FilterManager,
TimefilterContract,
- applyFiltersPopover,
changeTimeFilter,
extractTimeFilter,
- IndexPatternsStart,
-} from '../../../../../../plugins/data/public';
+} from '..';
export const GLOBAL_APPLY_FILTER_ACTION = 'GLOBAL_APPLY_FILTER_ACTION';
@@ -47,10 +42,8 @@ async function isCompatible(context: ActionContext) {
}
export function createFilterAction(
- overlays: CoreStart['overlays'],
filterManager: FilterManager,
- timeFilter: TimefilterContract,
- indexPatternsService: IndexPatternsStart
+ timeFilter: TimefilterContract
): IAction {
return createAction({
type: GLOBAL_APPLY_FILTER_ACTION,
@@ -75,12 +68,12 @@ export function createFilterAction(
if (selectedFilters.length > 1) {
const indexPatterns = await Promise.all(
filters.map(filter => {
- return indexPatternsService.indexPatterns.get(filter.meta.index!);
+ return getIndexPatterns().get(filter.meta.index!);
})
);
const filterSelectionPromise: Promise = new Promise(resolve => {
- const overlay = overlays.openModal(
+ const overlay = getOverlays().openModal(
toMountPoint(
applyFiltersPopover(
filters,
diff --git a/src/plugins/data/public/actions/index.ts b/src/plugins/data/public/actions/index.ts
new file mode 100644
index 00000000000000..5d469606944a18
--- /dev/null
+++ b/src/plugins/data/public/actions/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { GLOBAL_APPLY_FILTER_ACTION, createFilterAction } from './apply_filter_action';
diff --git a/src/plugins/data/public/autocomplete_provider/types.ts b/src/plugins/data/public/autocomplete_provider/types.ts
index 3d34b1bc4a2d2a..389057f94144d2 100644
--- a/src/plugins/data/public/autocomplete_provider/types.ts
+++ b/src/plugins/data/public/autocomplete_provider/types.ts
@@ -40,6 +40,7 @@ export type GetSuggestions = (args: {
query: string;
selectionStart: number;
selectionEnd: number;
+ signal?: AbortSignal;
}) => Promise;
/** @public **/
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index eca6258099141e..e54278698a05a8 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -18,14 +18,10 @@
*/
import { PluginInitializerContext } from '../../../core/public';
-import { DataPublicPlugin } from './plugin';
-
export function plugin(initializerContext: PluginInitializerContext) {
return new DataPublicPlugin(initializerContext);
}
-export { DataPublicPlugin as Plugin };
-
export * from '../common';
export * from './autocomplete_provider';
@@ -39,3 +35,7 @@ export * from './search';
export * from './query';
export * from './ui';
+
+// Export plugin after all other imports
+import { DataPublicPlugin } from './plugin';
+export { DataPublicPlugin as Plugin };
diff --git a/src/plugins/data/public/index_patterns/fields/field.ts b/src/plugins/data/public/index_patterns/fields/field.ts
index ae17188de8625f..c8c8ac1ffd3214 100644
--- a/src/plugins/data/public/index_patterns/fields/field.ts
+++ b/src/plugins/data/public/index_patterns/fields/field.ts
@@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n';
// @ts-ignore
import { ObjDefine } from './obj_define';
import { IndexPattern } from '../index_patterns';
-import { getNotifications, getFieldFormats } from '../services';
+import { getNotifications, getFieldFormats } from '../../services';
import {
IFieldType,
getKbnFieldType,
diff --git a/src/plugins/data/public/index_patterns/fields/field_list.ts b/src/plugins/data/public/index_patterns/fields/field_list.ts
index ff6706cec6c344..03214a8c96427a 100644
--- a/src/plugins/data/public/index_patterns/fields/field_list.ts
+++ b/src/plugins/data/public/index_patterns/fields/field_list.ts
@@ -24,14 +24,14 @@ import { Field, FieldSpec } from './field';
type FieldMap = Map;
-export interface FieldListInterface extends Array {
+export interface IFieldList extends Array {
getByName(name: Field['name']): Field | undefined;
getByType(type: Field['type']): Field[];
add(field: FieldSpec): void;
remove(field: IFieldType): void;
}
-export class FieldList extends Array implements FieldListInterface {
+export class FieldList extends Array implements IFieldList {
private byName: FieldMap = new Map();
private groups: Map = new Map();
private indexPattern: IndexPattern;
diff --git a/src/plugins/data/public/index_patterns/index.ts b/src/plugins/data/public/index_patterns/index.ts
index e6978e6d3957d1..6f4821c3917212 100644
--- a/src/plugins/data/public/index_patterns/index.ts
+++ b/src/plugins/data/public/index_patterns/index.ts
@@ -42,7 +42,7 @@ export const indexPatterns = {
formatHitProvider,
};
-export { IndexPatternsService } from './index_patterns_service';
-export { Field, FieldList, FieldListInterface } from './fields';
-export { IndexPattern, IndexPatterns } from './index_patterns';
-export { IndexPatternsStart, IndexPatternsSetup } from './types';
+export { Field, FieldList, IFieldList } from './fields';
+
+// TODO: figure out how to replace IndexPatterns in get_inner_angular.
+export { IndexPattern, IndexPatterns, IndexPatternsContract } from './index_patterns';
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
index a0a884454a3f00..f56f94fa8c2605 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.test.ts
@@ -26,7 +26,7 @@ import mockLogStashFields from '../../../../../fixtures/logstash_fields';
// @ts-ignore
import { stubbedSavedObjectIndexPattern } from '../../../../../fixtures/stubbed_saved_object_index_pattern';
import { Field } from '../fields';
-import { setNotifications, setFieldFormats } from '../services';
+import { setNotifications, setFieldFormats } from '../../services';
// Temporary disable eslint, will be removed after moving to new platform folder
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.ts
index 2c93c0aa9dc620..19e465104cf4cd 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_pattern.ts
@@ -32,12 +32,12 @@ import { ES_FIELD_TYPES, KBN_FIELD_TYPES, IIndexPattern, IFieldType } from '../.
import { findByTitle, getRoutes } from '../utils';
import { indexPatterns } from '../';
-import { Field, FieldList, FieldListInterface } from '../fields';
+import { Field, FieldList, IFieldList } from '../fields';
import { createFieldsFetcher } from './_fields_fetcher';
import { formatHitProvider } from './format_hit';
import { flattenHitWrapper } from './flatten_hit';
import { IIndexPatternsApiClient } from './index_patterns_api_client';
-import { getNotifications, getFieldFormats } from '../services';
+import { getNotifications, getFieldFormats } from '../../services';
const MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS = 3;
const type = 'index-pattern';
@@ -50,7 +50,7 @@ export class IndexPattern implements IIndexPattern {
public type?: string;
public fieldFormatMap: any;
public typeMeta: any;
- public fields: FieldListInterface;
+ public fields: IFieldList;
public timeFieldName: string | undefined;
public formatHit: any;
public formatField: any;
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts
index d6a8e7b20451d1..da58881b5b96e8 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts
@@ -17,7 +17,6 @@
* under the License.
*/
-import { idx } from '@kbn/elastic-idx';
import {
SavedObjectsClientContract,
SimpleSavedObject,
@@ -64,7 +63,7 @@ export class IndexPatterns {
if (!this.savedObjectsCache) {
return [];
}
- return this.savedObjectsCache.map(obj => idx(obj, _ => _.id));
+ return this.savedObjectsCache.map(obj => obj?.id);
};
getTitles = async (refresh: boolean = false): Promise => {
@@ -74,7 +73,7 @@ export class IndexPatterns {
if (!this.savedObjectsCache) {
return [];
}
- return this.savedObjectsCache.map(obj => idx(obj, _ => _.attributes.title));
+ return this.savedObjectsCache.map(obj => obj?.attributes?.title);
};
getFields = async (fields: string[], refresh: boolean = false) => {
@@ -86,7 +85,7 @@ export class IndexPatterns {
}
return this.savedObjectsCache.map((obj: Record) => {
const result: Record = {};
- fields.forEach((f: string) => (result[f] = obj[f] || idx(obj, _ => _.attributes[f])));
+ fields.forEach((f: string) => (result[f] = obj[f] || obj?.attributes?.[f]));
return result;
});
};
@@ -146,3 +145,5 @@ export class IndexPatterns {
return indexPattern.init();
};
}
+
+export type IndexPatternsContract = PublicMethodsOf;
diff --git a/src/plugins/data/public/index_patterns/index_patterns_service.mock.ts b/src/plugins/data/public/index_patterns/index_patterns_service.mock.ts
deleted file mode 100644
index d38e9c76430eb7..00000000000000
--- a/src/plugins/data/public/index_patterns/index_patterns_service.mock.ts
+++ /dev/null
@@ -1,58 +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.
- */
-
-import { IndexPatternsService } from './index_patterns_service';
-import { flattenHitWrapper } from './index_patterns';
-import { IndexPatternsSetup } from './types';
-
-type IndexPatternsServiceClientContract = PublicMethodsOf;
-
-const createSetupContractMock = () => {
- // Legacy mock - must be removed before migrating to new platform.
- // Included here because we only want to call `jest.mock` when somebody creates
- // the mock for this contract.
- jest.mock('ui/chrome');
-
- const setupContract: jest.Mocked = {
- FieldList: {} as any,
- flattenHitWrapper: jest.fn().mockImplementation(flattenHitWrapper),
- formatHitProvider: jest.fn(),
- indexPatterns: jest.fn() as any,
- IndexPatternSelect: jest.fn(),
- };
-
- return setupContract;
-};
-
-const createMock = () => {
- const mocked: jest.Mocked = {
- setup: jest.fn(),
- start: jest.fn(),
- stop: jest.fn(),
- };
-
- mocked.setup.mockReturnValue(createSetupContractMock());
- return mocked;
-};
-
-export const indexPatternsServiceMock = {
- create: createMock,
- createSetupContract: createSetupContractMock,
- createStartContract: createSetupContractMock,
-};
diff --git a/src/plugins/data/public/index_patterns/index_patterns_service.ts b/src/plugins/data/public/index_patterns/index_patterns_service.ts
deleted file mode 100644
index 43ba5082ec479c..00000000000000
--- a/src/plugins/data/public/index_patterns/index_patterns_service.ts
+++ /dev/null
@@ -1,70 +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.
- */
-
-import {
- IUiSettingsClient,
- SavedObjectsClientContract,
- HttpServiceBase,
- NotificationsStart,
-} from 'src/core/public';
-import { FieldFormatsStart } from '../field_formats_provider';
-import { setNotifications, setFieldFormats } from './services';
-import { IndexPatterns } from './index_patterns';
-
-export interface IndexPatternDependencies {
- uiSettings: IUiSettingsClient;
- savedObjectsClient: SavedObjectsClientContract;
- http: HttpServiceBase;
- notifications: NotificationsStart;
- fieldFormats: FieldFormatsStart;
-}
-
-/**
- * Index Patterns Service
- *
- * @internal
- */
-export class IndexPatternsService {
- private setupApi: any;
-
- public setup() {
- this.setupApi = {};
-
- return this.setupApi;
- }
-
- public start({
- uiSettings,
- savedObjectsClient,
- http,
- notifications,
- fieldFormats,
- }: IndexPatternDependencies) {
- setNotifications(notifications);
- setFieldFormats(fieldFormats);
-
- return {
- indexPatterns: new IndexPatterns(uiSettings, savedObjectsClient, http),
- };
- }
-
- public stop() {
- // nothing to do here yet
- }
-}
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index 19c21ab9934ef1..058e6c0e2f5c52 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -16,10 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-import { FieldFormatRegisty, Plugin, FieldFormatsStart, FieldFormatsSetup } from '.';
+import {
+ FieldFormatRegisty,
+ Plugin,
+ FieldFormatsStart,
+ FieldFormatsSetup,
+ IndexPatternsContract,
+} from '.';
import { searchSetupMock } from './search/mocks';
import { queryServiceMock } from './query/mocks';
-import { indexPatternsServiceMock } from './index_patterns/index_patterns_service.mock';
export type Setup = jest.Mocked>;
export type Start = jest.Mocked>;
@@ -54,7 +59,6 @@ const createSetupContract = (): Setup => {
search: searchSetupMock,
fieldFormats: fieldFormatsMock as FieldFormatsSetup,
query: querySetupMock,
- indexPatterns: indexPatternsServiceMock.createSetupContract(),
};
return setupContract;
@@ -71,7 +75,7 @@ const createStartContract = (): Start => {
ui: {
IndexPatternSelect: jest.fn(),
},
- indexPatterns: indexPatternsServiceMock.createStartContract(),
+ indexPatterns: {} as IndexPatternsContract,
};
return startContract;
};
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index c018efcad74e65..2a37be7f3f46a1 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -19,17 +19,24 @@
import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
import { Storage } from '../../kibana_utils/public';
-import { DataPublicPluginSetup, DataPublicPluginStart } from './types';
+import {
+ DataPublicPluginSetup,
+ DataPublicPluginStart,
+ DataSetupDependencies,
+ DataStartDependencies,
+} from './types';
import { AutocompleteProviderRegister } from './autocomplete_provider';
import { getSuggestionsProvider } from './suggestions_provider';
import { SearchService } from './search/search_service';
import { FieldFormatsService } from './field_formats_provider';
import { QueryService } from './query';
import { createIndexPatternSelect } from './ui/index_pattern_select';
-import { IndexPatternsService } from './index_patterns';
+import { IndexPatterns } from './index_patterns';
+import { setNotifications, setFieldFormats, setOverlays, setIndexPatterns } from './services';
+import { createFilterAction, GLOBAL_APPLY_FILTER_ACTION } from './actions';
+import { APPLY_FILTER_TRIGGER } from '../../embeddable/public';
export class DataPublicPlugin implements Plugin {
- private readonly indexPatterns: IndexPatternsService = new IndexPatternsService();
private readonly autocomplete = new AutocompleteProviderRegister();
private readonly searchService: SearchService;
private readonly fieldFormatsService: FieldFormatsService;
@@ -41,23 +48,36 @@ export class DataPublicPlugin implements Plugin(
'Notifications'
@@ -28,3 +30,9 @@ export const [getNotifications, setNotifications] = createGetterSetter(
'FieldFormats'
);
+
+export const [getOverlays, setOverlays] = createGetterSetter('Overlays');
+
+export const [getIndexPatterns, setIndexPatterns] = createGetterSetter(
+ 'IndexPatterns'
+);
diff --git a/src/plugins/data/public/suggestions_provider/value_suggestions.ts b/src/plugins/data/public/suggestions_provider/value_suggestions.ts
index 282f4ee65dc96a..68076cd43c336b 100644
--- a/src/plugins/data/public/suggestions_provider/value_suggestions.ts
+++ b/src/plugins/data/public/suggestions_provider/value_suggestions.ts
@@ -28,23 +28,36 @@ export function getSuggestionsProvider(
http: HttpServiceBase
): IGetSuggestions {
const requestSuggestions = memoize(
- (index: string, field: IFieldType, query: string, boolFilter: any = []) => {
+ (
+ index: string,
+ field: IFieldType,
+ query: string,
+ boolFilter: any = [],
+ signal?: AbortSignal
+ ) => {
return http.fetch(`/api/kibana/suggestions/values/${index}`, {
method: 'POST',
body: JSON.stringify({ query, field: field.name, boolFilter }),
+ signal,
});
},
resolver
);
- return async (index: string, field: IFieldType, query: string, boolFilter?: any) => {
+ return async (
+ index: string,
+ field: IFieldType,
+ query: string,
+ boolFilter?: any,
+ signal?: AbortSignal
+ ) => {
const shouldSuggestValues = uiSettings.get('filterEditor:suggestValues');
if (field.type === 'boolean') {
return [true, false];
} else if (!shouldSuggestValues || !field.aggregatable || field.type !== 'string') {
return [];
}
- return await requestSuggestions(index, field, query, boolFilter);
+ return await requestSuggestions(index, field, query, boolFilter, signal);
};
}
diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts
index 5e1d8797ebf089..202a509ee58c95 100644
--- a/src/plugins/data/public/types.ts
+++ b/src/plugins/data/public/types.ts
@@ -19,32 +19,40 @@
import { CoreStart } from 'src/core/public';
import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
+import { IUiActionsSetup, IUiActionsStart } from 'src/plugins/ui_actions/public';
import { AutocompletePublicPluginSetup, AutocompletePublicPluginStart } from '.';
import { FieldFormatsSetup, FieldFormatsStart } from './field_formats_provider';
import { ISearchSetup, ISearchStart } from './search';
import { IGetSuggestions } from './suggestions_provider/types';
import { QuerySetup, QueryStart } from './query';
import { IndexPatternSelectProps } from './ui/index_pattern_select';
-import { IndexPatternsStart, IndexPatternsSetup } from './index_patterns';
+import { IndexPatternsContract } from './index_patterns';
+
+export interface DataSetupDependencies {
+ uiActions: IUiActionsSetup;
+}
+
+export interface DataStartDependencies {
+ uiActions: IUiActionsStart;
+}
export interface DataPublicPluginSetup {
autocomplete: AutocompletePublicPluginSetup;
search: ISearchSetup;
fieldFormats: FieldFormatsSetup;
query: QuerySetup;
- indexPatterns?: IndexPatternsSetup;
}
export interface DataPublicPluginStart {
autocomplete: AutocompletePublicPluginStart;
getSuggestions: IGetSuggestions;
+ indexPatterns: IndexPatternsContract;
search: ISearchStart;
fieldFormats: FieldFormatsStart;
query: QueryStart;
ui: {
IndexPatternSelect: React.ComponentType;
};
- indexPatterns: IndexPatternsStart;
}
export * from './autocomplete_provider/types';
diff --git a/src/plugins/data/public/ui/filter_bar/_global_filter_item.scss b/src/plugins/data/public/ui/filter_bar/_global_filter_item.scss
index 84538a62ca005f..51204e2a611688 100644
--- a/src/plugins/data/public/ui/filter_bar/_global_filter_item.scss
+++ b/src/plugins/data/public/ui/filter_bar/_global_filter_item.scss
@@ -1,6 +1,3 @@
-@import '@elastic/eui/src/components/form/variables';
-@import '@elastic/eui/src/components/form/mixins';
-
/**
* 1. Allow wrapping of long filter items
*/
diff --git a/src/plugins/data/public/ui/index.ts b/src/plugins/data/public/ui/index.ts
index 9a4bccc21db3e5..8bfccd49bdff34 100644
--- a/src/plugins/data/public/ui/index.ts
+++ b/src/plugins/data/public/ui/index.ts
@@ -20,7 +20,6 @@
export { SuggestionsComponent } from './typeahead/suggestions_component';
export { IndexPatternSelect } from './index_pattern_select';
export { FilterBar } from './filter_bar';
-export { applyFiltersPopover } from './apply_filters';
export { QueryStringInput } from './query_string_input/query_string_input';
// temp export - will be removed as final components are migrated to NP
diff --git a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
index 58658b6c839a25..80a5ede5670543 100644
--- a/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
+++ b/src/plugins/data/public/ui/query_string_input/__snapshots__/query_string_input.test.tsx.snap
@@ -172,13 +172,7 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
"register": [MockFunction],
},
"getSuggestions": [MockFunction],
- "indexPatterns": Object {
- "FieldList": Object {},
- "IndexPatternSelect": [MockFunction],
- "flattenHitWrapper": [MockFunction],
- "formatHitProvider": [MockFunction],
- "indexPatterns": [MockFunction],
- },
+ "indexPatterns": Object {},
"query": Object {
"filterManager": [MockFunction],
"savedQueries": [MockFunction],
@@ -305,14 +299,9 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
},
"http": Object {
"addLoadingCount": [MockFunction],
- "anonymousPaths": AnonymousPaths {
- "basePath": BasePath {
- "basePath": "",
- "get": [Function],
- "prepend": [Function],
- "remove": [Function],
- },
- "paths": Set {},
+ "anonymousPaths": Object {
+ "isAnonymous": [MockFunction],
+ "register": [MockFunction],
},
"basePath": BasePath {
"basePath": "",
@@ -803,13 +792,7 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
"register": [MockFunction],
},
"getSuggestions": [MockFunction],
- "indexPatterns": Object {
- "FieldList": Object {},
- "IndexPatternSelect": [MockFunction],
- "flattenHitWrapper": [MockFunction],
- "formatHitProvider": [MockFunction],
- "indexPatterns": [MockFunction],
- },
+ "indexPatterns": Object {},
"query": Object {
"filterManager": [MockFunction],
"savedQueries": [MockFunction],
@@ -936,14 +919,9 @@ exports[`QueryStringInput Should disable autoFocus on EuiFieldText when disableA
},
"http": Object {
"addLoadingCount": [MockFunction],
- "anonymousPaths": AnonymousPaths {
- "basePath": BasePath {
- "basePath": "",
- "get": [Function],
- "prepend": [Function],
- "remove": [Function],
- },
- "paths": Set {},
+ "anonymousPaths": Object {
+ "isAnonymous": [MockFunction],
+ "register": [MockFunction],
},
"basePath": BasePath {
"basePath": "",
@@ -1422,13 +1400,7 @@ exports[`QueryStringInput Should pass the query language to the language switche
"register": [MockFunction],
},
"getSuggestions": [MockFunction],
- "indexPatterns": Object {
- "FieldList": Object {},
- "IndexPatternSelect": [MockFunction],
- "flattenHitWrapper": [MockFunction],
- "formatHitProvider": [MockFunction],
- "indexPatterns": [MockFunction],
- },
+ "indexPatterns": Object {},
"query": Object {
"filterManager": [MockFunction],
"savedQueries": [MockFunction],
@@ -1555,14 +1527,9 @@ exports[`QueryStringInput Should pass the query language to the language switche
},
"http": Object {
"addLoadingCount": [MockFunction],
- "anonymousPaths": AnonymousPaths {
- "basePath": BasePath {
- "basePath": "",
- "get": [Function],
- "prepend": [Function],
- "remove": [Function],
- },
- "paths": Set {},
+ "anonymousPaths": Object {
+ "isAnonymous": [MockFunction],
+ "register": [MockFunction],
},
"basePath": BasePath {
"basePath": "",
@@ -2050,13 +2017,7 @@ exports[`QueryStringInput Should pass the query language to the language switche
"register": [MockFunction],
},
"getSuggestions": [MockFunction],
- "indexPatterns": Object {
- "FieldList": Object {},
- "IndexPatternSelect": [MockFunction],
- "flattenHitWrapper": [MockFunction],
- "formatHitProvider": [MockFunction],
- "indexPatterns": [MockFunction],
- },
+ "indexPatterns": Object {},
"query": Object {
"filterManager": [MockFunction],
"savedQueries": [MockFunction],
@@ -2183,14 +2144,9 @@ exports[`QueryStringInput Should pass the query language to the language switche
},
"http": Object {
"addLoadingCount": [MockFunction],
- "anonymousPaths": AnonymousPaths {
- "basePath": BasePath {
- "basePath": "",
- "get": [Function],
- "prepend": [Function],
- "remove": [Function],
- },
- "paths": Set {},
+ "anonymousPaths": Object {
+ "isAnonymous": [MockFunction],
+ "register": [MockFunction],
},
"basePath": BasePath {
"basePath": "",
@@ -2669,13 +2625,7 @@ exports[`QueryStringInput Should render the given query 1`] = `
"register": [MockFunction],
},
"getSuggestions": [MockFunction],
- "indexPatterns": Object {
- "FieldList": Object {},
- "IndexPatternSelect": [MockFunction],
- "flattenHitWrapper": [MockFunction],
- "formatHitProvider": [MockFunction],
- "indexPatterns": [MockFunction],
- },
+ "indexPatterns": Object {},
"query": Object {
"filterManager": [MockFunction],
"savedQueries": [MockFunction],
@@ -2802,14 +2752,9 @@ exports[`QueryStringInput Should render the given query 1`] = `
},
"http": Object {
"addLoadingCount": [MockFunction],
- "anonymousPaths": AnonymousPaths {
- "basePath": BasePath {
- "basePath": "",
- "get": [Function],
- "prepend": [Function],
- "remove": [Function],
- },
- "paths": Set {},
+ "anonymousPaths": Object {
+ "isAnonymous": [MockFunction],
+ "register": [MockFunction],
},
"basePath": BasePath {
"basePath": "",
@@ -3297,13 +3242,7 @@ exports[`QueryStringInput Should render the given query 1`] = `
"register": [MockFunction],
},
"getSuggestions": [MockFunction],
- "indexPatterns": Object {
- "FieldList": Object {},
- "IndexPatternSelect": [MockFunction],
- "flattenHitWrapper": [MockFunction],
- "formatHitProvider": [MockFunction],
- "indexPatterns": [MockFunction],
- },
+ "indexPatterns": Object {},
"query": Object {
"filterManager": [MockFunction],
"savedQueries": [MockFunction],
@@ -3430,14 +3369,9 @@ exports[`QueryStringInput Should render the given query 1`] = `
},
"http": Object {
"addLoadingCount": [MockFunction],
- "anonymousPaths": AnonymousPaths {
- "basePath": BasePath {
- "basePath": "",
- "get": [Function],
- "prepend": [Function],
- "remove": [Function],
- },
- "paths": Set {},
+ "anonymousPaths": Object {
+ "isAnonymous": [MockFunction],
+ "register": [MockFunction],
},
"basePath": BasePath {
"basePath": "",
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
index dcc07f4fd43c5b..16b22a164f2f02 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
+++ b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
@@ -106,6 +106,7 @@ export class QueryStringInputUI extends Component {
public inputRef: HTMLInputElement | null = null;
private persistedLog: PersistedLog | undefined;
+ private abortController: AbortController | undefined;
private services = this.props.kibana.services;
private componentIsUnmounting = false;
@@ -163,12 +164,22 @@ export class QueryStringInputUI extends Component {
return;
}
- const suggestions: AutocompleteSuggestion[] = await getAutocompleteSuggestions({
- query: queryString,
- selectionStart,
- selectionEnd,
- });
- return [...suggestions, ...recentSearchSuggestions];
+ try {
+ if (this.abortController) this.abortController.abort();
+ this.abortController = new AbortController();
+ const suggestions: AutocompleteSuggestion[] = await getAutocompleteSuggestions({
+ query: queryString,
+ selectionStart,
+ selectionEnd,
+ signal: this.abortController.signal,
+ });
+ return [...suggestions, ...recentSearchSuggestions];
+ } catch (e) {
+ // TODO: Waiting on https://github.com/elastic/kibana/issues/51406 for a properly typed error
+ // Ignore aborted requests
+ if (e.message === 'The user aborted a request.') return;
+ throw e;
+ }
};
private getRecentSearchSuggestions = (query: string) => {
diff --git a/src/plugins/data/public/ui/saved_query_management/_saved_query_management_component.scss b/src/plugins/data/public/ui/saved_query_management/_saved_query_management_component.scss
index d43d14945699e0..928cb5a34d6deb 100644
--- a/src/plugins/data/public/ui/saved_query_management/_saved_query_management_component.scss
+++ b/src/plugins/data/public/ui/saved_query_management/_saved_query_management_component.scss
@@ -1,5 +1,3 @@
-@import '@elastic/eui/src/components/form/variables';
-
.kbnSavedQueryManagement__popover {
max-width: $euiFormMaxWidth;
}
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
index 88d2d873521cb0..d9a284d34de6be 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.test.js
@@ -144,6 +144,13 @@ describe('index_patterns/field_capabilities/field_caps_response', () => {
expect(child).toHaveProperty('subType', { nested: { path: 'nested_object_parent' } });
});
+ it('returns nested sub-fields as non-aggregatable', () => {
+ const fields = readFieldCapsResponse(esResponse);
+ // Normally a keyword field would be aggregatable, but the fact that it is nested overrides that
+ const child = fields.find(f => f.name === 'nested_object_parent.child.keyword');
+ expect(child).toHaveProperty('aggregatable', false);
+ });
+
it('handles fields that are both nested and multi', () => {
const fields = readFieldCapsResponse(esResponse);
const child = fields.find(f => f.name === 'nested_object_parent.child.keyword');
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
index 06eb30db0b24bb..2215bd8a95a1d0 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -182,6 +182,14 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
if (Object.keys(subType).length > 0) {
field.subType = subType;
+
+ // We don't support aggregating on nested fields, trying to do so in the UI will return
+ // blank results. For now we will stop showing nested fields as an option for aggregation.
+ // Once we add support for nested fields this condition should be removed and old index
+ // patterns should be migrated.
+ if (field.subType.nested) {
+ field.aggregatable = false;
+ }
}
}
});
diff --git a/src/plugins/embeddable/public/lib/containers/container.ts b/src/plugins/embeddable/public/lib/containers/container.ts
index bce16747ed48e9..71e7cca3552bbf 100644
--- a/src/plugins/embeddable/public/lib/containers/container.ts
+++ b/src/plugins/embeddable/public/lib/containers/container.ts
@@ -240,6 +240,7 @@ export abstract class Container<
...this.input.panels,
[panelState.explicitInput.id]: panelState,
},
+ isEmptyState: false,
} as Partial);
return await this.untilEmbeddableLoaded(panelState.explicitInput.id);
diff --git a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
index 33cb146a056cbc..01975827789407 100644
--- a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
@@ -28,7 +28,7 @@ export interface EmbeddableInput {
id: string;
lastReloadRequestTime?: number;
hidePanelTitles?: boolean;
-
+ isEmptyState?: boolean;
/**
* List of action IDs that this embeddable should not render.
*/
diff --git a/src/plugins/es_ui_shared/public/request/np_ready_request.ts b/src/plugins/es_ui_shared/public/request/np_ready_request.ts
index 48c7904661e515..5a3f28ed76486c 100644
--- a/src/plugins/es_ui_shared/public/request/np_ready_request.ts
+++ b/src/plugins/es_ui_shared/public/request/np_ready_request.ts
@@ -19,11 +19,12 @@
import { useEffect, useState, useRef } from 'react';
-import { HttpServiceBase } from '../../../../../src/core/public';
+import { HttpServiceBase, HttpFetchQuery } from '../../../../../src/core/public';
export interface SendRequestConfig {
path: string;
method: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'head';
+ query?: HttpFetchQuery;
body?: any;
}
@@ -48,10 +49,10 @@ export interface UseRequestResponse {
export const sendRequest = async (
httpClient: HttpServiceBase,
- { path, method, body }: SendRequestConfig
+ { path, method, body, query }: SendRequestConfig
): Promise => {
try {
- const response = await httpClient[method](path, { body });
+ const response = await httpClient[method](path, { body, query });
return {
data: response.data ? response.data : response,
@@ -70,6 +71,7 @@ export const useRequest = (
{
path,
method,
+ query,
body,
pollIntervalMs,
initialData,
@@ -112,6 +114,7 @@ export const useRequest = (
const requestBody = {
path,
method,
+ query,
body,
};
diff --git a/src/plugins/inspector/public/views/requests/_requests.scss b/src/plugins/inspector/public/views/requests/_requests.scss
index feaef21fc4810d..273c9d0ccba2b1 100644
--- a/src/plugins/inspector/public/views/requests/_requests.scss
+++ b/src/plugins/inspector/public/views/requests/_requests.scss
@@ -1,5 +1,3 @@
-@import '@elastic/eui/src/components/button/variables';
-
.insRequestDetailsStats__icon {
margin-right: $euiSizeS;
}
diff --git a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.test.tsx b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.test.tsx
index b35ba427378abb..58b396d57639b5 100644
--- a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.test.tsx
+++ b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.test.tsx
@@ -35,7 +35,7 @@ import { IconType } from '@elastic/eui';
import { shallow } from 'enzyme';
import React from 'react';
import * as sinon from 'sinon';
-import { SavedObjectFinder } from './saved_object_finder';
+import { SavedObjectFinderUi as SavedObjectFinder } from './saved_object_finder';
// eslint-disable-next-line
import { coreMock } from '../../../../core/public/mocks';
diff --git a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
index c65d4289587670..51fbbd2ba3046d 100644
--- a/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
+++ b/src/plugins/kibana_react/public/saved_objects/saved_object_finder.tsx
@@ -46,6 +46,7 @@ import { i18n } from '@kbn/i18n';
import { SavedObjectAttributes } from '../../../../core/server';
import { SimpleSavedObject, CoreStart } from '../../../../core/public';
+import { useKibana } from '../context';
// TODO the typings for EuiListGroup are incorrect - maxWidth is missing. This can be removed when the types are adjusted
const FixedEuiListGroup = (EuiListGroup as any) as React.FunctionComponent<
@@ -104,12 +105,18 @@ interface SavedObjectFinderInitialPageSize extends BaseSavedObjectFinder {
initialPageSize?: 5 | 10 | 15 | 25;
fixedPageSize?: undefined;
}
-export type SavedObjectFinderProps = {
+
+export type SavedObjectFinderProps = SavedObjectFinderFixedPage | SavedObjectFinderInitialPageSize;
+
+export type SavedObjectFinderUiProps = {
savedObjects: CoreStart['savedObjects'];
uiSettings: CoreStart['uiSettings'];
-} & (SavedObjectFinderFixedPage | SavedObjectFinderInitialPageSize);
+} & SavedObjectFinderProps;
-class SavedObjectFinder extends React.Component {
+class SavedObjectFinderUi extends React.Component<
+ SavedObjectFinderUiProps,
+ SavedObjectFinderState
+> {
public static propTypes = {
onChoose: PropTypes.func,
noItemsMessage: PropTypes.node,
@@ -174,7 +181,7 @@ class SavedObjectFinder extends React.Component {
+ const { services } = useKibana();
+ return (
+
+ );
+};
+
+export { SavedObjectFinder, SavedObjectFinderUi };
diff --git a/src/plugins/share/kibana.json b/src/plugins/share/kibana.json
index bbe393a76c5dae..dce2ac9281aba7 100644
--- a/src/plugins/share/kibana.json
+++ b/src/plugins/share/kibana.json
@@ -1,6 +1,6 @@
{
"id": "share",
"version": "kibana",
- "server": false,
+ "server": true,
"ui": true
}
diff --git a/src/plugins/data/public/index_patterns/types.ts b/src/plugins/share/server/index.ts
similarity index 78%
rename from src/plugins/data/public/index_patterns/types.ts
rename to src/plugins/share/server/index.ts
index 59e3075bf215d1..9e574314f80000 100644
--- a/src/plugins/data/public/index_patterns/types.ts
+++ b/src/plugins/share/server/index.ts
@@ -17,7 +17,9 @@
* under the License.
*/
-import { IndexPatternsService } from './index_patterns_service';
+import { PluginInitializerContext } from '../../../core/server';
+import { SharePlugin } from './plugin';
-export type IndexPatternsSetup = ReturnType;
-export type IndexPatternsStart = ReturnType;
+export function plugin(initializerContext: PluginInitializerContext) {
+ return new SharePlugin(initializerContext);
+}
diff --git a/src/legacy/ui/public/utils/find_by_param.ts b/src/plugins/share/server/plugin.ts
similarity index 59%
rename from src/legacy/ui/public/utils/find_by_param.ts
rename to src/plugins/share/server/plugin.ts
index de32fc955a8cd3..bcb681a50652a8 100644
--- a/src/legacy/ui/public/utils/find_by_param.ts
+++ b/src/plugins/share/server/plugin.ts
@@ -17,22 +17,21 @@
* under the License.
*/
-import _ from 'lodash';
+import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
+import { createRoutes } from './routes/create_routes';
-interface AnyObject {
- [key: string]: any;
-}
+export class SharePlugin implements Plugin {
+ constructor(private readonly initializerContext: PluginInitializerContext) {}
+
+ public async setup(core: CoreSetup) {
+ createRoutes(core, this.initializerContext.logger.get());
+ }
+
+ public start() {
+ this.initializerContext.logger.get().debug('Starting plugin');
+ }
-// given an object or array of objects, return the value of the passed param
-// if the param is missing, return undefined
-export function findByParam(values: AnyObject | AnyObject[], param: string) {
- if (Array.isArray(values)) {
- // point series chart
- const index = _.findIndex(values, param);
- if (index === -1) {
- return;
- }
- return values[index][param];
+ public stop() {
+ this.initializerContext.logger.get().debug('Stopping plugin');
}
- return values[param]; // pie chart
}
diff --git a/src/plugins/share/server/routes/create_routes.ts b/src/plugins/share/server/routes/create_routes.ts
new file mode 100644
index 00000000000000..bd4b6fdb08791d
--- /dev/null
+++ b/src/plugins/share/server/routes/create_routes.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreSetup, Logger } from 'kibana/server';
+
+import { shortUrlLookupProvider } from './lib/short_url_lookup';
+import { createGotoRoute } from './goto';
+import { createShortenUrlRoute } from './shorten_url';
+
+export function createRoutes({ http }: CoreSetup, logger: Logger) {
+ const shortUrlLookup = shortUrlLookupProvider({ logger });
+ const router = http.createRouter();
+
+ createGotoRoute({ router, shortUrlLookup, http });
+ createShortenUrlRoute({ router, shortUrlLookup });
+}
diff --git a/src/plugins/share/server/routes/goto.ts b/src/plugins/share/server/routes/goto.ts
new file mode 100644
index 00000000000000..7343dc1bd34a26
--- /dev/null
+++ b/src/plugins/share/server/routes/goto.ts
@@ -0,0 +1,64 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreSetup, IRouter } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
+
+import { shortUrlAssertValid } from './lib/short_url_assert_valid';
+import { ShortUrlLookupService } from './lib/short_url_lookup';
+
+export const createGotoRoute = ({
+ router,
+ shortUrlLookup,
+ http,
+}: {
+ router: IRouter;
+ shortUrlLookup: ShortUrlLookupService;
+ http: CoreSetup['http'];
+}) => {
+ router.get(
+ {
+ path: '/goto/{urlId}',
+ validate: {
+ params: schema.object({ urlId: schema.string() }),
+ },
+ },
+ router.handleLegacyErrors(async function(context, request, response) {
+ const url = await shortUrlLookup.getUrl(request.params.urlId, {
+ savedObjects: context.core.savedObjects.client,
+ });
+ shortUrlAssertValid(url);
+
+ const uiSettings = context.core.uiSettings.client;
+ const stateStoreInSessionStorage = await uiSettings.get('state:storeInSessionStorage');
+ if (!stateStoreInSessionStorage) {
+ return response.redirected({
+ headers: {
+ location: http.basePath.prepend(url),
+ },
+ });
+ }
+ return response.redirected({
+ headers: {
+ location: http.basePath.prepend('/goto_LP/' + request.params.urlId),
+ },
+ });
+ })
+ );
+};
diff --git a/src/plugins/share/server/routes/lib/short_url_assert_valid.test.ts b/src/plugins/share/server/routes/lib/short_url_assert_valid.test.ts
new file mode 100644
index 00000000000000..f83073e6aefe90
--- /dev/null
+++ b/src/plugins/share/server/routes/lib/short_url_assert_valid.test.ts
@@ -0,0 +1,63 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { shortUrlAssertValid } from './short_url_assert_valid';
+
+describe('shortUrlAssertValid()', () => {
+ const invalid = [
+ ['protocol', 'http://localhost:5601/app/kibana'],
+ ['protocol', 'https://localhost:5601/app/kibana'],
+ ['protocol', 'mailto:foo@bar.net'],
+ ['protocol', 'javascript:alert("hi")'], // eslint-disable-line no-script-url
+ ['hostname', 'localhost/app/kibana'],
+ ['hostname and port', 'local.host:5601/app/kibana'],
+ ['hostname and auth', 'user:pass@localhost.net/app/kibana'],
+ ['path traversal', '/app/../../not-kibana'],
+ ['deep path', '/app/kibana/foo'],
+ ['deep path', '/app/kibana/foo/bar'],
+ ['base path', '/base/app/kibana'],
+ ];
+
+ invalid.forEach(([desc, url]) => {
+ it(`fails when url has ${desc}`, () => {
+ try {
+ shortUrlAssertValid(url);
+ throw new Error(`expected assertion to throw`);
+ } catch (err) {
+ if (!err || !err.isBoom) {
+ throw err;
+ }
+ }
+ });
+ });
+
+ const valid = [
+ '/app/kibana',
+ '/app/monitoring#angular/route',
+ '/app/text#document-id',
+ '/app/some?with=query',
+ '/app/some?with=query#and-a-hash',
+ ];
+
+ valid.forEach(url => {
+ it(`allows ${url}`, () => {
+ shortUrlAssertValid(url);
+ });
+ });
+});
diff --git a/src/plugins/share/server/routes/lib/short_url_assert_valid.ts b/src/plugins/share/server/routes/lib/short_url_assert_valid.ts
new file mode 100644
index 00000000000000..2f120bbc03cd73
--- /dev/null
+++ b/src/plugins/share/server/routes/lib/short_url_assert_valid.ts
@@ -0,0 +1,41 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { parse } from 'url';
+import { trim } from 'lodash';
+import Boom from 'boom';
+
+export function shortUrlAssertValid(url: string) {
+ const { protocol, hostname, pathname } = parse(url);
+
+ if (protocol) {
+ throw Boom.notAcceptable(`Short url targets cannot have a protocol, found "${protocol}"`);
+ }
+
+ if (hostname) {
+ throw Boom.notAcceptable(`Short url targets cannot have a hostname, found "${hostname}"`);
+ }
+
+ const pathnameParts = trim(pathname, '/').split('/');
+ if (pathnameParts.length !== 2) {
+ throw Boom.notAcceptable(
+ `Short url target path must be in the format "/app/{{appId}}", found "${pathname}"`
+ );
+ }
+}
diff --git a/src/plugins/share/server/routes/lib/short_url_lookup.test.ts b/src/plugins/share/server/routes/lib/short_url_lookup.test.ts
new file mode 100644
index 00000000000000..87e2b7b726e599
--- /dev/null
+++ b/src/plugins/share/server/routes/lib/short_url_lookup.test.ts
@@ -0,0 +1,125 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { shortUrlLookupProvider, ShortUrlLookupService } from './short_url_lookup';
+import { SavedObjectsClientContract, Logger } from 'kibana/server';
+import { SavedObjectsClient } from '../../../../../core/server';
+
+describe('shortUrlLookupProvider', () => {
+ const ID = 'bf00ad16941fc51420f91a93428b27a0';
+ const TYPE = 'url';
+ const URL = 'http://elastic.co';
+
+ let savedObjects: jest.Mocked;
+ let deps: { savedObjects: SavedObjectsClientContract };
+ let shortUrl: ShortUrlLookupService;
+
+ beforeEach(() => {
+ savedObjects = ({
+ get: jest.fn(),
+ create: jest.fn(() => Promise.resolve({ id: ID })),
+ update: jest.fn(),
+ errors: SavedObjectsClient.errors,
+ } as unknown) as jest.Mocked;
+
+ deps = { savedObjects };
+ shortUrl = shortUrlLookupProvider({ logger: ({ warn: () => {} } as unknown) as Logger });
+ });
+
+ describe('generateUrlId', () => {
+ it('returns the document id', async () => {
+ const id = await shortUrl.generateUrlId(URL, deps);
+ expect(id).toEqual(ID);
+ });
+
+ it('provides correct arguments to savedObjectsClient', async () => {
+ await shortUrl.generateUrlId(URL, { savedObjects });
+
+ expect(savedObjects.create).toHaveBeenCalledTimes(1);
+ const [type, attributes, options] = savedObjects.create.mock.calls[0];
+
+ expect(type).toEqual(TYPE);
+ expect(Object.keys(attributes).sort()).toEqual([
+ 'accessCount',
+ 'accessDate',
+ 'createDate',
+ 'url',
+ ]);
+ expect(attributes.url).toEqual(URL);
+ expect(options!.id).toEqual(ID);
+ });
+
+ it('passes persists attributes', async () => {
+ await shortUrl.generateUrlId(URL, deps);
+
+ expect(savedObjects.create).toHaveBeenCalledTimes(1);
+ const [type, attributes] = savedObjects.create.mock.calls[0];
+
+ expect(type).toEqual(TYPE);
+ expect(Object.keys(attributes).sort()).toEqual([
+ 'accessCount',
+ 'accessDate',
+ 'createDate',
+ 'url',
+ ]);
+ expect(attributes.url).toEqual(URL);
+ });
+
+ it('gracefully handles version conflict', async () => {
+ const error = savedObjects.errors.decorateConflictError(new Error());
+ savedObjects.create.mockImplementation(() => {
+ throw error;
+ });
+ const id = await shortUrl.generateUrlId(URL, deps);
+ expect(id).toEqual(ID);
+ });
+ });
+
+ describe('getUrl', () => {
+ beforeEach(() => {
+ const attributes = { accessCount: 2, url: URL };
+ savedObjects.get.mockResolvedValue({ id: ID, attributes, type: 'url', references: [] });
+ });
+
+ it('provides the ID to savedObjectsClient', async () => {
+ await shortUrl.getUrl(ID, { savedObjects });
+
+ expect(savedObjects.get).toHaveBeenCalledTimes(1);
+ expect(savedObjects.get).toHaveBeenCalledWith(TYPE, ID);
+ });
+
+ it('returns the url', async () => {
+ const response = await shortUrl.getUrl(ID, deps);
+ expect(response).toEqual(URL);
+ });
+
+ it('increments accessCount', async () => {
+ await shortUrl.getUrl(ID, { savedObjects });
+
+ expect(savedObjects.update).toHaveBeenCalledTimes(1);
+
+ const [type, id, attributes] = savedObjects.update.mock.calls[0];
+
+ expect(type).toEqual(TYPE);
+ expect(id).toEqual(ID);
+ expect(Object.keys(attributes).sort()).toEqual(['accessCount', 'accessDate']);
+ expect(attributes.accessCount).toEqual(3);
+ });
+ });
+});
diff --git a/src/plugins/share/server/routes/lib/short_url_lookup.ts b/src/plugins/share/server/routes/lib/short_url_lookup.ts
new file mode 100644
index 00000000000000..0d8a9c86621de3
--- /dev/null
+++ b/src/plugins/share/server/routes/lib/short_url_lookup.ts
@@ -0,0 +1,84 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import crypto from 'crypto';
+import { get } from 'lodash';
+
+import { Logger, SavedObject, SavedObjectsClientContract } from 'kibana/server';
+
+export interface ShortUrlLookupService {
+ generateUrlId(url: string, deps: { savedObjects: SavedObjectsClientContract }): Promise;
+ getUrl(url: string, deps: { savedObjects: SavedObjectsClientContract }): Promise;
+}
+
+export function shortUrlLookupProvider({ logger }: { logger: Logger }): ShortUrlLookupService {
+ async function updateMetadata(
+ doc: SavedObject,
+ { savedObjects }: { savedObjects: SavedObjectsClientContract }
+ ) {
+ try {
+ await savedObjects.update('url', doc.id, {
+ accessDate: new Date().valueOf(),
+ accessCount: get(doc, 'attributes.accessCount', 0) + 1,
+ });
+ } catch (error) {
+ logger.warn('Warning: Error updating url metadata');
+ logger.warn(error);
+ // swallow errors. It isn't critical if there is no update.
+ }
+ }
+
+ return {
+ async generateUrlId(url, { savedObjects }) {
+ const id = crypto
+ .createHash('md5')
+ .update(url)
+ .digest('hex');
+ const { isConflictError } = savedObjects.errors;
+
+ try {
+ const doc = await savedObjects.create(
+ 'url',
+ {
+ url,
+ accessCount: 0,
+ createDate: new Date().valueOf(),
+ accessDate: new Date().valueOf(),
+ },
+ { id }
+ );
+
+ return doc.id;
+ } catch (error) {
+ if (isConflictError(error)) {
+ return id;
+ }
+
+ throw error;
+ }
+ },
+
+ async getUrl(id, { savedObjects }) {
+ const doc = await savedObjects.get('url', id);
+ updateMetadata(doc, { savedObjects });
+
+ return doc.attributes.url;
+ },
+ };
+}
diff --git a/src/plugins/share/server/routes/shorten_url.ts b/src/plugins/share/server/routes/shorten_url.ts
new file mode 100644
index 00000000000000..116b90c6971c5c
--- /dev/null
+++ b/src/plugins/share/server/routes/shorten_url.ts
@@ -0,0 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IRouter } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
+
+import { shortUrlAssertValid } from './lib/short_url_assert_valid';
+import { ShortUrlLookupService } from './lib/short_url_lookup';
+
+export const createShortenUrlRoute = ({
+ shortUrlLookup,
+ router,
+}: {
+ shortUrlLookup: ShortUrlLookupService;
+ router: IRouter;
+}) => {
+ router.post(
+ {
+ path: '/api/shorten_url',
+ validate: {
+ body: schema.object({ url: schema.string() }),
+ },
+ },
+ router.handleLegacyErrors(async function(context, request, response) {
+ shortUrlAssertValid(request.body.url);
+ const urlId = await shortUrlLookup.generateUrlId(request.body.url, {
+ savedObjects: context.core.savedObjects.client,
+ });
+ return response.ok({ body: { urlId } });
+ })
+ );
+};
diff --git a/src/test_utils/public/stub_index_pattern.js b/src/test_utils/public/stub_index_pattern.js
index b76da4b4eca3ef..f4659ffa120d40 100644
--- a/src/test_utils/public/stub_index_pattern.js
+++ b/src/test_utils/public/stub_index_pattern.js
@@ -21,20 +21,26 @@ import sinon from 'sinon';
// TODO: We should not be importing from the data plugin directly here; this is only necessary
// because it is one of the few places that we need to access the IndexPattern class itself, rather
// than just the type. Doing this as a temporary measure; it will be left behind when migrating to NP.
-import { IndexPattern } from '../../legacy/core_plugins/data/public/';
+
import {
FieldList,
- getRoutes,
- formatHitProvider,
- flattenHitWrapper,
-} from 'ui/index_patterns';
-import {
FIELD_FORMAT_IDS,
+ IndexPattern,
+ indexPatterns,
} from '../../plugins/data/public';
+import { setFieldFormats } from '../../plugins/data/public/services';
+
+setFieldFormats({
+ getDefaultInstance: () => ({
+ getConverterFor: () => value => value,
+ convert: value => JSON.stringify(value)
+ }),
+});
+
import { getFieldFormatsRegistry } from './stub_field_formats';
-export default function StubIndexPattern(pattern, getConfig, timeField, fields, uiSettings) {
+export default function StubIndexPattern(pattern, getConfig, timeField, fields, uiSettings) {
const registeredFieldFormats = getFieldFormatsRegistry(uiSettings);
this.id = pattern;
@@ -49,11 +55,11 @@ export default function StubIndexPattern(pattern, getConfig, timeField, fields,
this.getSourceFiltering = sinon.stub();
this.metaFields = ['_id', '_type', '_source'];
this.fieldFormatMap = {};
- this.routes = getRoutes();
+ this.routes = indexPatterns.getRoutes();
this.getComputedFields = IndexPattern.prototype.getComputedFields.bind(this);
- this.flattenHit = flattenHitWrapper(this, this.metaFields);
- this.formatHit = formatHitProvider(this, registeredFieldFormats.getDefaultInstance(FIELD_FORMAT_IDS.STRING));
+ this.flattenHit = indexPatterns.flattenHitWrapper(this, this.metaFields);
+ this.formatHit = indexPatterns.formatHitProvider(this, registeredFieldFormats.getDefaultInstance(FIELD_FORMAT_IDS.STRING));
this.fieldsFetcher = { apiClient: { baseUrl: '' } };
this.formatField = this.formatHit.formatField;
diff --git a/tasks/config/run.js b/tasks/config/run.js
index e4071c8b7d0abc..97a0f381f2aa48 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -269,7 +269,6 @@ module.exports = function (grunt) {
'--config', 'test/plugin_functional/config.js',
'--bail',
'--debug',
- '--kibana-install-dir', KIBANA_INSTALL_DIR,
],
}),
diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
index bc70339bd1a665..d72722af06bffb 100644
--- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
+++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
@@ -72,7 +72,7 @@ export default function ({ getService }) {
readFromDocValues: true,
},
{
- aggregatable: true,
+ aggregatable: false,
esTypes: [
'keyword'
],
@@ -156,7 +156,7 @@ export default function ({ getService }) {
readFromDocValues: true,
},
{
- aggregatable: true,
+ aggregatable: false,
esTypes: [
'keyword'
],
diff --git a/test/common/services/kibana_server/kibana_server.ts b/test/common/services/kibana_server/kibana_server.ts
index f7b7885840455e..16039d6fee8335 100644
--- a/test/common/services/kibana_server/kibana_server.ts
+++ b/test/common/services/kibana_server/kibana_server.ts
@@ -32,7 +32,7 @@ export function KibanaServerProvider({ getService }: FtrProviderContext) {
const kbn = new KbnClient(log, [url], defaults);
if (defaults) {
- lifecycle.on('beforeTests', async () => {
+ lifecycle.beforeTests.add(async () => {
await kbn.uiSettings.update(defaults);
});
}
diff --git a/test/examples/README.md b/test/examples/README.md
new file mode 100644
index 00000000000000..44656f949bc72a
--- /dev/null
+++ b/test/examples/README.md
@@ -0,0 +1,23 @@
+# Example plugin functional tests
+
+This folder contains functional tests for the example plugins.
+
+## Run the test
+
+To run these tests during development you can use the following commands:
+
+```
+# Start the test server (can continue running)
+node scripts/functional_tests_server.js --config test/examples/config.js
+# Start a test run
+node scripts/functional_test_runner.js --config test/examples/config.js
+```
+
+## Run Kibana with a test plugin
+
+In case you want to start Kibana with the example plugins, you can just run:
+
+```
+yarn start --run-examples
+```
+
diff --git a/test/examples/config.js b/test/examples/config.js
new file mode 100644
index 00000000000000..b954390dc54ad1
--- /dev/null
+++ b/test/examples/config.js
@@ -0,0 +1,55 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import path from 'path';
+import { services } from '../plugin_functional/services';
+
+export default async function ({ readConfigFile }) {
+ const functionalConfig = await readConfigFile(require.resolve('../functional/config'));
+
+ return {
+ testFiles: [
+ require.resolve('./search'),
+ ],
+ services: {
+ ...functionalConfig.get('services'),
+ ...services,
+ },
+ pageObjects: functionalConfig.get('pageObjects'),
+ servers: functionalConfig.get('servers'),
+ esTestCluster: functionalConfig.get('esTestCluster'),
+ apps: functionalConfig.get('apps'),
+ esArchiver: {
+ directory: path.resolve(__dirname, '../es_archives')
+ },
+ screenshots: functionalConfig.get('screenshots'),
+ junit: {
+ reportName: 'Example plugin functional tests',
+ },
+ kbnTestServer: {
+ ...functionalConfig.get('kbnTestServer'),
+ serverArgs: [
+ ...functionalConfig.get('kbnTestServer.serverArgs'),
+ '--run-examples',
+ // Required to run examples
+ '--env.name=development',
+ ],
+ },
+ };
+}
diff --git a/test/plugin_functional/test_suites/search/demo_data.ts b/test/examples/search/demo_data.ts
similarity index 100%
rename from test/plugin_functional/test_suites/search/demo_data.ts
rename to test/examples/search/demo_data.ts
diff --git a/test/plugin_functional/test_suites/search/es_search.ts b/test/examples/search/es_search.ts
similarity index 100%
rename from test/plugin_functional/test_suites/search/es_search.ts
rename to test/examples/search/es_search.ts
diff --git a/test/plugin_functional/test_suites/search/index.ts b/test/examples/search/index.ts
similarity index 100%
rename from test/plugin_functional/test_suites/search/index.ts
rename to test/examples/search/index.ts
diff --git a/test/functional/apps/dashboard/full_screen_mode.js b/test/functional/apps/dashboard/full_screen_mode.js
index e18fd47b39b16b..bf549ec21a6d38 100644
--- a/test/functional/apps/dashboard/full_screen_mode.js
+++ b/test/functional/apps/dashboard/full_screen_mode.js
@@ -78,7 +78,6 @@ export default function ({ getService, getPageObjects }) {
const logoButton = await PageObjects.dashboard.getExitFullScreenLogoButton();
await logoButton.moveMouseTo();
await PageObjects.dashboard.clickExitFullScreenTextButton();
-
await retry.try(async () => {
const isChromeVisible = await PageObjects.common.isChromeVisible();
expect(isChromeVisible).to.be(true);
diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js
index 94b2941ecd3d18..58eef9fbf6b877 100644
--- a/test/functional/apps/discover/_discover.js
+++ b/test/functional/apps/discover/_discover.js
@@ -25,7 +25,6 @@ export default function ({ getService, getPageObjects }) {
const esArchiver = getService('esArchiver');
const browser = getService('browser');
const kibanaServer = getService('kibanaServer');
- const filterBar = getService('filterBar');
const queryBar = getService('queryBar');
const PageObjects = getPageObjects(['common', 'discover', 'header', 'timePicker']);
const defaultSettings = {
@@ -173,20 +172,6 @@ export default function ({ getService, getPageObjects }) {
});
- describe('filter editor', function () {
- it('should add a phrases filter', async function () {
- await filterBar.addFilter('extension.raw', 'is one of', 'jpg');
- expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(true);
- });
-
- it('should show the phrases if you re-open a phrases filter', async function () {
- await filterBar.clickEditFilter('extension.raw', 'jpg');
- const phrases = await filterBar.getFilterEditorSelectedPhrases();
- expect(phrases.length).to.be(1);
- expect(phrases[0]).to.be('jpg');
- });
- });
-
describe('data-shared-item', function () {
it('should have correct data-shared-item title and description', async () => {
const expected = {
diff --git a/test/functional/apps/discover/_filter_editor.js b/test/functional/apps/discover/_filter_editor.js
new file mode 100644
index 00000000000000..cab16252add4a6
--- /dev/null
+++ b/test/functional/apps/discover/_filter_editor.js
@@ -0,0 +1,73 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+import expect from '@kbn/expect';
+
+export default function ({ getService, getPageObjects }) {
+ const log = getService('log');
+ const retry = getService('retry');
+ const esArchiver = getService('esArchiver');
+ const kibanaServer = getService('kibanaServer');
+ const filterBar = getService('filterBar');
+ const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);
+ const defaultSettings = {
+ defaultIndex: 'logstash-*',
+ };
+
+ describe('discover filter editor', function describeIndexTests() {
+
+ before(async function () {
+ log.debug('load kibana index with default index pattern');
+ await esArchiver.loadIfNeeded('discover');
+
+ // and load a set of makelogs data
+ await esArchiver.loadIfNeeded('logstash_functional');
+ await kibanaServer.uiSettings.replace(defaultSettings);
+ log.debug('discover filter editor');
+ await PageObjects.common.navigateToApp('discover');
+ await PageObjects.timePicker.setDefaultAbsoluteRange();
+ });
+
+ describe('filter editor', function () {
+ it('should add a phrases filter', async function () {
+ await filterBar.addFilter('extension.raw', 'is one of', 'jpg');
+ expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(true);
+ });
+
+ it('should show the phrases if you re-open a phrases filter', async function () {
+ await filterBar.clickEditFilter('extension.raw', 'jpg');
+ const phrases = await filterBar.getFilterEditorSelectedPhrases();
+ expect(phrases.length).to.be(1);
+ expect(phrases[0]).to.be('jpg');
+ await filterBar.ensureFieldEditorModalIsClosed();
+ });
+
+ it('should support filtering on nested fields', async () => {
+ await filterBar.addFilter('nestedField.child', 'is', 'nestedValue');
+ expect(await filterBar.hasFilter('nestedField.child', 'nestedValue')).to.be(true);
+ await retry.try(async function () {
+ expect(await PageObjects.discover.getHitCount()).to.be(
+ '1'
+ );
+ });
+ });
+ });
+ });
+}
diff --git a/test/functional/apps/discover/index.js b/test/functional/apps/discover/index.js
index 902490bebd1acd..28df897b67c099 100644
--- a/test/functional/apps/discover/index.js
+++ b/test/functional/apps/discover/index.js
@@ -34,6 +34,7 @@ export default function ({ getService, loadTestFile }) {
loadTestFile(require.resolve('./_saved_queries'));
loadTestFile(require.resolve('./_discover'));
+ loadTestFile(require.resolve('./_filter_editor'));
loadTestFile(require.resolve('./_errors'));
loadTestFile(require.resolve('./_field_data'));
loadTestFile(require.resolve('./_shared_links'));
diff --git a/test/functional/services/failure_debugging.ts b/test/functional/services/failure_debugging.ts
index e2be69d7797992..cd12f1b75c8281 100644
--- a/test/functional/services/failure_debugging.ts
+++ b/test/functional/services/failure_debugging.ts
@@ -65,5 +65,6 @@ export async function FailureDebuggingProvider({ getService }: FtrProviderContex
await Promise.all([screenshots.takeForFailure(name), logCurrentUrl(), savePageHtml(name)]);
}
- lifecycle.on('testFailure', onFailure).on('testHookFailure', onFailure);
+ lifecycle.testFailure.add(onFailure);
+ lifecycle.testHookFailure.add(onFailure);
}
diff --git a/test/functional/services/filter_bar.ts b/test/functional/services/filter_bar.ts
index adf0f2266ba178..9d494b1e6d950c 100644
--- a/test/functional/services/filter_bar.ts
+++ b/test/functional/services/filter_bar.ts
@@ -166,6 +166,7 @@ export function FilterBarProvider({ getService, getPageObjects }: FtrProviderCon
if (cancelSaveFilterModalButtonExists) {
await testSubjects.click('cancelSaveFilter');
}
+ await testSubjects.waitForDeleted('cancelSaveFilter');
}
/**
diff --git a/test/functional/services/remote/poll_for_log_entry.ts b/test/functional/services/remote/poll_for_log_entry.ts
index 71e2711906fce7..0bd5d94f892b0e 100644
--- a/test/functional/services/remote/poll_for_log_entry.ts
+++ b/test/functional/services/remote/poll_for_log_entry.ts
@@ -29,7 +29,7 @@ export function pollForLogEntry$(
driver: WebDriver,
type: string,
ms: number,
- stop$: Rx.Observable
+ stop$: Rx.Observable
) {
const logCtrl = driver.manage().logs();
const poll$ = new Rx.BehaviorSubject(undefined);
diff --git a/test/functional/services/remote/remote.ts b/test/functional/services/remote/remote.ts
index 380c33e93ad901..90ff55fbebde55 100644
--- a/test/functional/services/remote/remote.ts
+++ b/test/functional/services/remote/remote.ts
@@ -80,7 +80,7 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
driver,
logging.Type.BROWSER,
config.get('browser.logPollingMs'),
- lifecycle.cleanup$ as any
+ lifecycle.cleanup.after$
)
.pipe(
mergeMap(logEntry => {
@@ -110,7 +110,7 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
}
}
- lifecycle.on('beforeTests', async () => {
+ lifecycle.beforeTests.add(async () => {
// hard coded default, can be overridden per suite using `browser.setWindowSize()`
// and will be automatically reverted after each suite
await driver
@@ -120,7 +120,7 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
});
const windowSizeStack: Array<{ width: number; height: number }> = [];
- lifecycle.on('beforeTestSuite', async () => {
+ lifecycle.beforeTestSuite.add(async () => {
windowSizeStack.unshift(
await driver
.manage()
@@ -129,11 +129,11 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
);
});
- lifecycle.on('beforeEachTest', async () => {
+ lifecycle.beforeEachTest.add(async () => {
await driver.manage().setTimeouts({ implicit: config.get('timeouts.find') });
});
- lifecycle.on('afterTestSuite', async () => {
+ lifecycle.afterTestSuite.add(async () => {
const { width, height } = windowSizeStack.shift()!;
await driver
.manage()
@@ -143,7 +143,7 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
await clearBrowserStorage('localStorage');
});
- lifecycle.on('cleanup', async () => {
+ lifecycle.cleanup.add(async () => {
if (logSubscription) {
await new Promise(r => logSubscription!.add(r));
}
diff --git a/test/functional/services/remote/webdriver.ts b/test/functional/services/remote/webdriver.ts
index 50303fbad7aab2..1a7abc63170753 100644
--- a/test/functional/services/remote/webdriver.ts
+++ b/test/functional/services/remote/webdriver.ts
@@ -115,9 +115,9 @@ async function attemptToCreateCommand(
session,
logging.Type.BROWSER,
logPollingMs,
- lifecycle.cleanup$
+ lifecycle.cleanup.after$
).pipe(
- takeUntil(lifecycle.cleanup$),
+ takeUntil(lifecycle.cleanup.after$),
map(({ message, level: { name: level } }) => ({
message: message.replace(/\\n/g, '\n'),
level,
@@ -151,7 +151,7 @@ async function attemptToCreateCommand(
}
const { input, chunk$, cleanup } = await createStdoutSocket();
- lifecycle.on('cleanup', cleanup);
+ lifecycle.cleanup.add(cleanup);
const session = await new Builder()
.forBrowser(browserType)
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index 69f958fb91f603..ae4fa1578fb2be 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
- "@elastic/eui": "16.1.0",
+ "@elastic/eui": "17.0.0",
"react": "^16.12.0",
"react-dom": "^16.12.0"
}
diff --git a/test/plugin_functional/config.js b/test/plugin_functional/config.js
index a6316c607a7c79..d8ce12d1fc612f 100644
--- a/test/plugin_functional/config.js
+++ b/test/plugin_functional/config.js
@@ -33,7 +33,6 @@ export default async function ({ readConfigFile }) {
require.resolve('./test_suites/app_plugins'),
require.resolve('./test_suites/custom_visualizations'),
require.resolve('./test_suites/panel_actions'),
- require.resolve('./test_suites/search'),
/**
* @todo Work on re-enabling this test suite after this is merged. These tests pass
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index 96a5e26a741093..32da6eade2b420 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -7,7 +7,7 @@
},
"license": "Apache-2.0",
"dependencies": {
- "@elastic/eui": "16.1.0",
+ "@elastic/eui": "17.0.0",
"react": "^16.12.0"
}
}
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
index e95aa04ddd6b1f..0ab65667d6f827 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
@@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
- "@elastic/eui": "16.1.0",
+ "@elastic/eui": "17.0.0",
"react": "^16.12.0"
},
"scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/legacy.ts b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/legacy.ts
index a310403c86b5d8..1928d7ac72313b 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/legacy.ts
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/legacy.ts
@@ -22,7 +22,6 @@ import 'uiExports/embeddableFactories';
import 'uiExports/embeddableActions';
import { npSetup, npStart } from 'ui/new_platform';
-import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder';
import { ExitFullScreenButton } from 'ui/exit_full_screen';
import uiRoutes from 'ui/routes';
// @ts-ignore
@@ -39,7 +38,6 @@ export const setup = pluginInstance.setup(npSetup.core, {
embeddable: npSetup.plugins.embeddable,
inspector: npSetup.plugins.inspector,
__LEGACY: {
- SavedObjectFinder,
ExitFullScreenButton,
},
});
@@ -64,7 +62,6 @@ export const start = pluginInstance.start(npStart.core, {
inspector: npStart.plugins.inspector,
uiActions: npStart.plugins.uiActions,
__LEGACY: {
- SavedObjectFinder,
ExitFullScreenButton,
onRenderComplete: (renderCompleteListener: () => void) => {
if (rendered) {
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
index 6b82a67b9fcdae..adf898d9af2c71 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/public/np_ready/public/plugin.tsx
@@ -38,6 +38,10 @@ import {
ContactCardEmbeddableFactory,
} from './embeddable_api';
import { App } from './app';
+import {
+ SavedObjectFinderProps,
+ SavedObjectFinderUi,
+} from '../../../../../../../src/plugins/kibana_react/public/saved_objects';
import {
IEmbeddableStart,
IEmbeddableSetup,
@@ -47,7 +51,6 @@ export interface SetupDependencies {
embeddable: IEmbeddableSetup;
inspector: InspectorSetupContract;
__LEGACY: {
- SavedObjectFinder: React.ComponentType;
ExitFullScreenButton: React.ComponentType;
};
}
@@ -57,7 +60,6 @@ interface StartDependencies {
uiActions: IUiActionsStart;
inspector: InspectorStartContract;
__LEGACY: {
- SavedObjectFinder: React.ComponentType;
ExitFullScreenButton: React.ComponentType;
onRenderComplete: (onRenderComplete: () => void) => void;
};
@@ -99,6 +101,13 @@ export class EmbeddableExplorerPublicPlugin
plugins.__LEGACY.onRenderComplete(() => {
const root = document.getElementById(REACT_ROOT_ID);
+ const SavedObjectFinder = (props: SavedObjectFinderProps) => (
+
+ );
ReactDOM.render(
,
root
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
index f874cecd5d812c..6f661ab2a79e17 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
@@ -8,7 +8,7 @@
},
"license": "Apache-2.0",
"dependencies": {
- "@elastic/eui": "16.1.0",
+ "@elastic/eui": "17.0.0",
"react": "^16.12.0"
},
"scripts": {
diff --git a/test/visual_regression/services/visual_testing/visual_testing.ts b/test/visual_regression/services/visual_testing/visual_testing.ts
index fd31a4d8b6e4fd..4ad97f8d987172 100644
--- a/test/visual_regression/services/visual_testing/visual_testing.ts
+++ b/test/visual_regression/services/visual_testing/visual_testing.ts
@@ -54,7 +54,7 @@ export async function VisualTestingProvider({ getService }: FtrProviderContext)
const lifecycle = getService('lifecycle');
let currentTest: Test | undefined;
- lifecycle.on('beforeEachTest', (test: Test) => {
+ lifecycle.beforeEachTest.add(test => {
currentTest = test;
});
diff --git a/x-pack/dev-tools/jest/create_jest_config.js b/x-pack/dev-tools/jest/create_jest_config.js
index 199232262773d3..f8d07668d0aae1 100644
--- a/x-pack/dev-tools/jest/create_jest_config.js
+++ b/x-pack/dev-tools/jest/create_jest_config.js
@@ -20,7 +20,8 @@ export function createJestConfig({ kibanaDirectory, xPackKibanaDirectory }) {
'uiExports/(.*)': fileMockPath,
'^src/core/(.*)': `${kibanaDirectory}/src/core/$1`,
'^src/legacy/(.*)': `${kibanaDirectory}/src/legacy/$1`,
- '^plugins/watcher/models/(.*)': `${xPackKibanaDirectory}/legacy/plugins/watcher/public/models/$1`,
+ '^plugins/watcher/np_ready/application/models/(.*)':
+ `${xPackKibanaDirectory}/legacy/plugins/watcher/public/np_ready/application/models/$1`,
'^plugins/([^/.]*)(.*)': `${kibanaDirectory}/src/legacy/core_plugins/$1/public$2`,
'^legacy/plugins/xpack_main/(.*);': `${xPackKibanaDirectory}/legacy/plugins/xpack_main/public/$1`,
'\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': fileMockPath,
diff --git a/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts b/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
index b4d73cc4759d77..c0a01bc85e9169 100644
--- a/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
+++ b/x-pack/legacy/plugins/actions/server/action_type_registry.test.ts
@@ -18,7 +18,7 @@ const actionTypeRegistryParams = {
beforeEach(() => jest.resetAllMocks());
const executor: ExecutorType = async options => {
- return { status: 'ok' };
+ return { status: 'ok', actionId: options.actionId };
};
describe('register()', () => {
diff --git a/x-pack/legacy/plugins/actions/server/actions_client.test.ts b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
index 1c10d1b1a83af2..1cbf3949d20f8c 100644
--- a/x-pack/legacy/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/legacy/plugins/actions/server/actions_client.test.ts
@@ -30,7 +30,7 @@ const actionTypeRegistryParams = {
let actionsClient: ActionsClient;
let actionTypeRegistry: ActionTypeRegistry;
const executor: ExecutorType = async options => {
- return { status: 'ok' };
+ return { status: 'ok', actionId: options.actionId };
};
beforeEach(() => {
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
index a378d8a4b9b558..dd2bd328ce53fe 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
@@ -174,19 +174,17 @@ async function executor(
result = await sendEmail(logger, sendEmailOptions);
} catch (err) {
const message = i18n.translate('xpack.actions.builtin.email.errorSendingErrorMessage', {
- defaultMessage: 'error in action "{actionId}" sending email: {errorMessage}',
- values: {
- actionId,
- errorMessage: err.message,
- },
+ defaultMessage: 'error sending email',
});
return {
status: 'error',
+ actionId,
message,
+ serviceMessage: err.message,
};
}
- return { status: 'ok', data: result };
+ return { status: 'ok', data: result, actionId };
}
// utilities
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts
index 01853ee9cb870b..0e9fe0483ee1ea 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/es_index.ts
@@ -60,13 +60,11 @@ async function executor(
if (config.index == null && params.index == null) {
const message = i18n.translate('xpack.actions.builtin.esIndex.indexParamRequiredErrorMessage', {
- defaultMessage: 'index param needs to be set because not set in config for action {actionId}',
- values: {
- actionId,
- },
+ defaultMessage: 'index param needs to be set because not set in config for action',
});
return {
status: 'error',
+ actionId,
message,
};
}
@@ -101,17 +99,15 @@ async function executor(
result = await services.callCluster('bulk', bulkParams);
} catch (err) {
const message = i18n.translate('xpack.actions.builtin.esIndex.errorIndexingErrorMessage', {
- defaultMessage: 'error in action "{actionId}" indexing data: {errorMessage}',
- values: {
- actionId,
- errorMessage: err.message,
- },
+ defaultMessage: 'error indexing documents',
});
return {
status: 'error',
+ actionId,
message,
+ serviceMessage: err.message,
};
}
- return { status: 'ok', data: result };
+ return { status: 'ok', data: result, actionId };
}
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts
index 1d453d2bd23408..def3b7eea21d96 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.test.ts
@@ -148,11 +148,12 @@ describe('execute()', () => {
}
`);
expect(actionResponse).toMatchInlineSnapshot(`
- Object {
- "data": "data-here",
- "status": "ok",
- }
- `);
+ Object {
+ "actionId": "some-action-id",
+ "data": "data-here",
+ "status": "ok",
+ }
+ `);
});
test('should succeed with maximal valid params for trigger', async () => {
@@ -212,11 +213,12 @@ describe('execute()', () => {
}
`);
expect(actionResponse).toMatchInlineSnapshot(`
- Object {
- "data": "data-here",
- "status": "ok",
- }
- `);
+ Object {
+ "actionId": "some-action-id",
+ "data": "data-here",
+ "status": "ok",
+ }
+ `);
});
test('should succeed with maximal valid params for acknowledge', async () => {
@@ -267,11 +269,12 @@ describe('execute()', () => {
}
`);
expect(actionResponse).toMatchInlineSnapshot(`
- Object {
- "data": "data-here",
- "status": "ok",
- }
- `);
+ Object {
+ "actionId": "some-action-id",
+ "data": "data-here",
+ "status": "ok",
+ }
+ `);
});
test('should succeed with maximal valid params for resolve', async () => {
@@ -322,11 +325,12 @@ describe('execute()', () => {
}
`);
expect(actionResponse).toMatchInlineSnapshot(`
- Object {
- "data": "data-here",
- "status": "ok",
- }
- `);
+ Object {
+ "actionId": "some-action-id",
+ "data": "data-here",
+ "status": "ok",
+ }
+ `);
});
test('should fail when sendPagerdury throws', async () => {
@@ -348,11 +352,13 @@ describe('execute()', () => {
};
const actionResponse = await actionType.executor(executorOptions);
expect(actionResponse).toMatchInlineSnapshot(`
- Object {
- "message": "error in pagerduty action \\"some-action-id\\" posting event: doing some testing",
- "status": "error",
- }
- `);
+ Object {
+ "actionId": "some-action-id",
+ "message": "error posting pagerduty event",
+ "serviceMessage": "doing some testing",
+ "status": "error",
+ }
+ `);
});
test('should fail when sendPagerdury returns 429', async () => {
@@ -374,12 +380,13 @@ describe('execute()', () => {
};
const actionResponse = await actionType.executor(executorOptions);
expect(actionResponse).toMatchInlineSnapshot(`
- Object {
- "message": "error in pagerduty action \\"some-action-id\\" posting event: status 429, retry later",
- "retry": true,
- "status": "error",
- }
- `);
+ Object {
+ "actionId": "some-action-id",
+ "message": "error posting pagerduty event: http status 429, retry later",
+ "retry": true,
+ "status": "error",
+ }
+ `);
});
test('should fail when sendPagerdury returns 501', async () => {
@@ -401,12 +408,13 @@ describe('execute()', () => {
};
const actionResponse = await actionType.executor(executorOptions);
expect(actionResponse).toMatchInlineSnapshot(`
- Object {
- "message": "error in pagerduty action \\"some-action-id\\" posting event: status 501, retry later",
- "retry": true,
- "status": "error",
- }
- `);
+ Object {
+ "actionId": "some-action-id",
+ "message": "error posting pagerduty event: http status 501, retry later",
+ "retry": true,
+ "status": "error",
+ }
+ `);
});
test('should fail when sendPagerdury returns 418', async () => {
@@ -428,10 +436,11 @@ describe('execute()', () => {
};
const actionResponse = await actionType.executor(executorOptions);
expect(actionResponse).toMatchInlineSnapshot(`
- Object {
- "message": "error in pagerduty action \\"some-action-id\\" posting event: unexpected status 418",
- "status": "error",
- }
- `);
+ Object {
+ "actionId": "some-action-id",
+ "message": "error posting pagerduty event: unexpected status 418",
+ "status": "error",
+ }
+ `);
});
});
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts
index ec45e298d39022..e1437b8eef5542 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/pagerduty.ts
@@ -123,16 +123,14 @@ async function executor(
response = await postPagerduty({ apiUrl, data, headers, services });
} catch (err) {
const message = i18n.translate('xpack.actions.builtin.pagerduty.postingErrorMessage', {
- defaultMessage: 'error in pagerduty action "{actionId}" posting event: {errorMessage}',
- values: {
- actionId,
- errorMessage: err.message,
- },
+ defaultMessage: 'error posting pagerduty event',
});
logger.warn(`error thrown posting pagerduty event: ${err.message}`);
return {
status: 'error',
+ actionId,
message,
+ serviceMessage: err.message,
};
}
@@ -141,38 +139,37 @@ async function executor(
if (response.status === 202) {
return {
status: 'ok',
+ actionId,
data: response.data,
};
}
if (response.status === 429 || response.status >= 500) {
const message = i18n.translate('xpack.actions.builtin.pagerduty.postingRetryErrorMessage', {
- defaultMessage:
- 'error in pagerduty action "{actionId}" posting event: status {status}, retry later',
+ defaultMessage: 'error posting pagerduty event: http status {status}, retry later',
values: {
- actionId,
status: response.status,
},
});
return {
status: 'error',
+ actionId,
message,
retry: true,
};
}
const message = i18n.translate('xpack.actions.builtin.pagerduty.postingUnexpectedErrorMessage', {
- defaultMessage:
- 'error in pagerduty action "{actionId}" posting event: unexpected status {status}',
+ defaultMessage: 'error posting pagerduty event: unexpected status {status}',
values: {
- actionId,
status: response.status,
},
});
return {
status: 'error',
+ actionId,
message,
};
}
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
index f17430b734c66b..c2af29051d8dd9 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/server_log.ts
@@ -52,17 +52,15 @@ async function executor(
logger[params.level](params.message);
} catch (err) {
const message = i18n.translate('xpack.actions.builtin.serverLog.errorLoggingErrorMessage', {
- defaultMessage: 'error in action "{actionId}" logging message: {errorMessage}',
- values: {
- actionId,
- errorMessage: err.message,
- },
+ defaultMessage: 'error logging message',
});
return {
status: 'error',
message,
+ serviceMessage: err.message,
+ actionId,
};
}
- return { status: 'ok' };
+ return { status: 'ok', actionId };
}
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
index 8ec569a69ff235..29b89150e3990f 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/slack.ts
@@ -69,7 +69,7 @@ async function slackExecutor(
result = await webhook.send(message);
} catch (err) {
if (err.original == null || err.original.response == null) {
- return errorResult(actionId, err.message);
+ return serviceErrorResult(actionId, err.message);
}
const { status, statusText, headers } = err.original.response;
@@ -88,7 +88,17 @@ async function slackExecutor(
);
}
- return errorResult(actionId, `${err.message} - ${statusText}`);
+ const errMessage = i18n.translate(
+ 'xpack.actions.builtin.slack.unexpectedHttpResponseErrorMessage',
+ {
+ defaultMessage: 'unexpected http response from slack: {httpStatus} {httpStatusText}',
+ values: {
+ httpStatus: status,
+ httpStatusText: statusText,
+ },
+ }
+ );
+ return errorResult(actionId, errMessage);
}
if (result == null) {
@@ -102,55 +112,52 @@ async function slackExecutor(
}
if (result.text !== 'ok') {
- const errMessage = i18n.translate(
- 'xpack.actions.builtin.slack.unexpectedTextResponseErrorMessage',
- {
- defaultMessage: 'unexpected text response from slack',
- }
- );
- return errorResult(actionId, errMessage);
+ return serviceErrorResult(actionId, result.text);
}
- return successResult(result);
+ return successResult(actionId, result);
}
-function successResult(data: any): ActionTypeExecutorResult {
- return { status: 'ok', data };
+function successResult(actionId: string, data: any): ActionTypeExecutorResult {
+ return { status: 'ok', data, actionId };
}
-function errorResult(id: string, message: string): ActionTypeExecutorResult {
+function errorResult(actionId: string, message: string): ActionTypeExecutorResult {
+ return {
+ status: 'error',
+ message,
+ actionId,
+ };
+}
+function serviceErrorResult(actionId: string, serviceMessage: string): ActionTypeExecutorResult {
const errMessage = i18n.translate('xpack.actions.builtin.slack.errorPostingErrorMessage', {
- defaultMessage: 'an error occurred in action "{id}" posting a slack message: {message}',
- values: {
- id,
- message,
- },
+ defaultMessage: 'error posting slack message',
});
return {
status: 'error',
message: errMessage,
+ actionId,
+ serviceMessage,
};
}
-function retryResult(id: string, message: string): ActionTypeExecutorResult {
+function retryResult(actionId: string, message: string): ActionTypeExecutorResult {
const errMessage = i18n.translate(
'xpack.actions.builtin.slack.errorPostingRetryLaterErrorMessage',
{
- defaultMessage: 'an error occurred in action "{id}" posting a slack message, retry later',
- values: {
- id,
- },
+ defaultMessage: 'error posting a slack message, retry later',
}
);
return {
status: 'error',
message: errMessage,
retry: true,
+ actionId,
};
}
function retryResultSeconds(
- id: string,
+ actionId: string,
message: string,
retryAfter: number
): ActionTypeExecutorResult {
@@ -160,12 +167,9 @@ function retryResultSeconds(
const errMessage = i18n.translate(
'xpack.actions.builtin.slack.errorPostingRetryDateErrorMessage',
{
- defaultMessage:
- 'an error occurred in action "{id}" posting a slack message, retry at {retryString}: {message}',
+ defaultMessage: 'error posting a slack message, retry at {retryString}',
values: {
- id,
retryString,
- message,
},
}
);
@@ -173,5 +177,7 @@ function retryResultSeconds(
status: 'error',
message: errMessage,
retry,
+ actionId,
+ serviceMessage: message,
};
}
diff --git a/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.ts b/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.ts
index b91fd86b0b6824..06fe2fb0e591c0 100644
--- a/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.ts
+++ b/x-pack/legacy/plugins/actions/server/builtin_action_types/webhook.ts
@@ -113,7 +113,7 @@ export async function executor(
} = result;
logger.debug(`response from webhook action "${actionId}": [HTTP ${status}] ${statusText}`);
- return successResult(data);
+ return successResult(actionId, data);
} else {
const { error } = result;
@@ -139,70 +139,58 @@ export async function executor(
return errorResultInvalid(actionId, message);
}
- const message = i18n.translate('xpack.actions.builtin.webhook.unreachableRemoteWebhook', {
- defaultMessage: 'Unreachable Remote Webhook, are you sure the address is correct?',
- });
- logger.warn(`error on ${actionId} webhook action: ${message}`);
- return errorResultUnreachable(actionId, message);
+ logger.warn(`error on ${actionId} webhook action: unexpected error`);
+ return errorResultUnexpectedError(actionId);
}
}
// Action Executor Result w/ internationalisation
-function successResult(data: any): ActionTypeExecutorResult {
- return { status: 'ok', data };
+function successResult(actionId: string, data: any): ActionTypeExecutorResult {
+ return { status: 'ok', data, actionId };
}
-function errorResultInvalid(id: string, message: string): ActionTypeExecutorResult {
+function errorResultInvalid(actionId: string, serviceMessage: string): ActionTypeExecutorResult {
const errMessage = i18n.translate('xpack.actions.builtin.webhook.invalidResponseErrorMessage', {
- defaultMessage:
- 'Invalid Response: an error occurred in webhook action "{id}" calling a remote webhook: {message}',
- values: {
- id,
- message,
- },
+ defaultMessage: 'error calling webhook, invalid response',
});
return {
status: 'error',
message: errMessage,
+ actionId,
+ serviceMessage,
};
}
-function errorResultUnreachable(id: string, message: string): ActionTypeExecutorResult {
+function errorResultUnexpectedError(actionId: string): ActionTypeExecutorResult {
const errMessage = i18n.translate('xpack.actions.builtin.webhook.unreachableErrorMessage', {
- defaultMessage:
- 'Unreachable Webhook: an error occurred in webhook action "{id}" calling a remote webhook: {message}',
- values: {
- id,
- message,
- },
+ defaultMessage: 'error calling webhook, unexpected error',
});
return {
status: 'error',
message: errMessage,
+ actionId,
};
}
-function retryResult(id: string, message: string): ActionTypeExecutorResult {
+function retryResult(actionId: string, serviceMessage: string): ActionTypeExecutorResult {
const errMessage = i18n.translate(
'xpack.actions.builtin.webhook.invalidResponseRetryLaterErrorMessage',
{
- defaultMessage:
- 'Invalid Response: an error occurred in webhook action "{id}" calling a remote webhook, retry later',
- values: {
- id,
- },
+ defaultMessage: 'error calling webhook, retry later',
}
);
return {
status: 'error',
message: errMessage,
retry: true,
+ actionId,
+ serviceMessage,
};
}
function retryResultSeconds(
- id: string,
- message: string,
+ actionId: string,
+ serviceMessage: string,
retryAfter: number
): ActionTypeExecutorResult {
@@ -212,12 +200,9 @@ function retryResultSeconds(
const errMessage = i18n.translate(
'xpack.actions.builtin.webhook.invalidResponseRetryDateErrorMessage',
{
- defaultMessage:
- 'Invalid Response: an error occurred in webhook action "{id}" calling a remote webhook, retry at {retryString}: {message}',
+ defaultMessage: 'error calling webhook, retry at {retryString}',
values: {
- id,
retryString,
- message,
},
}
);
@@ -225,5 +210,7 @@ function retryResultSeconds(
status: 'error',
message: errMessage,
retry,
+ actionId,
+ serviceMessage,
};
}
diff --git a/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts b/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts
index 5ed67ae82b0ce5..6767468509d25c 100644
--- a/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/action_executor.test.ts
@@ -157,6 +157,7 @@ test('throws an error when config is invalid', async () => {
const result = await actionExecutor.execute(executeParams);
expect(result).toEqual({
+ actionId: '1',
status: 'error',
retry: false,
message: `error validating action type config: [param1]: expected value of type [string] but got [undefined]`,
@@ -188,6 +189,7 @@ test('throws an error when params is invalid', async () => {
const result = await actionExecutor.execute(executeParams);
expect(result).toEqual({
+ actionId: '1',
status: 'error',
retry: false,
message: `error validating action params: [param1]: expected value of type [string] but got [undefined]`,
diff --git a/x-pack/legacy/plugins/actions/server/lib/action_executor.ts b/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
index 1afb8a8870215a..c532b76a904d5a 100644
--- a/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/action_executor.ts
@@ -91,7 +91,7 @@ export class ActionExecutor {
validatedConfig = validateConfig(actionType, config);
validatedSecrets = validateSecrets(actionType, secrets);
} catch (err) {
- return { status: 'error', message: err.message, retry: false };
+ return { status: 'error', actionId, message: err.message, retry: false };
}
let result: ActionTypeExecutorResult | null = null;
@@ -113,7 +113,7 @@ export class ActionExecutor {
logger.debug(`action executed successfully: ${actionLabel}`);
// return basic response if none provided
- if (result == null) return { status: 'ok' };
+ if (result == null) return { status: 'ok', actionId };
return result;
}
diff --git a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
index a5bf42bc2cc019..41a7c17a02c5a3 100644
--- a/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/task_runner_factory.test.ts
@@ -94,7 +94,7 @@ test('executes the task by calling the executor with proper parameters', async (
taskInstance: mockedTaskInstance,
});
- mockedActionExecutor.execute.mockResolvedValueOnce({ status: 'ok' });
+ mockedActionExecutor.execute.mockResolvedValueOnce({ status: 'ok', actionId: '2' });
spaceIdToNamespace.mockReturnValueOnce('namespace-test');
mockedEncryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
id: '3',
@@ -154,6 +154,7 @@ test('throws an error with suggested retry logic when return status is error', a
});
mockedActionExecutor.execute.mockResolvedValueOnce({
status: 'error',
+ actionId: '2',
message: 'Error message',
data: { foo: true },
retry: false,
@@ -174,7 +175,7 @@ test('uses API key when provided', async () => {
taskInstance: mockedTaskInstance,
});
- mockedActionExecutor.execute.mockResolvedValueOnce({ status: 'ok' });
+ mockedActionExecutor.execute.mockResolvedValueOnce({ status: 'ok', actionId: '2' });
spaceIdToNamespace.mockReturnValueOnce('namespace-test');
mockedEncryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
id: '3',
@@ -217,7 +218,7 @@ test(`doesn't use API key when not provided`, async () => {
factory.initialize(taskRunnerFactoryInitializerParams);
const taskRunner = factory.create({ taskInstance: mockedTaskInstance });
- mockedActionExecutor.execute.mockResolvedValueOnce({ status: 'ok' });
+ mockedActionExecutor.execute.mockResolvedValueOnce({ status: 'ok', actionId: '2' });
spaceIdToNamespace.mockReturnValueOnce('namespace-test');
mockedEncryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
id: '3',
diff --git a/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.test.ts b/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.test.ts
index 4cb28728fb4216..28122c72baf654 100644
--- a/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.test.ts
+++ b/x-pack/legacy/plugins/actions/server/lib/validate_with_schema.test.ts
@@ -10,7 +10,7 @@ import { validateParams, validateConfig, validateSecrets } from './validate_with
import { ActionType, ExecutorType } from '../types';
const executor: ExecutorType = async options => {
- return { status: 'ok' };
+ return { status: 'ok', actionId: options.actionId };
};
test('should validate when there are no validators', () => {
diff --git a/x-pack/legacy/plugins/actions/server/routes/execute.test.ts b/x-pack/legacy/plugins/actions/server/routes/execute.test.ts
index cd5b9c7c4a7e84..b0ba5a8a0f5668 100644
--- a/x-pack/legacy/plugins/actions/server/routes/execute.test.ts
+++ b/x-pack/legacy/plugins/actions/server/routes/execute.test.ts
@@ -31,11 +31,11 @@ it('executes an action with proper parameters', async () => {
callCluster: jest.fn(),
savedObjectsClient: jest.fn(),
});
- mockedActionExecutor.execute.mockResolvedValueOnce({ status: 'ok' });
+ mockedActionExecutor.execute.mockResolvedValueOnce({ status: 'ok', actionId: '1' });
const { payload, statusCode } = await server.inject(request);
expect(statusCode).toBe(200);
- expect(payload).toBe('{"status":"ok"}');
+ expect(JSON.parse(payload)).toEqual({ status: 'ok', actionId: '1' });
expect(mockedActionExecutor.execute).toHaveBeenCalledWith({
actionId: '1',
diff --git a/x-pack/legacy/plugins/actions/server/types.ts b/x-pack/legacy/plugins/actions/server/types.ts
index 5a74241bc4829c..94b34034cd8b23 100644
--- a/x-pack/legacy/plugins/actions/server/types.ts
+++ b/x-pack/legacy/plugins/actions/server/types.ts
@@ -51,8 +51,10 @@ export interface FindActionResult extends ActionResult {
// the result returned from an action type executor function
export interface ActionTypeExecutorResult {
+ actionId: string;
status: 'ok' | 'error';
message?: string;
+ serviceMessage?: string;
data?: any;
retry?: null | boolean | Date;
}
diff --git a/x-pack/legacy/plugins/alerting/mappings.json b/x-pack/legacy/plugins/alerting/mappings.json
index f840c019d5e024..7a7446602351d5 100644
--- a/x-pack/legacy/plugins/alerting/mappings.json
+++ b/x-pack/legacy/plugins/alerting/mappings.json
@@ -25,6 +25,9 @@
"actionRef": {
"type": "keyword"
},
+ "actionTypeId": {
+ "type": "keyword"
+ },
"params": {
"enabled": false,
"type": "object"
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
index 08607f04a52355..8ff54e25a0c992 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.test.ts
@@ -74,6 +74,18 @@ describe('create()', () => {
actionGroups: ['default'],
async executor() {},
});
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ ],
+ });
savedObjectsClient.create.mockResolvedValueOnce({
id: '1',
type: 'alert',
@@ -87,6 +99,7 @@ describe('create()', () => {
{
group: 'default',
actionRef: 'action_0',
+ actionTypeId: 'test',
params: {
foo: true,
},
@@ -133,6 +146,7 @@ describe('create()', () => {
Object {
"actions": Array [
Object {
+ "actionTypeId": "test",
"group": "default",
"id": "1",
"params": Object {
@@ -157,6 +171,7 @@ describe('create()', () => {
"actions": Array [
Object {
"actionRef": "action_0",
+ "actionTypeId": "test",
"group": "default",
"params": Object {
"foo": true,
@@ -224,6 +239,184 @@ describe('create()', () => {
`);
});
+ test('creates an alert with multiple actions', async () => {
+ const alertsClient = new AlertsClient(alertsClientParams);
+ const data = getMockData({
+ actions: [
+ {
+ group: 'default',
+ id: '1',
+ params: {
+ foo: true,
+ },
+ },
+ {
+ group: 'default',
+ id: '1',
+ params: {
+ foo: true,
+ },
+ },
+ {
+ group: 'default',
+ id: '2',
+ params: {
+ foo: true,
+ },
+ },
+ ],
+ });
+ alertTypeRegistry.get.mockReturnValueOnce({
+ id: '123',
+ name: 'Test',
+ actionGroups: ['default'],
+ async executor() {},
+ });
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ {
+ id: '2',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test2',
+ },
+ references: [],
+ },
+ ],
+ });
+ savedObjectsClient.create.mockResolvedValueOnce({
+ id: '1',
+ type: 'alert',
+ attributes: {
+ alertTypeId: '123',
+ interval: '10s',
+ params: {
+ bar: true,
+ },
+ actions: [
+ {
+ group: 'default',
+ actionRef: 'action_0',
+ actionTypeId: 'test',
+ params: {
+ foo: true,
+ },
+ },
+ {
+ group: 'default',
+ actionRef: 'action_1',
+ actionTypeId: 'test',
+ params: {
+ foo: true,
+ },
+ },
+ {
+ group: 'default',
+ actionRef: 'action_2',
+ actionTypeId: 'test2',
+ params: {
+ foo: true,
+ },
+ },
+ ],
+ },
+ references: [
+ {
+ name: 'action_0',
+ type: 'action',
+ id: '1',
+ },
+ {
+ name: 'action_1',
+ type: 'action',
+ id: '1',
+ },
+ {
+ name: 'action_2',
+ type: 'action',
+ id: '2',
+ },
+ ],
+ });
+ taskManager.schedule.mockResolvedValueOnce({
+ id: 'task-123',
+ taskType: 'alerting:123',
+ scheduledAt: new Date(),
+ attempts: 1,
+ status: 'idle',
+ runAt: new Date(),
+ startedAt: null,
+ retryAt: null,
+ state: {},
+ params: {},
+ ownerId: null,
+ });
+ savedObjectsClient.update.mockResolvedValueOnce({
+ id: '1',
+ type: 'alert',
+ attributes: {
+ scheduledTaskId: 'task-123',
+ },
+ references: [],
+ });
+ const result = await alertsClient.create({ data });
+ expect(result).toMatchInlineSnapshot(`
+ Object {
+ "actions": Array [
+ Object {
+ "actionTypeId": "test",
+ "group": "default",
+ "id": "1",
+ "params": Object {
+ "foo": true,
+ },
+ },
+ Object {
+ "actionTypeId": "test",
+ "group": "default",
+ "id": "1",
+ "params": Object {
+ "foo": true,
+ },
+ },
+ Object {
+ "actionTypeId": "test2",
+ "group": "default",
+ "id": "2",
+ "params": Object {
+ "foo": true,
+ },
+ },
+ ],
+ "alertTypeId": "123",
+ "id": "1",
+ "interval": "10s",
+ "params": Object {
+ "bar": true,
+ },
+ "scheduledTaskId": "task-123",
+ }
+ `);
+ expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith([
+ {
+ id: '1',
+ type: 'action',
+ },
+ {
+ id: '2',
+ type: 'action',
+ },
+ ]);
+ });
+
test('creates a disabled alert', async () => {
const alertsClient = new AlertsClient(alertsClientParams);
const data = getMockData({ enabled: false });
@@ -233,6 +426,18 @@ describe('create()', () => {
actionGroups: ['default'],
async executor() {},
});
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ ],
+ });
savedObjectsClient.create.mockResolvedValueOnce({
id: '1',
type: 'alert',
@@ -247,6 +452,7 @@ describe('create()', () => {
{
group: 'default',
actionRef: 'action_0',
+ actionTypeId: 'test',
params: {
foo: true,
},
@@ -266,6 +472,7 @@ describe('create()', () => {
Object {
"actions": Array [
Object {
+ "actionTypeId": "test",
"group": "default",
"id": "1",
"params": Object {
@@ -306,6 +513,23 @@ describe('create()', () => {
);
});
+ test('throws error if loading actions fails', async () => {
+ const alertsClient = new AlertsClient(alertsClientParams);
+ const data = getMockData();
+ alertTypeRegistry.get.mockReturnValueOnce({
+ id: '123',
+ name: 'Test',
+ actionGroups: ['default'],
+ async executor() {},
+ });
+ savedObjectsClient.bulkGet.mockRejectedValueOnce(new Error('Test Error'));
+ await expect(alertsClient.create({ data })).rejects.toThrowErrorMatchingInlineSnapshot(
+ `"Test Error"`
+ );
+ expect(savedObjectsClient.create).not.toHaveBeenCalled();
+ expect(taskManager.schedule).not.toHaveBeenCalled();
+ });
+
test('throws error if create saved object fails', async () => {
const alertsClient = new AlertsClient(alertsClientParams);
const data = getMockData();
@@ -315,6 +539,18 @@ describe('create()', () => {
actionGroups: ['default'],
async executor() {},
});
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ ],
+ });
savedObjectsClient.create.mockRejectedValueOnce(new Error('Test failure'));
await expect(alertsClient.create({ data })).rejects.toThrowErrorMatchingInlineSnapshot(
`"Test failure"`
@@ -331,6 +567,18 @@ describe('create()', () => {
actionGroups: ['default'],
async executor() {},
});
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ ],
+ });
savedObjectsClient.create.mockResolvedValueOnce({
id: '1',
type: 'alert',
@@ -344,6 +592,7 @@ describe('create()', () => {
{
group: 'default',
actionRef: 'action_0',
+ actionTypeId: 'test',
params: {
foo: true,
},
@@ -381,6 +630,18 @@ describe('create()', () => {
actionGroups: ['default'],
async executor() {},
});
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ ],
+ });
savedObjectsClient.create.mockResolvedValueOnce({
id: '1',
type: 'alert',
@@ -394,6 +655,7 @@ describe('create()', () => {
{
group: 'default',
actionRef: 'action_0',
+ actionTypeId: 'test',
params: {
foo: true,
},
@@ -442,6 +704,18 @@ describe('create()', () => {
created: true,
result: { id: '123', api_key: 'abc' },
});
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ ],
+ });
savedObjectsClient.create.mockResolvedValueOnce({
id: '1',
type: 'alert',
@@ -455,6 +729,7 @@ describe('create()', () => {
{
group: 'default',
actionRef: 'action_0',
+ actionTypeId: 'test',
params: {
foo: true,
},
@@ -506,6 +781,7 @@ describe('create()', () => {
{
actionRef: 'action_0',
group: 'default',
+ actionTypeId: 'test',
params: { foo: true },
},
],
@@ -1149,6 +1425,18 @@ describe('update()', () => {
references: [],
version: '123',
});
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ ],
+ });
savedObjectsClient.update.mockResolvedValueOnce({
id: '1',
type: 'alert',
@@ -1162,6 +1450,7 @@ describe('update()', () => {
{
group: 'default',
actionRef: 'action_0',
+ actionTypeId: 'test',
params: {
foo: true,
},
@@ -1201,6 +1490,7 @@ describe('update()', () => {
Object {
"actions": Array [
Object {
+ "actionTypeId": "test",
"group": "default",
"id": "1",
"params": Object {
@@ -1226,6 +1516,7 @@ describe('update()', () => {
"actions": Array [
Object {
"actionRef": "action_0",
+ "actionTypeId": "test",
"group": "default",
"params": Object {
"foo": true,
@@ -1262,6 +1553,183 @@ describe('update()', () => {
`);
});
+ it('updates with multiple actions', async () => {
+ const alertsClient = new AlertsClient(alertsClientParams);
+ alertTypeRegistry.get.mockReturnValueOnce({
+ id: '123',
+ name: 'Test',
+ actionGroups: ['default'],
+ async executor() {},
+ });
+ savedObjectsClient.get.mockResolvedValueOnce({
+ id: '1',
+ type: 'alert',
+ attributes: {
+ enabled: true,
+ alertTypeId: '123',
+ scheduledTaskId: 'task-123',
+ },
+ references: [],
+ version: '123',
+ });
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ {
+ id: '2',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test2',
+ },
+ references: [],
+ },
+ ],
+ });
+ savedObjectsClient.update.mockResolvedValueOnce({
+ id: '1',
+ type: 'alert',
+ attributes: {
+ enabled: true,
+ interval: '10s',
+ params: {
+ bar: true,
+ },
+ actions: [
+ {
+ group: 'default',
+ actionRef: 'action_0',
+ actionTypeId: 'test',
+ params: {
+ foo: true,
+ },
+ },
+ {
+ group: 'default',
+ actionRef: 'action_1',
+ actionTypeId: 'test',
+ params: {
+ foo: true,
+ },
+ },
+ {
+ group: 'default',
+ actionRef: 'action_2',
+ actionTypeId: 'test2',
+ params: {
+ foo: true,
+ },
+ },
+ ],
+ scheduledTaskId: 'task-123',
+ },
+ references: [
+ {
+ name: 'action_0',
+ type: 'action',
+ id: '1',
+ },
+ {
+ name: 'action_1',
+ type: 'action',
+ id: '1',
+ },
+ {
+ name: 'action_2',
+ type: 'action',
+ id: '2',
+ },
+ ],
+ });
+ const result = await alertsClient.update({
+ id: '1',
+ data: {
+ interval: '10s',
+ name: 'abc',
+ tags: ['foo'],
+ params: {
+ bar: true,
+ },
+ actions: [
+ {
+ group: 'default',
+ id: '1',
+ params: {
+ foo: true,
+ },
+ },
+ {
+ group: 'default',
+ id: '1',
+ params: {
+ foo: true,
+ },
+ },
+ {
+ group: 'default',
+ id: '2',
+ params: {
+ foo: true,
+ },
+ },
+ ],
+ },
+ });
+ expect(result).toMatchInlineSnapshot(`
+ Object {
+ "actions": Array [
+ Object {
+ "actionTypeId": "test",
+ "group": "default",
+ "id": "1",
+ "params": Object {
+ "foo": true,
+ },
+ },
+ Object {
+ "actionTypeId": "test",
+ "group": "default",
+ "id": "1",
+ "params": Object {
+ "foo": true,
+ },
+ },
+ Object {
+ "actionTypeId": "test2",
+ "group": "default",
+ "id": "2",
+ "params": Object {
+ "foo": true,
+ },
+ },
+ ],
+ "enabled": true,
+ "id": "1",
+ "interval": "10s",
+ "params": Object {
+ "bar": true,
+ },
+ "scheduledTaskId": "task-123",
+ }
+ `);
+ expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith([
+ {
+ id: '1',
+ type: 'action',
+ },
+ {
+ id: '2',
+ type: 'action',
+ },
+ ]);
+ });
+
it('calls the createApiKey function', async () => {
const alertsClient = new AlertsClient(alertsClientParams);
alertTypeRegistry.get.mockReturnValueOnce({
@@ -1281,6 +1749,18 @@ describe('update()', () => {
references: [],
version: '123',
});
+ savedObjectsClient.bulkGet.mockResolvedValueOnce({
+ saved_objects: [
+ {
+ id: '1',
+ type: 'action',
+ attributes: {
+ actionTypeId: 'test',
+ },
+ references: [],
+ },
+ ],
+ });
alertsClientParams.createAPIKey.mockResolvedValueOnce({
created: true,
result: { id: '123', api_key: 'abc' },
@@ -1298,6 +1778,7 @@ describe('update()', () => {
{
group: 'default',
actionRef: 'action_0',
+ actionTypeId: 'test',
params: {
foo: true,
},
@@ -1338,6 +1819,7 @@ describe('update()', () => {
Object {
"actions": Array [
Object {
+ "actionTypeId": "test",
"group": "default",
"id": "1",
"params": Object {
@@ -1364,6 +1846,7 @@ describe('update()', () => {
"actions": Array [
Object {
"actionRef": "action_0",
+ "actionTypeId": "test",
"group": "default",
"params": Object {
"foo": true,
diff --git a/x-pack/legacy/plugins/alerting/server/alerts_client.ts b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
index 3916ec1d62b6c3..27fda9871e6854 100644
--- a/x-pack/legacy/plugins/alerting/server/alerts_client.ts
+++ b/x-pack/legacy/plugins/alerting/server/alerts_client.ts
@@ -21,6 +21,7 @@ interface SuccessCreateAPIKeyResult {
result: SecurityPluginCreateAPIKeyResult;
}
export type CreateAPIKeyResult = FailedCreateAPIKeyResult | SuccessCreateAPIKeyResult;
+type NormalizedAlertAction = Omit;
interface ConstructorOptions {
logger: Logger;
@@ -62,9 +63,15 @@ interface CreateOptions {
Alert,
Exclude<
keyof Alert,
- 'createdBy' | 'updatedBy' | 'apiKey' | 'apiKeyOwner' | 'muteAll' | 'mutedInstanceIds'
+ | 'createdBy'
+ | 'updatedBy'
+ | 'apiKey'
+ | 'apiKeyOwner'
+ | 'muteAll'
+ | 'mutedInstanceIds'
+ | 'actions'
>
- >;
+ > & { actions: NormalizedAlertAction[] };
options?: {
migrationVersion?: Record;
};
@@ -76,7 +83,7 @@ interface UpdateOptions {
name: string;
tags: string[];
interval: string;
- actions: AlertAction[];
+ actions: NormalizedAlertAction[];
params: Record;
};
}
@@ -117,8 +124,10 @@ export class AlertsClient {
this.validateActions(alertType, data.actions);
- const { alert: rawAlert, references } = this.getRawAlert({
+ const { references, actions } = await this.denormalizeActions(data.actions);
+ const rawAlert: RawAlert = {
...data,
+ actions,
createdBy: username,
updatedBy: username,
apiKeyOwner: apiKey.created && username ? username : undefined,
@@ -128,7 +137,7 @@ export class AlertsClient {
params: validatedAlertTypeParams,
muteAll: false,
mutedInstanceIds: [],
- });
+ };
const createdAlert = await this.savedObjectsClient.create('alert', rawAlert, {
...options,
references,
@@ -202,7 +211,7 @@ export class AlertsClient {
const validatedAlertTypeParams = validateAlertTypeParams(alertType, data.params);
this.validateActions(alertType, data.actions);
- const { actions, references } = this.extractReferences(data.actions);
+ const { actions, references } = await this.denormalizeActions(data.actions);
const username = await this.getUserName();
const updatedObject = await this.savedObjectsClient.update(
'alert',
@@ -371,26 +380,6 @@ export class AlertsClient {
});
}
- private extractReferences(actions: Alert['actions']) {
- const references: SavedObjectReference[] = [];
- const rawActions = actions.map((action, i) => {
- const actionRef = `action_${i}`;
- references.push({
- name: actionRef,
- type: 'action',
- id: action.id,
- });
- return {
- ...omit(action, 'id'),
- actionRef,
- };
- }) as RawAlert['actions'];
- return {
- actions: rawActions,
- references,
- };
- }
-
private injectReferencesIntoActions(
actions: RawAlert['actions'],
references: SavedObjectReference[]
@@ -426,19 +415,7 @@ export class AlertsClient {
};
}
- private getRawAlert(alert: Alert): { alert: RawAlert; references: SavedObjectReference[] } {
- const { references, actions } = this.extractReferences(alert.actions);
- return {
- alert: {
- ...alert,
- actions,
- },
- references,
- };
- }
-
- private validateActions(alertType: AlertType, actions: Alert['actions']) {
- // TODO: Should also ensure user has access to each action
+ private validateActions(alertType: AlertType, actions: NormalizedAlertAction[]): void {
const { actionGroups: alertTypeActionGroups } = alertType;
const usedAlertActionGroups = actions.map(action => action.group);
const invalidActionGroups = usedAlertActionGroups.filter(
@@ -455,4 +432,41 @@ export class AlertsClient {
);
}
}
+
+ private async denormalizeActions(
+ alertActions: NormalizedAlertAction[]
+ ): Promise<{ actions: RawAlert['actions']; references: SavedObjectReference[] }> {
+ // Fetch action objects in bulk
+ const actionIds = [...new Set(alertActions.map(alertAction => alertAction.id))];
+ const bulkGetOpts = actionIds.map(id => ({ id, type: 'action' }));
+ const bulkGetResult = await this.savedObjectsClient.bulkGet(bulkGetOpts);
+ const actionMap = new Map();
+ for (const action of bulkGetResult.saved_objects) {
+ if (action.error) {
+ throw Boom.badRequest(
+ `Failed to load action ${action.id} (${action.error.statusCode}): ${action.error.message}`
+ );
+ }
+ actionMap.set(action.id, action);
+ }
+ // Extract references and set actionTypeId
+ const references: SavedObjectReference[] = [];
+ const actions = alertActions.map(({ id, ...alertAction }, i) => {
+ const actionRef = `action_${i}`;
+ references.push({
+ id,
+ name: actionRef,
+ type: 'action',
+ });
+ return {
+ ...alertAction,
+ actionRef,
+ actionTypeId: actionMap.get(id).attributes.actionTypeId,
+ };
+ });
+ return {
+ actions,
+ references,
+ };
+ }
}
diff --git a/x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.test.ts b/x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.test.ts
index 4f523f203f87a7..d86a06767c9d16 100644
--- a/x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/lib/create_execution_handler.test.ts
@@ -28,6 +28,7 @@ const createExecutionHandlerParams = {
{
id: '1',
group: 'default',
+ actionTypeId: 'test',
params: {
foo: true,
contextVal: 'My {{context.value}} goes here',
diff --git a/x-pack/legacy/plugins/alerting/server/routes/create.test.ts b/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
index 318dbdf068d6a9..634a797880812c 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/create.test.ts
@@ -41,6 +41,12 @@ test('creates an alert with proper parameters', async () => {
alertsClient.create.mockResolvedValueOnce({
...mockedAlert,
id: '123',
+ actions: [
+ {
+ ...mockedAlert.actions[0],
+ actionTypeId: 'test',
+ },
+ ],
});
const { payload, statusCode } = await server.inject(request);
expect(statusCode).toBe(200);
@@ -49,6 +55,7 @@ test('creates an alert with proper parameters', async () => {
Object {
"actions": Array [
Object {
+ "actionTypeId": "test",
"group": "default",
"id": "2",
"params": Object {
@@ -97,33 +104,4 @@ test('creates an alert with proper parameters', async () => {
},
]
`);
- expect(alertsClient.create).toHaveBeenCalledTimes(1);
- expect(alertsClient.create.mock.calls[0]).toMatchInlineSnapshot(`
- Array [
- Object {
- "data": Object {
- "actions": Array [
- Object {
- "group": "default",
- "id": "2",
- "params": Object {
- "foo": true,
- },
- },
- ],
- "alertTypeId": "1",
- "enabled": true,
- "interval": "10s",
- "name": "abc",
- "params": Object {
- "bar": true,
- },
- "tags": Array [
- "foo",
- ],
- "throttle": null,
- },
- },
- ]
- `);
});
diff --git a/x-pack/legacy/plugins/alerting/server/routes/create.ts b/x-pack/legacy/plugins/alerting/server/routes/create.ts
index fb82a03f172b3b..cb5277ae191003 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/create.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/create.ts
@@ -6,7 +6,6 @@
import Hapi from 'hapi';
import Joi from 'joi';
-import { AlertAction } from '../types';
import { getDurationSchema } from '../lib';
interface ScheduleRequest extends Hapi.Request {
@@ -16,7 +15,11 @@ interface ScheduleRequest extends Hapi.Request {
tags: string[];
alertTypeId: string;
interval: string;
- actions: AlertAction[];
+ actions: Array<{
+ group: string;
+ id: string;
+ params: Record;
+ }>;
params: Record;
throttle: string | null;
};
diff --git a/x-pack/legacy/plugins/alerting/server/routes/get.test.ts b/x-pack/legacy/plugins/alerting/server/routes/get.test.ts
index 19618bc9e39feb..4d44ee9dfe6bda 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/get.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/get.test.ts
@@ -21,6 +21,7 @@ const mockedAlert = {
{
group: 'default',
id: '2',
+ actionTypeId: 'test',
params: {
foo: true,
},
diff --git a/x-pack/legacy/plugins/alerting/server/routes/update.test.ts b/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
index 7fc3f459110107..334fb2120319de 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/update.test.ts
@@ -24,6 +24,7 @@ const mockedResponse = {
{
group: 'default',
id: '2',
+ actionTypeId: 'test',
params: {
baz: true,
},
diff --git a/x-pack/legacy/plugins/alerting/server/routes/update.ts b/x-pack/legacy/plugins/alerting/server/routes/update.ts
index 6aeedb93a10985..6e8f8557fb24ad 100644
--- a/x-pack/legacy/plugins/alerting/server/routes/update.ts
+++ b/x-pack/legacy/plugins/alerting/server/routes/update.ts
@@ -6,7 +6,6 @@
import Joi from 'joi';
import Hapi from 'hapi';
-import { AlertAction } from '../types';
import { getDurationSchema } from '../lib';
interface UpdateRequest extends Hapi.Request {
@@ -18,7 +17,11 @@ interface UpdateRequest extends Hapi.Request {
name: string;
tags: string[];
interval: string;
- actions: AlertAction[];
+ actions: Array<{
+ group: string;
+ id: string;
+ params: Record;
+ }>;
params: Record;
throttle: string | null;
};
diff --git a/x-pack/legacy/plugins/alerting/server/types.ts b/x-pack/legacy/plugins/alerting/server/types.ts
index e2460c549c05db..1bec2632d80822 100644
--- a/x-pack/legacy/plugins/alerting/server/types.ts
+++ b/x-pack/legacy/plugins/alerting/server/types.ts
@@ -49,12 +49,14 @@ export type AlertActionParams = SavedObjectAttributes;
export interface AlertAction {
group: string;
id: string;
+ actionTypeId: string;
params: AlertActionParams;
}
export interface RawAlertAction extends SavedObjectAttributes {
group: string;
actionRef: string;
+ actionTypeId: string;
params: AlertActionParams;
}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx
index a5356be72f5e40..91e0ae11a652e2 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx
@@ -18,6 +18,7 @@ import { history } from '../../../../utils/history';
import { TransactionOverview } from '..';
import { IUrlParams } from '../../../../context/UrlParamsContext/types';
import * as useServiceTransactionTypesHook from '../../../../hooks/useServiceTransactionTypes';
+import * as useFetcherHook from '../../../../hooks/useFetcher';
import { fromQuery } from '../../../shared/Links/url_helpers';
import { Router } from 'react-router-dom';
import { UrlParamsProvider } from '../../../../context/UrlParamsContext';
@@ -51,6 +52,8 @@ function setup({
.spyOn(useServiceTransactionTypesHook, 'useServiceTransactionTypes')
.mockReturnValue(serviceTransactionTypes);
+ jest.spyOn(useFetcherHook, 'useFetcher').mockReturnValue({} as any);
+
return render(
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
index 05094c59712a92..32379325c40205 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
@@ -10,13 +10,13 @@ import {
UrlParamsContext,
useUiFilters
} from '../../../../context/UrlParamsContext';
-import { tick } from '../../../../utils/testHelpers';
import { DatePicker } from '../index';
import { IUrlParams } from '../../../../context/UrlParamsContext/types';
import { history } from '../../../../utils/history';
import { mount } from 'enzyme';
import { EuiSuperDatePicker } from '@elastic/eui';
import { MemoryRouter } from 'react-router-dom';
+import { wait } from '@testing-library/react';
const mockHistoryPush = jest.spyOn(history, 'push');
const mockRefreshTimeRange = jest.fn();
@@ -84,7 +84,7 @@ describe('DatePicker', () => {
});
expect(mockRefreshTimeRange).not.toHaveBeenCalled();
jest.advanceTimersByTime(1000);
- await tick();
+ await wait();
expect(mockRefreshTimeRange).toHaveBeenCalled();
wrapper.unmount();
});
@@ -94,7 +94,7 @@ describe('DatePicker', () => {
mountDatePicker({ refreshPaused: true, refreshInterval: 1000 });
expect(mockRefreshTimeRange).not.toHaveBeenCalled();
jest.advanceTimersByTime(1000);
- await tick();
+ await wait();
expect(mockRefreshTimeRange).not.toHaveBeenCalled();
});
});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/Delayed/index.ts b/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/Delayed/index.ts
index 798e872dbc4724..9048afe57153de 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/Delayed/index.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/Delayed/index.ts
@@ -57,4 +57,10 @@ export class Delayed {
public onChange(onChangeCallback: Callback) {
this.onChangeCallback = onChangeCallback;
}
+
+ public destroy() {
+ if (this.timeoutId) {
+ window.clearTimeout(this.timeoutId);
+ }
+ }
}
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/index.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/index.test.tsx
index 57e634df22837e..c55c6ab3518482 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/index.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/index.test.tsx
@@ -4,11 +4,16 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { renderHook } from '@testing-library/react-hooks';
+import {
+ renderHook,
+ act,
+ RenderHookResult
+} from '@testing-library/react-hooks';
import { useDelayedVisibility } from '.';
describe('useFetcher', () => {
- let hook;
+ let hook: RenderHookResult;
+
beforeEach(() => {
jest.useFakeTimers();
});
@@ -26,9 +31,15 @@ describe('useFetcher', () => {
});
hook.rerender(true);
- jest.advanceTimersByTime(10);
+ act(() => {
+ jest.advanceTimersByTime(10);
+ });
+
expect(hook.result.current).toEqual(false);
- jest.advanceTimersByTime(50);
+ act(() => {
+ jest.advanceTimersByTime(50);
+ });
+
expect(hook.result.current).toEqual(true);
});
@@ -38,8 +49,11 @@ describe('useFetcher', () => {
});
hook.rerender(true);
- jest.advanceTimersByTime(100);
+ act(() => {
+ jest.advanceTimersByTime(100);
+ });
hook.rerender(false);
+
expect(hook.result.current).toEqual(true);
});
@@ -49,11 +63,22 @@ describe('useFetcher', () => {
});
hook.rerender(true);
- jest.advanceTimersByTime(100);
+
+ act(() => {
+ jest.advanceTimersByTime(100);
+ });
+
hook.rerender(false);
- jest.advanceTimersByTime(900);
+ act(() => {
+ jest.advanceTimersByTime(900);
+ });
+
expect(hook.result.current).toEqual(true);
- jest.advanceTimersByTime(100);
+
+ act(() => {
+ jest.advanceTimersByTime(100);
+ });
+
expect(hook.result.current).toEqual(false);
});
});
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/index.ts b/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/index.ts
index 5acbbd1d457372..c4465c7b42339a 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/index.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/useDelayedVisibility/index.ts
@@ -26,6 +26,10 @@ export function useDelayedVisibility(
setIsVisible(visibility);
});
delayedRef.current = delayed;
+
+ return () => {
+ delayed.destroy();
+ };
}, [hideDelayMs, showDelayMs, minimumVisibleDuration]);
useEffect(() => {
diff --git a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/__tests__/UrlParamsContext.test.tsx b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/__tests__/UrlParamsContext.test.tsx
index 2604a3a1225746..d2d8036e864aee 100644
--- a/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/__tests__/UrlParamsContext.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/context/UrlParamsContext/__tests__/UrlParamsContext.test.tsx
@@ -11,8 +11,8 @@ import { Location, History } from 'history';
import { MemoryRouter, Router } from 'react-router-dom';
import moment from 'moment-timezone';
import { IUrlParams } from '../types';
-import { tick } from '../../../utils/testHelpers';
import { getParsedDate } from '../helpers';
+import { wait } from '@testing-library/react';
function mountParams(location: Location) {
return mount(
@@ -143,13 +143,13 @@ describe('UrlParamsContext', () => {
);
- await tick();
+ await wait();
expect(calls.length).toBe(1);
wrapper.find('button').simulate('click');
- await tick();
+ await wait();
expect(calls.length).toBe(2);
@@ -194,11 +194,11 @@ describe('UrlParamsContext', () => {
);
- await tick();
+ await wait();
wrapper.find('button').simulate('click');
- await tick();
+ await wait();
const params = getDataFromOutput(wrapper);
expect(params.start).toEqual('2000-06-14T00:00:00.000Z');
diff --git a/x-pack/legacy/plugins/apm/public/hooks/useFetcher.integration.test.tsx b/x-pack/legacy/plugins/apm/public/hooks/useFetcher.integration.test.tsx
index 36a8377c02527c..743cf4e01e5559 100644
--- a/x-pack/legacy/plugins/apm/public/hooks/useFetcher.integration.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/hooks/useFetcher.integration.test.tsx
@@ -5,8 +5,8 @@
*/
import React from 'react';
-import { render } from '@testing-library/react';
-import { delay, tick } from '../utils/testHelpers';
+import { render, wait } from '@testing-library/react';
+import { delay } from '../utils/testHelpers';
import { useFetcher } from './useFetcher';
import { KibanaCoreContext } from '../../../observability/public/context/kibana_core';
import { LegacyCoreStart } from 'kibana/public';
@@ -76,7 +76,8 @@ describe('when simulating race condition', () => {
it('should render "Hello from Peter" after 200ms', async () => {
jest.advanceTimersByTime(200);
- await tick();
+
+ await wait();
expect(renderSpy).lastCalledWith({
data: 'Hello from Peter',
@@ -87,7 +88,7 @@ describe('when simulating race condition', () => {
it('should render "Hello from Peter" after 600ms', async () => {
jest.advanceTimersByTime(600);
- await tick();
+ await wait();
expect(renderSpy).lastCalledWith({
data: 'Hello from Peter',
@@ -98,7 +99,7 @@ describe('when simulating race condition', () => {
it('should should NOT have rendered "Hello from John" at any point', async () => {
jest.advanceTimersByTime(600);
- await tick();
+ await wait();
expect(renderSpy).not.toHaveBeenCalledWith({
data: 'Hello from John',
@@ -109,7 +110,7 @@ describe('when simulating race condition', () => {
it('should send and receive calls in the right order', async () => {
jest.advanceTimersByTime(600);
- await tick();
+ await wait();
expect(requestCallOrder).toEqual([
['request', 'John', 500],
diff --git a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
index b5cee4a78b01c1..9e3c486715a1fa 100644
--- a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
@@ -58,7 +58,6 @@ export async function getRenderedHref(Component: React.FC, location: Location) {
);
- await tick();
await waitForElement(() => el.container.querySelector('a'));
const a = el.container.querySelector('a');
@@ -74,9 +73,6 @@ export function delay(ms: number) {
return new Promise(resolve => setTimeout(resolve, ms));
}
-// Await this when you need to "flush" promises to immediately resolve or throw in tests
-export const tick = () => new Promise(resolve => setImmediate(resolve, 0));
-
export function expectTextsNotInDocument(output: any, texts: string[]) {
texts.forEach(text => {
try {
diff --git a/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts b/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts
index 83c610800b89ba..8771181639f4d3 100644
--- a/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts
+++ b/x-pack/legacy/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts
@@ -8,7 +8,6 @@ import { isEmpty } from 'lodash';
import { npStart } from 'ui/new_platform';
import { ElasticsearchAdapter } from './adapter_types';
import { AutocompleteSuggestion, esKuery } from '../../../../../../../../src/plugins/data/public';
-import { setup as data } from '../../../../../../../../src/legacy/core_plugins/data/public/legacy';
const getAutocompleteProvider = (language: string) =>
npStart.plugins.data.autocomplete.getProvider(language);
@@ -64,7 +63,7 @@ export class RestElasticsearchAdapter implements ElasticsearchAdapter {
if (this.cachedIndexPattern) {
return this.cachedIndexPattern;
}
- const res = await data.indexPatterns.indexPatterns.getFieldsForWildcard({
+ const res = await npStart.plugins.data.indexPatterns.getFieldsForWildcard({
pattern: this.indexPatternName,
});
if (isEmpty(res.fields)) {
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable.tsx
index 8810871e9161ba..5c7ef1a8c1799c 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable.tsx
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable.tsx
@@ -16,8 +16,11 @@ import {
} from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
import { start } from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
import { EmbeddableExpression } from '../expression_types/embeddable';
-import { SavedObjectFinder } from '../../../../../../src/legacy/ui/public/saved_objects/components/saved_object_finder';
import { RendererStrings } from '../../i18n';
+import {
+ SavedObjectFinderProps,
+ SavedObjectFinderUi,
+} from '../../../../../../src/plugins/kibana_react/public';
const { embeddable: strings } = RendererStrings;
@@ -34,6 +37,13 @@ interface Handlers {
}
const renderEmbeddable = (embeddableObject: IEmbeddable, domNode: HTMLElement) => {
+ const SavedObjectFinder = (props: SavedObjectFinderProps) => (
+
+ );
return (