').html(template);
-
- $compile($el)($tooltipScope);
-
- return function tooltipFormatter(metric, fieldFormatter, fieldName, metricName) {
- if (!metric) {
- return '';
- }
-
- $tooltipScope.details = [];
- if (fieldName && metric) {
- $tooltipScope.details.push({
- label: fieldName,
- value: metric.term,
- });
- }
-
- if (metric) {
- $tooltipScope.details.push({
- label: metricName,
- value: fieldFormatter ? fieldFormatter.convert(metric.value, 'text') : metric.value,
- });
- }
-
- $tooltipScope.$apply();
- return $el.html();
- };
-};
+export function tooltipFormatter(metric, fieldFormatter, fieldName, metricName) {
+ if (!metric) {
+ return '';
+ }
+
+ const details = [];
+ if (fieldName && metric) {
+ details.push({
+ label: fieldName,
+ value: metric.term,
+ });
+ }
+
+ if (metric) {
+ details.push({
+ label: metricName,
+ value: fieldFormatter ? fieldFormatter.convert(metric.value, 'text') : metric.value,
+ });
+ }
+ return details;
+}
diff --git a/src/legacy/core_plugins/region_map/public/util.ts b/src/legacy/core_plugins/region_map/public/util.ts
index 24c721da1f31ac..b4e0dcd5f35102 100644
--- a/src/legacy/core_plugins/region_map/public/util.ts
+++ b/src/legacy/core_plugins/region_map/public/util.ts
@@ -18,8 +18,7 @@
*/
import { FileLayer, VectorLayer } from '../../../../plugins/maps_legacy/public';
-// TODO: reference to TILE_MAP plugin should be removed
-import { ORIGIN } from '../../../../legacy/core_plugins/tile_map/common/origin';
+import { ORIGIN } from '../../../../plugins/maps_legacy/public';
export const mapToLayerWithId = (prefix: string, layer: FileLayer): VectorLayer => ({
...layer,
diff --git a/src/legacy/core_plugins/tile_map/common/origin.ts b/src/legacy/core_plugins/tile_map/common/origin.ts
deleted file mode 100644
index 7fcf1c659bdf3c..00000000000000
--- a/src/legacy/core_plugins/tile_map/common/origin.ts
+++ /dev/null
@@ -1,23 +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.
- */
-
-export enum ORIGIN {
- EMS = 'elastic_maps_service',
- KIBANA_YML = 'self_hosted',
-}
diff --git a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
index 3904c43707906b..bce2e157ebbc8d 100644
--- a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
+++ b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
@@ -53,6 +53,7 @@ import {
import { ServiceSettings } from '../../../../../plugins/maps_legacy/public/map/service_settings';
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { setInjectedVarFunc } from '../../../../../plugins/maps_legacy/public/kibana_services';
+import { getBaseMapsVis } from '../../../../../plugins/maps_legacy/public';
function mockRawData() {
const stack = [dummyESResponse];
@@ -114,15 +115,26 @@ describe('CoordinateMapsVisualizationTest', function() {
return 'not found';
}
});
+
+ const coreSetupMock = {
+ notifications: {
+ toasts: {},
+ },
+ uiSettings: {},
+ injectedMetadata: {
+ getInjectedVar: () => {},
+ },
+ };
const serviceSettings = new ServiceSettings();
+ const BaseMapsVisualization = getBaseMapsVis(coreSetupMock, serviceSettings);
const uiSettings = $injector.get('config');
dependencies = {
- serviceSettings,
- uiSettings,
- $injector,
- getPrecision,
getZoomPrecision,
+ getPrecision,
+ BaseMapsVisualization,
+ uiSettings,
+ serviceSettings,
};
visType = new BaseVisType(createTileMapTypeDefinition(dependencies));
diff --git a/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js b/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js
index fc029d6bccb6e6..bdf9cd806eb8b5 100644
--- a/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js
+++ b/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js
@@ -24,7 +24,8 @@ import scaledCircleMarkersPng from './scaledCircleMarkers.png';
// import shadedCircleMarkersPng from './shadedCircleMarkers.png';
import { ImageComparator } from 'test_utils/image_comparator';
import GeoHashSampleData from './dummy_es_response.json';
-import { KibanaMap } from '../../../../../plugins/maps_legacy/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { KibanaMap } from '../../../../../plugins/maps_legacy/public/map/kibana_map';
describe('geohash_layer', function() {
let domNode;
diff --git a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
index 9ca42fe3e4074c..1efb0b2f884f85 100644
--- a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
+++ b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
@@ -28,9 +28,7 @@ import {
SelectOption,
SwitchOption,
} from '../../../../../plugins/charts/public';
-import { WmsOptions } from './wms_options';
-import { TileMapVisParams } from '../types';
-import { MapTypes } from '../map_types';
+import { WmsOptions, TileMapVisParams, MapTypes } from '../../../../../plugins/maps_legacy/public';
export type TileMapOptionsProps = VisOptionsProps
;
diff --git a/src/legacy/core_plugins/tile_map/public/editors/_tooltip.html b/src/legacy/core_plugins/tile_map/public/editors/_tooltip.html
deleted file mode 100644
index 9df5b94a21edad..00000000000000
--- a/src/legacy/core_plugins/tile_map/public/editors/_tooltip.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- | {{detail.label}} |
- {{detail.value}} |
-
-
-
diff --git a/src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js b/src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js
deleted file mode 100644
index eec90e512b4623..00000000000000
--- a/src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js
+++ /dev/null
@@ -1,62 +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 $ from 'jquery';
-import { i18n } from '@kbn/i18n';
-
-import template from './_tooltip.html';
-
-export function TileMapTooltipFormatterProvider($injector) {
- const $rootScope = $injector.get('$rootScope');
- const $compile = $injector.get('$compile');
-
- const $tooltipScope = $rootScope.$new();
- const $el = $('').html(template);
-
- $compile($el)($tooltipScope);
-
- return function tooltipFormatter(metricTitle, metricFormat, feature) {
- if (!feature) {
- return '';
- }
-
- $tooltipScope.details = [
- {
- label: metricTitle,
- value: metricFormat(feature.properties.value),
- },
- {
- label: i18n.translate('tileMap.tooltipFormatter.latitudeLabel', {
- defaultMessage: 'Latitude',
- }),
- value: feature.geometry.coordinates[1],
- },
- {
- label: i18n.translate('tileMap.tooltipFormatter.longitudeLabel', {
- defaultMessage: 'Longitude',
- }),
- value: feature.geometry.coordinates[0],
- },
- ];
-
- $tooltipScope.$apply();
-
- return $el.html();
- };
-}
diff --git a/src/legacy/core_plugins/tile_map/public/geohash_layer.js b/src/legacy/core_plugins/tile_map/public/geohash_layer.js
index b9acf1a15208f7..f0261483d302d2 100644
--- a/src/legacy/core_plugins/tile_map/public/geohash_layer.js
+++ b/src/legacy/core_plugins/tile_map/public/geohash_layer.js
@@ -20,12 +20,11 @@
import L from 'leaflet';
import { min, isEqual } from 'lodash';
import { i18n } from '@kbn/i18n';
-import { KibanaMapLayer } from '../../../../plugins/maps_legacy/public';
+import { KibanaMapLayer, MapTypes } from '../../../../plugins/maps_legacy/public';
import { HeatmapMarkers } from './markers/heatmap';
import { ScaledCirclesMarkers } from './markers/scaled_circles';
import { ShadedCirclesMarkers } from './markers/shaded_circles';
import { GeohashGridMarkers } from './markers/geohash_grid';
-import { MapTypes } from './map_types';
export class GeohashLayer extends KibanaMapLayer {
constructor(featureCollection, featureCollectionMetaData, options, zoom, kibanaMap) {
diff --git a/src/legacy/core_plugins/tile_map/public/legacy.ts b/src/legacy/core_plugins/tile_map/public/legacy.ts
index 741e118750f320..dd8d4c6e9311e6 100644
--- a/src/legacy/core_plugins/tile_map/public/legacy.ts
+++ b/src/legacy/core_plugins/tile_map/public/legacy.ts
@@ -21,17 +21,12 @@ import { PluginInitializerContext } from 'kibana/public';
import { npSetup, npStart } from 'ui/new_platform';
import { TileMapPluginSetupDependencies } from './plugin';
-import { LegacyDependenciesPlugin } from './shim';
import { plugin } from '.';
const plugins: Readonly
= {
expressions: npSetup.plugins.expressions,
visualizations: npSetup.plugins.visualizations,
mapsLegacy: npSetup.plugins.mapsLegacy,
-
- // Temporary solution
- // It will be removed when all dependent services are migrated to the new platform.
- __LEGACY: new LegacyDependenciesPlugin(),
};
const pluginInstance = plugin({} as PluginInitializerContext);
diff --git a/src/legacy/core_plugins/tile_map/public/plugin.ts b/src/legacy/core_plugins/tile_map/public/plugin.ts
index 2b97407b17b38c..aa1460a7e2890a 100644
--- a/src/legacy/core_plugins/tile_map/public/plugin.ts
+++ b/src/legacy/core_plugins/tile_map/public/plugin.ts
@@ -25,22 +25,21 @@ import {
} from '../../../../core/public';
import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
-
-import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
+// TODO: Determine why visualizations don't populate without this
+import 'angular-sanitize';
// @ts-ignore
import { createTileMapFn } from './tile_map_fn';
// @ts-ignore
import { createTileMapTypeDefinition } from './tile_map_type';
-import { IServiceSettings, MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
+import { getBaseMapsVis, MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
/** @private */
-interface TileMapVisualizationDependencies extends LegacyDependenciesPluginSetup {
- serviceSettings: IServiceSettings;
+interface TileMapVisualizationDependencies {
uiSettings: IUiSettingsClient;
getZoomPrecision: any;
getPrecision: any;
- notificationService: any;
+ BaseMapsVisualization: any;
}
/** @internal */
@@ -48,7 +47,6 @@ export interface TileMapPluginSetupDependencies {
expressions: ReturnType;
visualizations: VisualizationsSetup;
mapsLegacy: MapsLegacyPluginSetup;
- __LEGACY: LegacyDependenciesPlugin;
}
/** @internal */
@@ -61,16 +59,14 @@ export class TileMapPlugin implements Plugin, void> {
public async setup(
core: CoreSetup,
- { expressions, visualizations, mapsLegacy, __LEGACY }: TileMapPluginSetupDependencies
+ { expressions, visualizations, mapsLegacy }: TileMapPluginSetupDependencies
) {
- const { getZoomPrecision, getPrecision, serviceSettings } = mapsLegacy;
+ const { getZoomPrecision, getPrecision } = mapsLegacy;
const visualizationDependencies: Readonly = {
- serviceSettings,
getZoomPrecision,
getPrecision,
- notificationService: core.notifications.toasts,
+ BaseMapsVisualization: getBaseMapsVis(core, mapsLegacy.serviceSettings),
uiSettings: core.uiSettings,
- ...(await __LEGACY.setup()),
};
expressions.registerFunction(() => createTileMapFn(visualizationDependencies));
diff --git a/src/legacy/core_plugins/tile_map/public/shim/index.ts b/src/legacy/core_plugins/tile_map/public/shim/index.ts
deleted file mode 100644
index cfc7b62ff4f86d..00000000000000
--- a/src/legacy/core_plugins/tile_map/public/shim/index.ts
+++ /dev/null
@@ -1,20 +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.
- */
-
-export * from './legacy_dependencies_plugin';
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_type.js b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
index ae3a839b600e94..ca6a586d220080 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_type.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
@@ -19,11 +19,10 @@
import React from 'react';
import { i18n } from '@kbn/i18n';
-import { convertToGeoJson } from '../../../../plugins/maps_legacy/public';
+import { convertToGeoJson, MapTypes } from '../../../../plugins/maps_legacy/public';
import { Schemas } from '../../../../plugins/vis_default_editor/public';
import { createTileMapVisualization } from './tile_map_visualization';
import { TileMapOptions } from './components/tile_map_options';
-import { MapTypes } from './map_types';
import { supportsCssFilters } from './css_filters';
import { truncatedColorSchemas } from '../../../../plugins/charts/public';
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
index fdce8bc51fe869..6a7bda5e188831 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
@@ -19,30 +19,24 @@
import { get } from 'lodash';
import { GeohashLayer } from './geohash_layer';
-import { BaseMapsVisualizationProvider } from './base_maps_visualization';
-import { TileMapTooltipFormatterProvider } from './editors/_tooltip_formatter';
import { npStart } from 'ui/new_platform';
import { getFormat } from '../../../ui/public/visualize/loader/pipeline_helpers/utilities';
-import { scaleBounds, geoContains } from '../../../../plugins/maps_legacy/public';
-
-export const createTileMapVisualization = ({
- serviceSettings,
- $injector,
- getZoomPrecision,
- getPrecision,
- notificationService,
-}) => {
- const BaseMapsVisualization = new BaseMapsVisualizationProvider(
- serviceSettings,
- notificationService
- );
- const tooltipFormatter = new TileMapTooltipFormatterProvider($injector);
+import {
+ scaleBounds,
+ geoContains,
+ mapTooltipProvider,
+} from '../../../../plugins/maps_legacy/public';
+import { tooltipFormatter } from './tooltip_formatter';
+
+export const createTileMapVisualization = dependencies => {
+ const { getZoomPrecision, getPrecision, BaseMapsVisualization } = dependencies;
return class CoordinateMapsVisualization extends BaseMapsVisualization {
constructor(element, vis) {
super(element, vis);
this._geohashLayer = null;
+ this._tooltipFormatter = mapTooltipProvider(element, tooltipFormatter);
}
updateGeohashAgg = () => {
@@ -190,18 +184,15 @@ export const createTileMapVisualization = ({
const metricDimension = this._params.dimensions.metric;
const metricLabel = metricDimension ? metricDimension.label : '';
const metricFormat = getFormat(metricDimension && metricDimension.format);
- const boundTooltipFormatter = tooltipFormatter.bind(
- null,
- metricLabel,
- metricFormat.getConverterFor('text')
- );
return {
label: metricLabel,
valueFormatter: this._geoJsonFeatureCollectionAndMeta
? metricFormat.getConverterFor('text')
: null,
- tooltipFormatter: this._geoJsonFeatureCollectionAndMeta ? boundTooltipFormatter : null,
+ tooltipFormatter: this._geoJsonFeatureCollectionAndMeta
+ ? this._tooltipFormatter.bind(null, metricLabel, metricFormat.getConverterFor('text'))
+ : null,
mapType: newParams.mapType,
isFilteredByCollar: this._isFilteredByCollar(),
colorRamp: newParams.colorSchema,
diff --git a/src/legacy/core_plugins/tile_map/public/shim/legacy_dependencies_plugin.ts b/src/legacy/core_plugins/tile_map/public/tooltip_formatter.js
similarity index 57%
rename from src/legacy/core_plugins/tile_map/public/shim/legacy_dependencies_plugin.ts
rename to src/legacy/core_plugins/tile_map/public/tooltip_formatter.js
index 5296e98b09efe8..1c87d4dcca2b57 100644
--- a/src/legacy/core_plugins/tile_map/public/shim/legacy_dependencies_plugin.ts
+++ b/src/legacy/core_plugins/tile_map/public/tooltip_formatter.js
@@ -17,27 +17,29 @@
* under the License.
*/
-import chrome from 'ui/chrome';
-import { CoreStart, Plugin } from 'kibana/public';
-// TODO: Determine why visualizations don't populate without this
-import 'angular-sanitize';
+import { i18n } from '@kbn/i18n';
-/** @internal */
-export interface LegacyDependenciesPluginSetup {
- $injector: any;
-}
-
-export class LegacyDependenciesPlugin
- implements Plugin, void> {
- public async setup() {
- const $injector = await chrome.dangerouslyGetActiveInjector();
-
- return {
- $injector,
- } as LegacyDependenciesPluginSetup;
+export function tooltipFormatter(metricTitle, metricFormat, feature) {
+ if (!feature) {
+ return '';
}
- public start(core: CoreStart) {
- // nothing to do here yet
- }
+ return [
+ {
+ label: metricTitle,
+ value: metricFormat(feature.properties.value),
+ },
+ {
+ label: i18n.translate('tileMap.tooltipFormatter.latitudeLabel', {
+ defaultMessage: 'Latitude',
+ }),
+ value: feature.geometry.coordinates[1],
+ },
+ {
+ label: i18n.translate('tileMap.tooltipFormatter.longitudeLabel', {
+ defaultMessage: 'Longitude',
+ }),
+ value: feature.geometry.coordinates[0],
+ },
+ ];
}
diff --git a/src/plugins/data/common/utils/abort_utils.ts b/src/plugins/data/common/utils/abort_utils.ts
index 5051515f3a8265..9aec787170840f 100644
--- a/src/plugins/data/common/utils/abort_utils.ts
+++ b/src/plugins/data/common/utils/abort_utils.ts
@@ -33,19 +33,31 @@ export class AbortError extends Error {
* Returns a `Promise` corresponding with when the given `AbortSignal` is aborted. Useful for
* situations when you might need to `Promise.race` multiple `AbortSignal`s, or an `AbortSignal`
* with any other expected errors (or completions).
+ *
* @param signal The `AbortSignal` to generate the `Promise` from
* @param shouldReject If `false`, the promise will be resolved, otherwise it will be rejected
*/
-export function toPromise(signal: AbortSignal, shouldReject = false) {
- return new Promise((resolve, reject) => {
+export function toPromise(signal: AbortSignal, shouldReject?: false): Promise;
+export function toPromise(signal: AbortSignal, shouldReject?: true): Promise;
+export function toPromise(signal: AbortSignal, shouldReject: boolean = false) {
+ const promise = new Promise((resolve, reject) => {
const action = shouldReject ? reject : resolve;
if (signal.aborted) action();
signal.addEventListener('abort', action);
});
+
+ /**
+ * Below is to make sure we don't have unhandled promise rejections. Otherwise
+ * Jest tests fail.
+ */
+ promise.catch(() => {});
+
+ return promise;
}
/**
* Returns an `AbortSignal` that will be aborted when the first of the given signals aborts.
+ *
* @param signals
*/
export function getCombinedSignal(signals: AbortSignal[]) {
diff --git a/src/plugins/expressions/common/execution/execution.abortion.test.ts b/src/plugins/expressions/common/execution/execution.abortion.test.ts
new file mode 100644
index 00000000000000..ecbf94eceae642
--- /dev/null
+++ b/src/plugins/expressions/common/execution/execution.abortion.test.ts
@@ -0,0 +1,96 @@
+/*
+ * 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 { Execution } from './execution';
+import { parseExpression } from '../ast';
+import { createUnitTestExecutor } from '../test_helpers';
+
+jest.useFakeTimers();
+
+beforeEach(() => {
+ jest.clearAllTimers();
+});
+
+const createExecution = (
+ expression: string = 'foo bar=123',
+ context: Record = {},
+ debug: boolean = false
+) => {
+ const executor = createUnitTestExecutor();
+ const execution = new Execution({
+ executor,
+ ast: parseExpression(expression),
+ context,
+ debug,
+ });
+ return execution;
+};
+
+describe('Execution abortion tests', () => {
+ test('can abort an expression immediately', async () => {
+ const execution = createExecution('sleep 10');
+
+ execution.start();
+ execution.cancel();
+
+ const result = await execution.result;
+
+ expect(result).toMatchObject({
+ type: 'error',
+ error: {
+ message: 'The expression was aborted.',
+ name: 'AbortError',
+ },
+ });
+ });
+
+ test('can abort an expression which has function running mid flight', async () => {
+ const execution = createExecution('sleep 300');
+
+ execution.start();
+ jest.advanceTimersByTime(100);
+ execution.cancel();
+
+ const result = await execution.result;
+
+ expect(result).toMatchObject({
+ type: 'error',
+ error: {
+ message: 'The expression was aborted.',
+ name: 'AbortError',
+ },
+ });
+ });
+
+ test('cancelling execution after it completed has no effect', async () => {
+ jest.useRealTimers();
+
+ const execution = createExecution('sleep 1');
+
+ execution.start();
+
+ const result = await execution.result;
+
+ execution.cancel();
+
+ expect(result).toBe(null);
+
+ jest.useFakeTimers();
+ });
+});
diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts
index d0ab178296408a..6ee12d97a64226 100644
--- a/src/plugins/expressions/common/execution/execution.ts
+++ b/src/plugins/expressions/common/execution/execution.ts
@@ -22,7 +22,7 @@ import { Executor } from '../executor';
import { createExecutionContainer, ExecutionContainer } from './container';
import { createError } from '../util';
import { Defer, now } from '../../../kibana_utils/common';
-import { AbortError } from '../../../data/common';
+import { toPromise } from '../../../data/common/utils/abort_utils';
import { RequestAdapter, DataAdapter } from '../../../inspector/common';
import { isExpressionValueError, ExpressionValueError } from '../expression_types/specs/error';
import {
@@ -38,6 +38,12 @@ import { ArgumentType, ExpressionFunction } from '../expression_functions';
import { getByAlias } from '../util/get_by_alias';
import { ExecutionContract } from './execution_contract';
+const createAbortErrorValue = () =>
+ createError({
+ message: 'The expression was aborted.',
+ name: 'AbortError',
+ });
+
export interface ExecutionParams<
ExtraContext extends Record = Record
> {
@@ -70,7 +76,7 @@ export class Execution<
/**
* Dynamic state of the execution.
*/
- public readonly state: ExecutionContainer