@@ -195,15 +241,19 @@ export function DiscoverHistogram({
xAxisFormatter.convert(value)}
+ gridLine={gridLineStyle}
+ style={verticalAxisStyle}
/>
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
index 007d3a99cb1dd8..d8d0215fd751f2 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -64,6 +64,10 @@ export const stackManagementSchema: MakeSchemaFrom = {
type: 'text',
_meta: { description: 'Non-default value of setting.' },
},
+ 'visualization:useLegacyTimeAxis': {
+ type: 'boolean',
+ _meta: { description: 'Non-default value of setting.' },
+ },
'visualization:regionmap:showWarnings': {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
@@ -436,10 +440,6 @@ export const stackManagementSchema: MakeSchemaFrom = {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
},
- 'labs:canvas:byValueEmbeddable': {
- type: 'boolean',
- _meta: { description: 'Non-default value of setting.' },
- },
'labs:canvas:useDataService': {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
index d35a05fe04780b..9dcd2038edb9d7 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
@@ -40,6 +40,7 @@ export interface UsageStats {
'visualize:enableLabs': boolean;
'visualization:heatmap:maxBuckets': number;
'visualization:colorMapping': string;
+ 'visualization:useLegacyTimeAxis': boolean;
'visualization:regionmap:showWarnings': boolean;
'visualization:tileMap:maxPrecision': number;
'csv:separator': string;
@@ -120,7 +121,6 @@ export interface UsageStats {
'banners:textColor': string;
'banners:backgroundColor': string;
'labs:canvas:enable_ui': boolean;
- 'labs:canvas:byValueEmbeddable': boolean;
'labs:canvas:useDataService': boolean;
'labs:presentation:timeToPresent': boolean;
'labs:dashboard:enable_ui': boolean;
diff --git a/src/plugins/presentation_util/common/labs.ts b/src/plugins/presentation_util/common/labs.ts
index 8eefbd6981280c..cb976e73b5edfe 100644
--- a/src/plugins/presentation_util/common/labs.ts
+++ b/src/plugins/presentation_util/common/labs.ts
@@ -11,9 +11,7 @@ import { i18n } from '@kbn/i18n';
export const LABS_PROJECT_PREFIX = 'labs:';
export const DEFER_BELOW_FOLD = `${LABS_PROJECT_PREFIX}dashboard:deferBelowFold` as const;
export const DASHBOARD_CONTROLS = `${LABS_PROJECT_PREFIX}dashboard:dashboardControls` as const;
-export const BY_VALUE_EMBEDDABLE = `${LABS_PROJECT_PREFIX}canvas:byValueEmbeddable` as const;
-
-export const projectIDs = [DEFER_BELOW_FOLD, DASHBOARD_CONTROLS, BY_VALUE_EMBEDDABLE] as const;
+export const projectIDs = [DEFER_BELOW_FOLD, DASHBOARD_CONTROLS] as const;
export const environmentNames = ['kibana', 'browser', 'session'] as const;
export const solutionNames = ['canvas', 'dashboard', 'presentation'] as const;
@@ -50,19 +48,6 @@ export const projects: { [ID in ProjectID]: ProjectConfig & { id: ID } } = {
}),
solutions: ['dashboard'],
},
- [BY_VALUE_EMBEDDABLE]: {
- id: BY_VALUE_EMBEDDABLE,
- isActive: true,
- isDisplayed: true,
- environments: ['kibana', 'browser', 'session'],
- name: i18n.translate('presentationUtil.labs.enableByValueEmbeddableName', {
- defaultMessage: 'By-Value Embeddables',
- }),
- description: i18n.translate('presentationUtil.labs.enableByValueEmbeddableDescription', {
- defaultMessage: 'Enables support for by-value embeddables in Canvas',
- }),
- solutions: ['canvas'],
- },
};
export type ProjectID = typeof projectIDs[number];
diff --git a/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss b/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss
index c70e317546d403..535570a51d777c 100644
--- a/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss
+++ b/src/plugins/presentation_util/public/components/solution_toolbar/items/quick_group.scss
@@ -1,31 +1,11 @@
.quickButtonGroup {
- .euiButtonGroup__buttons {
- border-radius: $euiBorderRadius;
-
- .quickButtonGroup__button {
- background-color: $euiColorEmptyShade;
- @include kbnThemeStyle('v8') {
- // sass-lint:disable-block no-important
- border-width: $euiBorderWidthThin !important;
- border-style: solid !important;
- border-color: $euiBorderColor !important;
- }
- }
-
- .quickButtonGroup__button:first-of-type {
- @include kbnThemeStyle('v8') {
- // sass-lint:disable-block no-important
- border-top-left-radius: $euiBorderRadius !important;
- border-bottom-left-radius: $euiBorderRadius !important;
- }
- }
-
- .quickButtonGroup__button:last-of-type {
- @include kbnThemeStyle('v8') {
- // sass-lint:disable-block no-important
- border-top-right-radius: $euiBorderRadius !important;
- border-bottom-right-radius: $euiBorderRadius !important;
- }
+ .quickButtonGroup__button {
+ background-color: $euiColorEmptyShade;
+ @include kbnThemeStyle('v8') {
+ // sass-lint:disable-block no-important
+ border-width: $euiBorderWidthThin !important;
+ border-style: solid !important;
+ border-color: $euiBorderColor !important;
}
}
}
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index 138ce3f097ce96..251fed955788eb 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -7110,6 +7110,12 @@
"description": "Non-default value of setting."
}
},
+ "visualization:useLegacyTimeAxis": {
+ "type": "boolean",
+ "_meta": {
+ "description": "Non-default value of setting."
+ }
+ },
"visualization:regionmap:showWarnings": {
"type": "boolean",
"_meta": {
@@ -7671,12 +7677,6 @@
"description": "Non-default value of setting."
}
},
- "labs:canvas:byValueEmbeddable": {
- "type": "boolean",
- "_meta": {
- "description": "Non-default value of setting."
- }
- },
"labs:canvas:useDataService": {
"type": "boolean",
"_meta": {
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
index b4fe39c522de76..b177ef632e2107 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/vis.js
@@ -19,6 +19,7 @@ import { createFieldFormatter } from '../../lib/create_field_formatter';
import { checkIfSeriesHaveSameFormatters } from '../../lib/check_if_series_have_same_formatters';
import { TimeSeries } from '../../../visualizations/views/timeseries';
import { MarkdownSimple } from '../../../../../../../../plugins/kibana_react/public';
+import { LEGACY_TIME_AXIS } from '../../../../../../../../plugins/charts/common';
import { replaceVars } from '../../lib/replace_vars';
import { getInterval } from '../../lib/get_interval';
import { createIntervalBasedFormatter } from '../../lib/create_interval_based_formatter';
@@ -272,6 +273,7 @@ class TimeseriesVisualization extends Component {
syncColors={syncColors}
palettesService={palettesService}
interval={interval}
+ useLegacyTimeAxis={getConfig(LEGACY_TIME_AXIS, false)}
isLastBucketDropped={Boolean(
model.drop_last_bucket ||
model.series.some((series) => series.series_drop_last_bucket)
diff --git a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
index 2158283bb80d57..5e98b74c0caa5b 100644
--- a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
+++ b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
@@ -72,6 +72,7 @@ export const TimeSeries = ({
palettesService,
interval,
isLastBucketDropped,
+ useLegacyTimeAxis,
}) => {
// If the color isn't configured by the user, use the color mapping service
// to assign a color from the Kibana palette. Colors will be shared across the
@@ -138,6 +139,51 @@ export const TimeSeries = ({
},
[palettesService, series, syncColors]
);
+
+ const darkMode = uiSettings.get('theme:darkMode');
+ const gridLineStyle = !useLegacyTimeAxis
+ ? {
+ visible: showGrid,
+ strokeWidth: 0.1,
+ stroke: darkMode ? 'white' : 'black',
+ }
+ : {
+ ...GRID_LINE_CONFIG,
+ visible: showGrid,
+ };
+ const xAxisStyle = !useLegacyTimeAxis
+ ? {
+ tickLabel: {
+ visible: true,
+ fontSize: 11,
+ padding: 0,
+ alignment: {
+ vertical: Position.Bottom,
+ horizontal: Position.Left,
+ },
+ offset: {
+ x: 1.5,
+ y: 0,
+ },
+ },
+ axisLine: {
+ stroke: darkMode ? 'lightgray' : 'darkgray',
+ strokeWidth: 1,
+ },
+ tickLine: {
+ size: 12,
+ strokeWidth: 0.15,
+ stroke: darkMode ? 'white' : 'black',
+ padding: -10,
+ visible: true,
+ },
+ axisTitle: {
+ visible: true,
+ padding: 0,
+ },
+ }
+ : {};
+
return (
);
@@ -357,4 +402,5 @@ TimeSeries.propTypes = {
annotations: PropTypes.array,
interval: PropTypes.number,
isLastBucketDropped: PropTypes.bool,
+ useLegacyTimeAxis: PropTypes.bool,
};
diff --git a/src/plugins/vis_types/xy/public/components/xy_axis.tsx b/src/plugins/vis_types/xy/public/components/xy_axis.tsx
index 30e1dbbff673ee..b224639bdbff3a 100644
--- a/src/plugins/vis_types/xy/public/components/xy_axis.tsx
+++ b/src/plugins/vis_types/xy/public/components/xy_axis.tsx
@@ -25,6 +25,7 @@ export const XYAxis: FC = ({
domain,
style,
integersOnly,
+ timeAxisLayerCount,
}) => (
= ({
labelFormat={ticks?.labelFormatter}
showOverlappingLabels={ticks?.showOverlappingLabels}
showDuplicatedTicks={ticks?.showDuplicates}
+ timeAxisLayerCount={timeAxisLayerCount}
/>
);
diff --git a/src/plugins/vis_types/xy/public/config/get_axis.ts b/src/plugins/vis_types/xy/public/config/get_axis.ts
index 0d6c67d064cf82..796636ef2cb61f 100644
--- a/src/plugins/vis_types/xy/public/config/get_axis.ts
+++ b/src/plugins/vis_types/xy/public/config/get_axis.ts
@@ -8,7 +8,13 @@
import { identity } from 'lodash';
-import { AxisSpec, TickFormatter, YDomainRange, ScaleType as ECScaleType } from '@elastic/charts';
+import {
+ AxisSpec,
+ TickFormatter,
+ YDomainRange,
+ ScaleType as ECScaleType,
+ Position,
+} from '@elastic/charts';
import { LabelRotation } from '../../../../charts/public';
import { BUCKET_TYPES } from '../../../../data/public';
@@ -33,7 +39,9 @@ export function getAxis(
{ categoryLines, valueAxis }: Grid,
{ params, format, formatter, title: fallbackTitle = '', aggType }: Aspect,
seriesParams: SeriesParam[],
- isDateHistogram = false
+ isDateHistogram = false,
+ useMultiLayerTimeAxis = false,
+ darkMode = false
): AxisConfig {
const isCategoryAxis = type === AxisType.Category;
// Hide unassigned axis, not supported in elastic charts
@@ -74,9 +82,10 @@ export function getAxis(
ticks,
grid,
scale,
- style: getAxisStyle(ticks, title, fallbackRotation),
+ style: getAxisStyle(useMultiLayerTimeAxis, darkMode, ticks, title, fallbackRotation),
domain: getAxisDomain(scale, isCategoryAxis),
integersOnly: aggType === 'count',
+ timeAxisLayerCount: useMultiLayerTimeAxis ? 3 : 0,
};
}
@@ -147,19 +156,52 @@ export function getScale(
}
function getAxisStyle(
+ isMultiLayerTimeAxis: boolean,
+ darkMode: boolean,
ticks?: TickOptions,
title?: string,
rotationFallback: LabelRotation = LabelRotation.Vertical
): AxisSpec['style'] {
- return {
- axisTitle: {
- visible: (title ?? '').trim().length > 0,
- },
- tickLabel: {
- visible: ticks?.show,
- rotation: -(ticks?.rotation ?? rotationFallback),
- },
- };
+ return isMultiLayerTimeAxis
+ ? {
+ tickLabel: {
+ visible: Boolean(ticks?.show),
+ rotation: 0, // rotation is disabled on new time axis
+ fontSize: 11,
+ padding: 0,
+ alignment: {
+ vertical: Position.Bottom,
+ horizontal: Position.Left,
+ },
+ offset: {
+ x: 1.5,
+ y: 0,
+ },
+ },
+ axisLine: {
+ stroke: darkMode ? 'lightgray' : 'darkgray',
+ strokeWidth: 1,
+ },
+ tickLine: {
+ size: 12,
+ strokeWidth: 0.15,
+ stroke: darkMode ? 'white' : 'black',
+ padding: -10,
+ visible: Boolean(ticks?.show),
+ },
+ axisTitle: {
+ visible: (title ?? '').trim().length > 0,
+ },
+ }
+ : {
+ axisTitle: {
+ visible: (title ?? '').trim().length > 0,
+ },
+ tickLabel: {
+ visible: ticks?.show,
+ rotation: -(ticks?.rotation ?? rotationFallback),
+ },
+ };
}
function getAxisDomain(
diff --git a/src/plugins/vis_types/xy/public/config/get_config.ts b/src/plugins/vis_types/xy/public/config/get_config.ts
index d2a3b9ad2a1037..bd79b915be9172 100644
--- a/src/plugins/vis_types/xy/public/config/get_config.ts
+++ b/src/plugins/vis_types/xy/public/config/get_config.ts
@@ -29,7 +29,12 @@ import { getAxis } from './get_axis';
import { getAspects } from './get_aspects';
import { ChartType } from '../index';
-export function getConfig(table: Datatable, params: VisParams): VisConfig {
+export function getConfig(
+ table: Datatable,
+ params: VisParams,
+ useLegacyTimeAxis = false,
+ darkMode = false
+): VisConfig {
const {
thresholdLine,
orderBucketsBySum,
@@ -42,13 +47,6 @@ export function getConfig(table: Datatable, params: VisParams): VisConfig {
fillOpacity,
} = params;
const aspects = getAspects(table.columns, params.dimensions);
- const xAxis = getAxis(
- params.categoryAxes[0],
- params.grid,
- aspects.x,
- params.seriesParams,
- params.dimensions.x?.aggType === BUCKET_TYPES.DATE_HISTOGRAM
- );
const tooltip = getTooltip(aspects, params);
const yAxes = params.valueAxes.map((a) => {
// find the correct aspect for each value axis
@@ -60,10 +58,28 @@ export function getConfig(table: Datatable, params: VisParams): VisConfig {
params.seriesParams
);
});
+
+ const rotation = getRotation(params.categoryAxes[0]);
+
+ const isDateHistogram = params.dimensions.x?.aggType === BUCKET_TYPES.DATE_HISTOGRAM;
+ const isHistogram = params.dimensions.x?.aggType === BUCKET_TYPES.HISTOGRAM;
const enableHistogramMode =
- (params.dimensions.x?.aggType === BUCKET_TYPES.DATE_HISTOGRAM ||
- params.dimensions.x?.aggType === BUCKET_TYPES.HISTOGRAM) &&
+ (isDateHistogram || isHistogram) &&
shouldEnableHistogramMode(params.seriesParams, aspects.y, yAxes);
+
+ const useMultiLayerTimeAxis =
+ enableHistogramMode && isDateHistogram && !useLegacyTimeAxis && rotation === 0;
+
+ const xAxis = getAxis(
+ params.categoryAxes[0],
+ params.grid,
+ aspects.x,
+ params.seriesParams,
+ isDateHistogram,
+ useMultiLayerTimeAxis,
+ darkMode
+ );
+
const isTimeChart = (aspects.x.params as DateHistogramParams).date ?? false;
return {
@@ -83,7 +99,7 @@ export function getConfig(table: Datatable, params: VisParams): VisConfig {
xAxis,
yAxes,
legend: getLegend(params),
- rotation: getRotation(params.categoryAxes[0]),
+ rotation,
thresholdLine: getThresholdLine(thresholdLine, yAxes, params.seriesParams),
};
}
diff --git a/src/plugins/vis_types/xy/public/plugin.ts b/src/plugins/vis_types/xy/public/plugin.ts
index c79ead242e35b0..0f1de387161e30 100644
--- a/src/plugins/vis_types/xy/public/plugin.ts
+++ b/src/plugins/vis_types/xy/public/plugin.ts
@@ -24,7 +24,7 @@ import {
} from './services';
import { visTypesDefinitions } from './vis_types';
-import { xyVisRenderer } from './vis_renderer';
+import { getXYVisRenderer } from './vis_renderer';
import * as expressionFunctions from './expression_functions';
@@ -69,7 +69,11 @@ export class VisTypeXyPlugin
setThemeService(charts.theme);
setPalettesService(charts.palettes);
- expressions.registerRenderer(xyVisRenderer);
+ expressions.registerRenderer(
+ getXYVisRenderer({
+ uiSettings: core.uiSettings,
+ })
+ );
expressions.registerFunction(expressionFunctions.visTypeXyVisFn);
expressions.registerFunction(expressionFunctions.categoryAxis);
expressions.registerFunction(expressionFunctions.timeMarker);
diff --git a/src/plugins/vis_types/xy/public/types/config.ts b/src/plugins/vis_types/xy/public/types/config.ts
index e52b47366bc857..287787193bd202 100644
--- a/src/plugins/vis_types/xy/public/types/config.ts
+++ b/src/plugins/vis_types/xy/public/types/config.ts
@@ -85,6 +85,7 @@ export interface AxisConfig {
title?: string;
grid?: AxisGrid;
integersOnly: boolean;
+ timeAxisLayerCount?: number;
}
export interface LegendOptions {
diff --git a/src/plugins/vis_types/xy/public/vis_component.tsx b/src/plugins/vis_types/xy/public/vis_component.tsx
index 515ad3e7eaf6fa..8574e86a230962 100644
--- a/src/plugins/vis_types/xy/public/vis_component.tsx
+++ b/src/plugins/vis_types/xy/public/vis_component.tsx
@@ -66,6 +66,7 @@ export interface VisComponentProps {
fireEvent: IInterpreterRenderHandlers['event'];
renderComplete: IInterpreterRenderHandlers['done'];
syncColors: boolean;
+ useLegacyTimeAxis: boolean;
}
export type VisComponentType = typeof VisComponent;
@@ -211,8 +212,9 @@ const VisComponent = (props: VisComponentProps) => {
);
const { visData, visParams, syncColors } = props;
+ const isDarkMode = getThemeService().useDarkMode();
- const config = getConfig(visData, visParams);
+ const config = getConfig(visData, visParams, props.useLegacyTimeAxis, isDarkMode);
const timeZone = getTimeZone();
const xDomain =
config.xAxis.scale.type === ScaleType.Ordinal ? undefined : getXDomain(config.aspects.x.params);
@@ -229,7 +231,7 @@ const VisComponent = (props: VisComponentProps) => {
() => config.legend.position ?? Position.Right,
[config.legend.position]
);
- const isDarkMode = getThemeService().useDarkMode();
+
const getSeriesName = getSeriesNameFn(config.aspects, config.aspects.y.length > 1);
const splitAccessors = config.aspects.series?.map(({ accessor, formatter }) => {
diff --git a/src/plugins/vis_types/xy/public/vis_renderer.tsx b/src/plugins/vis_types/xy/public/vis_renderer.tsx
index 093671307d5383..77727761015a74 100644
--- a/src/plugins/vis_types/xy/public/vis_renderer.tsx
+++ b/src/plugins/vis_types/xy/public/vis_renderer.tsx
@@ -9,6 +9,7 @@
import React, { lazy } from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
import { I18nProvider } from '@kbn/i18n/react';
+import { IUiSettingsClient } from 'kibana/public';
import { VisualizationContainer } from '../../../visualizations/public';
import type { PersistedState } from '../../../visualizations/public';
@@ -17,6 +18,7 @@ import type { ExpressionRenderDefinition } from '../../../expressions/public';
import type { XyVisType } from '../common';
import type { VisComponentType } from './vis_component';
import { RenderValue, visName } from './expression_functions/xy_vis_fn';
+import { LEGACY_TIME_AXIS } from '../../../charts/common';
// @ts-ignore
const VisComponent = lazy(() => import('./vis_component'));
@@ -28,7 +30,9 @@ function shouldShowNoResultsMessage(visData: any, visType: XyVisType): boolean {
return Boolean(isZeroHits);
}
-export const xyVisRenderer: ExpressionRenderDefinition = {
+export const getXYVisRenderer: (deps: {
+ uiSettings: IUiSettingsClient;
+}) => ExpressionRenderDefinition = ({ uiSettings }) => ({
name: visName,
displayName: 'XY visualization',
reuseDomNode: true,
@@ -46,10 +50,11 @@ export const xyVisRenderer: ExpressionRenderDefinition = {
fireEvent={handlers.event}
uiState={handlers.uiState as PersistedState}
syncColors={syncColors}
+ useLegacyTimeAxis={uiSettings.get(LEGACY_TIME_AXIS, false)}
/>
,
domNode
);
},
-};
+});
diff --git a/test/common/services/bsearch.ts b/test/common/services/bsearch.ts
new file mode 100644
index 00000000000000..d9fe89d9e4b9c7
--- /dev/null
+++ b/test/common/services/bsearch.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import expect from '@kbn/expect';
+import request from 'superagent';
+import type SuperTest from 'supertest';
+import { IEsSearchResponse } from 'src/plugins/data/common';
+import { FtrProviderContext } from '../ftr_provider_context';
+import { RetryService } from './retry/retry';
+
+/**
+ * Function copied from here:
+ * test/api_integration/apis/search/bsearch.ts without the compress
+ *
+ * Splits the JSON lines from bsearch
+ */
+const parseBfetchResponse = (resp: request.Response): Array> => {
+ return resp.text
+ .trim()
+ .split('\n')
+ .map((item) => JSON.parse(item));
+};
+
+/**
+ * Function copied from here:
+ * x-pack/test/rule_registry/common/lib/authentication/spaces.ts
+ * @param spaceId The space id we want to utilize
+ */
+const getSpaceUrlPrefix = (spaceId?: string): string => {
+ return spaceId && spaceId !== 'default' ? `/s/${spaceId}` : ``;
+};
+
+/**
+ * Options for the send method
+ */
+interface SendOptions {
+ supertest: SuperTest.SuperTest;
+ options: object;
+ strategy: string;
+ space?: string;
+}
+
+/**
+ * Bsearch factory which will return a new bsearch capable service that can reduce flake
+ * on the CI systems when they are under pressure and bsearch returns an async search
+ * response or a sync response.
+ *
+ * @example
+ * const supertest = getService('supertest');
+ * const bsearch = getService('bsearch');
+ * const response = await bsearch.send({
+ * supertest,
+ * options: {
+ * defaultIndex: ['large_volume_dns_data'],
+ * }
+ * strategy: 'securitySolutionSearchStrategy',
+ * });
+ * expect(response).eql({ ... your value ... });
+ */
+export const BSearchFactory = (retry: RetryService) => ({
+ /** Send method to send in your supertest, url, options, and strategy name */
+ send: async ({
+ supertest,
+ options,
+ strategy,
+ space,
+ }: SendOptions): Promise => {
+ const spaceUrl = getSpaceUrlPrefix(space);
+ const { body } = await retry.try(async () => {
+ return supertest
+ .post(`${spaceUrl}/internal/search/${strategy}`)
+ .set('kbn-xsrf', 'true')
+ .send(options)
+ .expect(200);
+ });
+
+ if (body.isRunning) {
+ const result = await retry.try(async () => {
+ const resp = await supertest
+ .post(`${spaceUrl}/internal/bsearch`)
+ .set('kbn-xsrf', 'true')
+ .send({
+ batch: [
+ {
+ request: {
+ id: body.id,
+ ...options,
+ },
+ options: {
+ strategy,
+ },
+ },
+ ],
+ })
+ .expect(200);
+ const [parsedResponse] = parseBfetchResponse(resp);
+ expect(parsedResponse.result.isRunning).equal(false);
+ return parsedResponse.result;
+ });
+ return result;
+ } else {
+ return body;
+ }
+ },
+});
+
+/**
+ * Bsearch provider which will return a new bsearch capable service that can reduce flake
+ * on the CI systems when they are under pressure and bsearch returns an async search response
+ * or a sync response.
+ */
+export function BSearchProvider({
+ getService,
+}: FtrProviderContext): ReturnType {
+ const retry = getService('retry');
+ return BSearchFactory(retry);
+}
diff --git a/test/common/services/index.ts b/test/common/services/index.ts
index c04bd778468a9e..91d17ce1bb3e89 100644
--- a/test/common/services/index.ts
+++ b/test/common/services/index.ts
@@ -16,6 +16,7 @@ import { SecurityServiceProvider } from './security';
import { EsDeleteAllIndicesProvider } from './es_delete_all_indices';
import { SavedObjectInfoService } from './saved_object_info';
import { IndexPatternsService } from './index_patterns';
+import { BSearchProvider } from './bsearch';
export const services = {
deployment: DeploymentService,
@@ -28,4 +29,5 @@ export const services = {
esDeleteAllIndices: EsDeleteAllIndicesProvider,
savedObjectInfo: SavedObjectInfoService,
indexPatterns: IndexPatternsService,
+ bsearch: BSearchProvider,
};
diff --git a/test/examples/embeddables/dashboard.ts b/test/examples/embeddables/dashboard.ts
index b97905ca9ce6a6..5c255b136c666d 100644
--- a/test/examples/embeddables/dashboard.ts
+++ b/test/examples/embeddables/dashboard.ts
@@ -100,7 +100,8 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
const PageObjects = getPageObjects(['common', 'visChart']);
const monacoEditor = getService('monacoEditor');
- describe('dashboard container', () => {
+ // FLAKY: https://github.com/elastic/kibana/issues/116414
+ describe.skip('dashboard container', () => {
before(async () => {
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data');
await esArchiver.loadIfNeeded(
diff --git a/test/examples/index_pattern_field_editor_example/index_pattern_field_editor_example.ts b/test/examples/index_pattern_field_editor_example/index_pattern_field_editor_example.ts
index 5744c8e64f5c11..fa4308ae72883a 100644
--- a/test/examples/index_pattern_field_editor_example/index_pattern_field_editor_example.ts
+++ b/test/examples/index_pattern_field_editor_example/index_pattern_field_editor_example.ts
@@ -12,7 +12,8 @@ import { PluginFunctionalProviderContext } from 'test/plugin_functional/services
export default function ({ getService }: PluginFunctionalProviderContext) {
const testSubjects = getService('testSubjects');
- describe('', () => {
+ // FAILING: https://github.com/elastic/kibana/issues/116463
+ describe.skip('', () => {
it('finds an index pattern', async () => {
await testSubjects.existOrFail('indexPatternTitle');
});
diff --git a/test/functional/apps/dashboard/dashboard_snapshots.ts b/test/functional/apps/dashboard/dashboard_snapshots.ts
index 3aba671c0a4b29..9279bbd5806e7b 100644
--- a/test/functional/apps/dashboard/dashboard_snapshots.ts
+++ b/test/functional/apps/dashboard/dashboard_snapshots.ts
@@ -59,7 +59,7 @@ export default function ({
);
await PageObjects.dashboard.clickExitFullScreenLogoButton();
- expect(percentDifference).to.be.lessThan(0.02);
+ expect(percentDifference).to.be.lessThan(0.022);
});
it('compare area chart snapshot', async () => {
@@ -81,7 +81,7 @@ export default function ({
);
await PageObjects.dashboard.clickExitFullScreenLogoButton();
- expect(percentDifference).to.be.lessThan(0.02);
+ expect(percentDifference).to.be.lessThan(0.022);
});
});
}
diff --git a/test/functional/apps/visualize/_timelion.ts b/test/functional/apps/visualize/_timelion.ts
index c531ada8a25737..631d2148d73c39 100644
--- a/test/functional/apps/visualize/_timelion.ts
+++ b/test/functional/apps/visualize/_timelion.ts
@@ -167,7 +167,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
expect(firstAreaChartData).to.eql(firstAreaExpectedChartData);
expect(secondAreaChartData).to.eql(secondAreaExpectedChartData);
expect(thirdAreaChartData).to.eql(thirdAreaExpectedChartData);
- expect(firstAxesLabels).to.eql(['12.19GB', '12.2GB', '12.21GB']);
+ expect(firstAxesLabels).to.eql(['12.2GB', '12.21GB']);
expect(secondAxesLabels).to.eql(['5.59KB', '5.6KB']);
expect(thirdAxesLabels.toString()).to.be(
'BYTES_5721,BYTES_5722,BYTES_5723,BYTES_5724,BYTES_5725,BYTES_5726,BYTES_5727,BYTES_5728,BYTES_5729,BYTES_5730,BYTES_5731,BYTES_5732,BYTES_5733'
@@ -257,8 +257,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
expect(value).to.eql('.es()');
});
- // FLAKY: https://github.com/elastic/kibana/issues/116033
- describe.skip('dynamic suggestions for argument values', () => {
+ describe('dynamic suggestions for argument values', () => {
describe('.es()', () => {
it('should show index pattern suggestions for index argument', async () => {
await monacoEditor.setCodeEditorValue('');
diff --git a/test/functional/config.js b/test/functional/config.js
index 5b0b79e84e8df3..09eccc863a0e53 100644
--- a/test/functional/config.js
+++ b/test/functional/config.js
@@ -54,6 +54,7 @@ export default async function ({ readConfigFile }) {
'accessibility:disableAnimations': true,
'dateFormat:tz': 'UTC',
'visualization:visualize:legacyPieChartsLibrary': true,
+ 'visualization:useLegacyTimeAxis': true,
},
},
diff --git a/test/functional/page_objects/timelion_page.ts b/test/functional/page_objects/timelion_page.ts
index bdfde3c8145e5e..ba1db60bc6350d 100644
--- a/test/functional/page_objects/timelion_page.ts
+++ b/test/functional/page_objects/timelion_page.ts
@@ -7,13 +7,21 @@
*/
import { FtrService } from '../ftr_provider_context';
+import type { WebElementWrapper } from '../services/lib/web_element_wrapper';
export class TimelionPageObject extends FtrService {
private readonly testSubjects = this.ctx.getService('testSubjects');
+ private readonly retry = this.ctx.getService('retry');
public async getSuggestionItemsText() {
- const timelionCodeEditor = await this.testSubjects.find('timelionCodeEditor');
- const lists = await timelionCodeEditor.findAllByClassName('monaco-list-row');
+ let lists: WebElementWrapper[] = [];
+ await this.retry.try(async () => {
+ const timelionCodeEditor = await this.testSubjects.find('timelionCodeEditor');
+ lists = await timelionCodeEditor.findAllByClassName('monaco-list-row');
+ if (lists.length === 0) {
+ throw new Error('suggestion list not populated');
+ }
+ });
return await Promise.all(lists.map(async (element) => await element.getVisibleText()));
}
diff --git a/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts b/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts
index 8e7adb504ebee3..b384c3fbbbb1ec 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts
@@ -68,7 +68,8 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
});
});
- describe('Delete modal', () => {
+ // FLAKY: https://github.com/elastic/kibana/issues/116059
+ describe.skip('Delete modal', () => {
it('should display a warning then trying to delete hidden saved objects', async () => {
await PageObjects.savedObjects.clickCheckboxByTitle('A Pie');
await PageObjects.savedObjects.clickCheckboxByTitle('A Dashboard');
diff --git a/vars/tasks.groovy b/vars/tasks.groovy
index 0f509fa8ba1327..050b62646fb3bc 100644
--- a/vars/tasks.groovy
+++ b/vars/tasks.groovy
@@ -137,6 +137,7 @@ def functionalXpack(Map params = [:]) {
'x-pack/plugins/security_solution/',
'x-pack/plugins/cases/',
'x-pack/plugins/timelines/',
+ 'x-pack/plugins/lists/',
'x-pack/test/security_solution_cypress/',
'x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/',
'x-pack/plugins/triggers_actions_ui/public/application/context/actions_connectors_context.tsx',
diff --git a/x-pack/package.json b/x-pack/package.json
index 805d8555bf453f..8fb7a3483e5ef0 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -1,6 +1,6 @@
{
"name": "x-pack",
- "version": "8.0.0",
+ "version": "8.1.0",
"author": "Elastic",
"private": true,
"license": "Elastic-License",
diff --git a/x-pack/plugins/apm/ftr_e2e/README.md b/x-pack/plugins/apm/ftr_e2e/README.md
index 2df4e837d2e555..96d6671bb36990 100644
--- a/x-pack/plugins/apm/ftr_e2e/README.md
+++ b/x-pack/plugins/apm/ftr_e2e/README.md
@@ -4,4 +4,4 @@ APM uses [FTR](../../../../packages/kbn-test/README.md) (functional test runner)
## Running tests
-Go to [tests documentation](../scripts/test#e2e-tests-cypress/README.md)
\ No newline at end of file
+Go to [tests documentation](../dev_docs/testing.md#e2e-tests-cypress)
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/dependencies.spec.ts b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/dependencies.spec.ts
new file mode 100644
index 00000000000000..0ab2d5682a900c
--- /dev/null
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/integration/read_only_user/dependencies.spec.ts
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+const timeRange = {
+ rangeFrom: Cypress.env('START_DATE'),
+ rangeTo: Cypress.env('END_DATE'),
+};
+
+describe('Dependencies', () => {
+ beforeEach(() => {
+ cy.loginAsReadOnlyUser();
+ });
+
+ describe('top-level dependencies page', () => {
+ it('has a list of dependencies and you can navigate to the page for one', () => {
+ cy.visit(`/app/apm/services?${new URLSearchParams(timeRange)}`);
+ cy.contains('nav a', 'Dependencies').click();
+
+ // `force: true` because Cypress says the element is 0x0
+ cy.contains('postgresql').click({ force: true });
+
+ cy.contains('h1', 'postgresql');
+ });
+ });
+
+ describe('dependency overview page', () => {
+ it('shows dependency information and you can navigate to a page for an upstream service', () => {
+ cy.visit(
+ `/app/apm/backends/overview?${new URLSearchParams({
+ ...timeRange,
+ backendName: 'postgresql',
+ })}`
+ );
+
+ cy.get('[data-test-subj="latencyChart"]');
+ cy.get('[data-test-subj="throughputChart"]');
+ cy.get('[data-test-subj="errorRateChart"]');
+
+ cy.contains('opbeans-python').click({ force: true });
+
+ cy.contains('h1', 'opbeans-python');
+ });
+ });
+
+ describe('service overview page', () => {
+ it('shows dependency information and you can navigate to a page for a dependency', () => {
+ cy.visit(
+ `/app/apm/services/opbeans-python/overview?${new URLSearchParams(
+ timeRange
+ )}`
+ );
+
+ cy.contains('postgresql').click({ force: true });
+
+ cy.contains('h1', 'postgresql');
+ });
+ });
+
+ describe('service dependencies tab', () => {
+ it('shows dependency information and you can navigate to a page for a dependency', () => {
+ cy.visit(
+ `/app/apm/services/opbeans-python/overview?${new URLSearchParams(
+ timeRange
+ )}`
+ );
+
+ cy.contains('a[role="tab"]', 'Dependencies').click();
+
+ cy.contains('Time spent by dependency');
+
+ cy.contains('postgresql').click({ force: true });
+
+ cy.contains('h1', 'postgresql');
+ });
+ });
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
index f1ede936c6ace4..ac2e8e8babee1e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
@@ -6,11 +6,12 @@
*/
import { ExpressionTypeDefinition } from '../../../../../src/plugins/expressions';
-import { EmbeddableInput } from '../../types';
+import { EmbeddableInput } from '../../../../../src/plugins/embeddable/common/';
import { EmbeddableTypes } from './embeddable_types';
export const EmbeddableExpressionType = 'embeddable';
export { EmbeddableTypes, EmbeddableInput };
+
export interface EmbeddableExpression {
/**
* The type of the expression result
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts
index d6d7a0f867849c..2cfdebafb70df4 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts
@@ -6,6 +6,7 @@
*/
import { functions as commonFunctions } from '../common';
+import { functions as externalFunctions } from '../external';
import { location } from './location';
import { markdown } from './markdown';
import { urlparam } from './urlparam';
@@ -13,4 +14,13 @@ import { escount } from './escount';
import { esdocs } from './esdocs';
import { essql } from './essql';
-export const functions = [location, markdown, urlparam, escount, esdocs, essql, ...commonFunctions];
+export const functions = [
+ location,
+ markdown,
+ urlparam,
+ escount,
+ esdocs,
+ essql,
+ ...commonFunctions,
+ ...externalFunctions,
+];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts
deleted file mode 100644
index 001fb0e3f62e3a..00000000000000
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { embeddableFunctionFactory } from './embeddable';
-import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
-import { ExpressionValueFilter } from '../../../types';
-import { encode } from '../../../common/lib/embeddable_dataurl';
-import { InitializeArguments } from '.';
-
-const filterContext: ExpressionValueFilter = {
- type: 'filter',
- and: [
- {
- type: 'filter',
- and: [],
- value: 'filter-value',
- column: 'filter-column',
- filterType: 'exactly',
- },
- {
- type: 'filter',
- and: [],
- column: 'time-column',
- filterType: 'time',
- from: '2019-06-04T04:00:00.000Z',
- to: '2019-06-05T04:00:00.000Z',
- },
- ],
-};
-
-describe('embeddable', () => {
- const fn = embeddableFunctionFactory({} as InitializeArguments)().fn;
- const config = {
- id: 'some-id',
- timerange: { from: '15m', to: 'now' },
- title: 'test embeddable',
- };
-
- const args = {
- config: encode(config),
- type: 'visualization',
- };
-
- it('accepts null context', () => {
- const expression = fn(null, args, {} as any);
-
- expect(expression.input.filters).toEqual([]);
- });
-
- it('accepts filter context', () => {
- const expression = fn(filterContext, args, {} as any);
- const embeddableFilters = getQueryFilters(filterContext.and);
-
- expect(expression.input.filters).toEqual(embeddableFilters);
- });
-});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
deleted file mode 100644
index 7ef8f0a09eb907..00000000000000
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/embeddable.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
-import { ExpressionValueFilter, EmbeddableInput } from '../../../types';
-import { EmbeddableExpressionType, EmbeddableExpression } from '../../expression_types';
-import { getFunctionHelp } from '../../../i18n';
-import { SavedObjectReference } from '../../../../../../src/core/types';
-import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
-import { decode, encode } from '../../../common/lib/embeddable_dataurl';
-import { InitializeArguments } from '.';
-
-export interface Arguments {
- config: string;
- type: string;
-}
-
-const defaultTimeRange = {
- from: 'now-15m',
- to: 'now',
-};
-
-const baseEmbeddableInput = {
- timeRange: defaultTimeRange,
- disableTriggers: true,
- renderMode: 'noInteractivity',
-};
-
-type Return = EmbeddableExpression;
-
-type EmbeddableFunction = ExpressionFunctionDefinition<
- 'embeddable',
- ExpressionValueFilter | null,
- Arguments,
- Return
->;
-
-export function embeddableFunctionFactory({
- embeddablePersistableStateService,
-}: InitializeArguments): () => EmbeddableFunction {
- return function embeddable(): EmbeddableFunction {
- const { help, args: argHelp } = getFunctionHelp().embeddable;
-
- return {
- name: 'embeddable',
- help,
- args: {
- config: {
- aliases: ['_'],
- types: ['string'],
- required: true,
- help: argHelp.config,
- },
- type: {
- types: ['string'],
- required: true,
- help: argHelp.type,
- },
- },
- context: {
- types: ['filter'],
- },
- type: EmbeddableExpressionType,
- fn: (input, args) => {
- const filters = input ? input.and : [];
-
- const embeddableInput = decode(args.config) as EmbeddableInput;
-
- return {
- type: EmbeddableExpressionType,
- input: {
- ...baseEmbeddableInput,
- ...embeddableInput,
- filters: getQueryFilters(filters),
- },
- generatedAt: Date.now(),
- embeddableType: args.type,
- };
- },
-
- extract(state) {
- const input = decode(state.config[0] as string);
-
- // extracts references for by-reference embeddables
- if (input.savedObjectId) {
- const refName = 'embeddable.savedObjectId';
-
- const references: SavedObjectReference[] = [
- {
- name: refName,
- type: state.type[0] as string,
- id: input.savedObjectId as string,
- },
- ];
-
- return {
- state,
- references,
- };
- }
-
- // extracts references for by-value embeddables
- const { state: extractedState, references: extractedReferences } =
- embeddablePersistableStateService.extract({
- ...input,
- type: state.type[0],
- });
-
- const { type, ...extractedInput } = extractedState;
-
- return {
- state: { ...state, config: [encode(extractedInput)], type: [type] },
- references: extractedReferences,
- };
- },
-
- inject(state, references) {
- const input = decode(state.config[0] as string);
- const savedObjectReference = references.find(
- (ref) => ref.name === 'embeddable.savedObjectId'
- );
-
- // injects saved object id for by-references embeddable
- if (savedObjectReference) {
- input.savedObjectId = savedObjectReference.id;
- state.config[0] = encode(input);
- state.type[0] = savedObjectReference.type;
- } else {
- // injects references for by-value embeddables
- const { type, ...injectedInput } = embeddablePersistableStateService.inject(
- { ...input, type: state.type[0] },
- references
- );
- state.config[0] = encode(injectedInput);
- state.type[0] = type;
- }
- return state;
- },
- };
- };
-}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
index 1d69e181b5fd9d..407a0e2ebfe05a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/index.ts
@@ -5,26 +5,9 @@
* 2.0.
*/
-import { EmbeddableStart } from 'src/plugins/embeddable/public';
-import { embeddableFunctionFactory } from './embeddable';
import { savedLens } from './saved_lens';
import { savedMap } from './saved_map';
import { savedSearch } from './saved_search';
import { savedVisualization } from './saved_visualization';
-export interface InitializeArguments {
- embeddablePersistableStateService: {
- extract: EmbeddableStart['extract'];
- inject: EmbeddableStart['inject'];
- };
-}
-
-export function initFunctions(initialize: InitializeArguments) {
- return [
- embeddableFunctionFactory(initialize),
- savedLens,
- savedMap,
- savedSearch,
- savedVisualization,
- ];
-}
+export const functions = [savedLens, savedMap, savedVisualization, savedSearch];
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
index 67947691f7757c..082a69a874cae2 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.ts
@@ -9,8 +9,9 @@ import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
import { PaletteOutput } from 'src/plugins/charts/common';
import { Filter as DataFilter } from '@kbn/es-query';
import { TimeRange } from 'src/plugins/data/common';
+import { EmbeddableInput } from 'src/plugins/embeddable/common';
import { getQueryFilters } from '../../../common/lib/build_embeddable_filters';
-import { ExpressionValueFilter, EmbeddableInput, TimeRange as TimeRangeArg } from '../../../types';
+import { ExpressionValueFilter, TimeRange as TimeRangeArg } from '../../../types';
import {
EmbeddableTypes,
EmbeddableExpressionType,
@@ -26,7 +27,7 @@ interface Arguments {
}
export type SavedLensInput = EmbeddableInput & {
- savedObjectId: string;
+ id: string;
timeRange?: TimeRange;
filters: DataFilter[];
palette?: PaletteOutput;
@@ -72,19 +73,18 @@ export function savedLens(): ExpressionFunctionDefinition<
},
},
type: EmbeddableExpressionType,
- fn: (input, { id, timerange, title, palette }) => {
+ fn: (input, args) => {
const filters = input ? input.and : [];
return {
type: EmbeddableExpressionType,
input: {
- id,
- savedObjectId: id,
+ id: args.id,
filters: getQueryFilters(filters),
- timeRange: timerange || defaultTimeRange,
- title: title === null ? undefined : title,
+ timeRange: args.timerange || defaultTimeRange,
+ title: args.title === null ? undefined : args.title,
disableTriggers: true,
- palette,
+ palette: args.palette,
},
embeddableType: EmbeddableTypes.lens,
generatedAt: Date.now(),
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
index a7471c755155c8..538ed3f9198239 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.ts
@@ -30,7 +30,7 @@ const defaultTimeRange = {
to: 'now',
};
-type Output = EmbeddableExpression;
+type Output = EmbeddableExpression;
export function savedMap(): ExpressionFunctionDefinition<
'savedMap',
@@ -85,9 +85,8 @@ export function savedMap(): ExpressionFunctionDefinition<
return {
type: EmbeddableExpressionType,
input: {
- id: args.id,
attributes: { title: '' },
- savedObjectId: args.id,
+ id: args.id,
filters: getQueryFilters(filters),
timeRange: args.timerange || defaultTimeRange,
refreshConfig: {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
index 31e3fb2a8c5643..5c0442b43250c8 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.ts
@@ -25,7 +25,7 @@ interface Arguments {
title: string | null;
}
-type Output = EmbeddableExpression;
+type Output = EmbeddableExpression;
const defaultTimeRange = {
from: 'now-15m',
@@ -94,7 +94,6 @@ export function savedVisualization(): ExpressionFunctionDefinition<
type: EmbeddableExpressionType,
input: {
id,
- savedObjectId: id,
disableTriggers: true,
timeRange: timerange || defaultTimeRange,
filters: getQueryFilters(filters),
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
index 591795637aebea..91c573fc4148ba 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts
@@ -7,14 +7,12 @@
import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
import { ChartsPluginStart } from 'src/plugins/charts/public';
-import { PresentationUtilPluginStart } from 'src/plugins/presentation_util/public';
import { CanvasSetup } from '../public';
import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
import { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
import { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
import { functions } from './functions/browser';
-import { initFunctions } from './functions/external';
import { typeFunctions } from './expression_types';
import { renderFunctions, renderFunctionFactories } from './renderers';
@@ -27,7 +25,6 @@ export interface StartDeps {
uiActions: UiActionsStart;
inspector: InspectorStart;
charts: ChartsPluginStart;
- presentationUtil: PresentationUtilPluginStart;
}
export type SetupInitializer = (core: CoreSetup, plugins: SetupDeps) => T;
@@ -42,13 +39,6 @@ export class CanvasSrcPlugin implements Plugin
plugins.canvas.addRenderers(renderFunctions);
core.getStartServices().then(([coreStart, depsStart]) => {
- const externalFunctions = initFunctions({
- embeddablePersistableStateService: {
- extract: depsStart.embeddable.extract,
- inject: depsStart.embeddable.inject,
- },
- });
- plugins.canvas.addFunctions(externalFunctions);
plugins.canvas.addRenderers(
renderFunctionFactories.map((factory: any) => factory(coreStart, depsStart))
);
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
index 953746c2808406..73e839433c25e0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx
@@ -13,17 +13,16 @@ import {
IEmbeddable,
EmbeddableFactory,
EmbeddableFactoryNotFoundError,
- isErrorEmbeddable,
} from '../../../../../../src/plugins/embeddable/public';
import { EmbeddableExpression } from '../../expression_types/embeddable';
import { RendererStrings } from '../../../i18n';
import { embeddableInputToExpression } from './embeddable_input_to_expression';
-import { RendererFactory, EmbeddableInput } from '../../../types';
+import { EmbeddableInput } from '../../expression_types';
+import { RendererFactory } from '../../../types';
import { CANVAS_EMBEDDABLE_CLASSNAME } from '../../../common/lib';
const { embeddable: strings } = RendererStrings;
-// registry of references to embeddables on the workpad
const embeddablesRegistry: {
[key: string]: IEmbeddable | Promise;
} = {};
@@ -31,11 +30,11 @@ const embeddablesRegistry: {
const renderEmbeddableFactory = (core: CoreStart, plugins: StartDeps) => {
const I18nContext = core.i18n.Context;
- return (embeddableObject: IEmbeddable) => {
+ return (embeddableObject: IEmbeddable, domNode: HTMLElement) => {
return (
@@ -57,9 +56,6 @@ export const embeddableRendererFactory = (
reuseDomNode: true,
render: async (domNode, { input, embeddableType }, handlers) => {
const uniqueId = handlers.getElementId();
- const isByValueEnabled = plugins.presentationUtil.labsService.isProjectEnabled(
- 'labs:canvas:byValueEmbeddable'
- );
if (!embeddablesRegistry[uniqueId]) {
const factory = Array.from(plugins.embeddable.getEmbeddableFactories()).find(
@@ -71,27 +67,15 @@ export const embeddableRendererFactory = (
throw new EmbeddableFactoryNotFoundError(embeddableType);
}
- const embeddableInput = { ...input, id: uniqueId };
-
- const embeddablePromise = input.savedObjectId
- ? factory
- .createFromSavedObject(input.savedObjectId, embeddableInput)
- .then((embeddable) => {
- // stores embeddable in registrey
- embeddablesRegistry[uniqueId] = embeddable;
- return embeddable;
- })
- : factory.create(embeddableInput).then((embeddable) => {
- if (!embeddable || isErrorEmbeddable(embeddable)) {
- return;
- }
- // stores embeddable in registry
- embeddablesRegistry[uniqueId] = embeddable as IEmbeddable;
- return embeddable;
- });
- embeddablesRegistry[uniqueId] = embeddablePromise as Promise;
-
- const embeddableObject = (await (async () => embeddablePromise)()) as IEmbeddable;
+ const embeddablePromise = factory
+ .createFromSavedObject(input.id, input)
+ .then((embeddable) => {
+ embeddablesRegistry[uniqueId] = embeddable;
+ return embeddable;
+ });
+ embeddablesRegistry[uniqueId] = embeddablePromise;
+
+ const embeddableObject = await (async () => embeddablePromise)();
const palettes = await plugins.charts.palettes.getPalettes();
@@ -102,8 +86,7 @@ export const embeddableRendererFactory = (
const updatedExpression = embeddableInputToExpression(
updatedInput,
embeddableType,
- palettes,
- isByValueEnabled
+ palettes
);
if (updatedExpression) {
@@ -111,7 +94,15 @@ export const embeddableRendererFactory = (
}
});
- ReactDOM.render(renderEmbeddable(embeddableObject), domNode, () => handlers.done());
+ ReactDOM.render(renderEmbeddable(embeddableObject, domNode), domNode, () =>
+ handlers.done()
+ );
+
+ handlers.onResize(() => {
+ ReactDOM.render(renderEmbeddable(embeddableObject, domNode), domNode, () =>
+ handlers.done()
+ );
+ });
handlers.onDestroy(() => {
subscription.unsubscribe();
@@ -124,7 +115,6 @@ export const embeddableRendererFactory = (
} else {
const embeddable = embeddablesRegistry[uniqueId];
- // updating embeddable input with changes made to expression or filters
if ('updateInput' in embeddable) {
embeddable.updateInput(input);
embeddable.reload();
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
index 80830eac240212..41cefad6a470fa 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts
@@ -10,7 +10,6 @@ import { EmbeddableTypes, EmbeddableInput } from '../../expression_types';
import { toExpression as mapToExpression } from './input_type_to_expression/map';
import { toExpression as visualizationToExpression } from './input_type_to_expression/visualization';
import { toExpression as lensToExpression } from './input_type_to_expression/lens';
-import { toExpression as genericToExpression } from './input_type_to_expression/embeddable';
export const inputToExpressionTypeMap = {
[EmbeddableTypes.map]: mapToExpression,
@@ -24,13 +23,8 @@ export const inputToExpressionTypeMap = {
export function embeddableInputToExpression(
input: EmbeddableInput,
embeddableType: string,
- palettes: PaletteRegistry,
- useGenericEmbeddable?: boolean
+ palettes: PaletteRegistry
): string | undefined {
- if (useGenericEmbeddable) {
- return genericToExpression(input, embeddableType);
- }
-
if (inputToExpressionTypeMap[embeddableType]) {
return inputToExpressionTypeMap[embeddableType](input as any, palettes);
}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.test.ts
deleted file mode 100644
index 4b78acec8750ac..00000000000000
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.test.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { toExpression } from './embeddable';
-import { EmbeddableInput } from '../../../../types';
-import { decode } from '../../../../common/lib/embeddable_dataurl';
-import { fromExpression } from '@kbn/interpreter/common';
-
-describe('toExpression', () => {
- describe('by-reference embeddable input', () => {
- const baseEmbeddableInput = {
- id: 'elementId',
- savedObjectId: 'embeddableId',
- filters: [],
- };
-
- it('converts to an embeddable expression', () => {
- const input: EmbeddableInput = baseEmbeddableInput;
-
- const expression = toExpression(input, 'visualization');
- const ast = fromExpression(expression);
-
- expect(ast.type).toBe('expression');
- expect(ast.chain[0].function).toBe('embeddable');
- expect(ast.chain[0].arguments.type[0]).toBe('visualization');
-
- const config = decode(ast.chain[0].arguments.config[0] as string);
-
- expect(config.savedObjectId).toStrictEqual(input.savedObjectId);
- });
-
- it('includes optional input values', () => {
- const input: EmbeddableInput = {
- ...baseEmbeddableInput,
- title: 'title',
- timeRange: {
- from: 'now-1h',
- to: 'now',
- },
- };
-
- const expression = toExpression(input, 'visualization');
- const ast = fromExpression(expression);
-
- const config = decode(ast.chain[0].arguments.config[0] as string);
-
- expect(config).toHaveProperty('title', input.title);
- expect(config).toHaveProperty('timeRange');
- expect(config.timeRange).toHaveProperty('from', input.timeRange?.from);
- expect(config.timeRange).toHaveProperty('to', input.timeRange?.to);
- });
-
- it('includes empty panel title', () => {
- const input: EmbeddableInput = {
- ...baseEmbeddableInput,
- title: '',
- };
-
- const expression = toExpression(input, 'visualization');
- const ast = fromExpression(expression);
-
- const config = decode(ast.chain[0].arguments.config[0] as string);
-
- expect(config).toHaveProperty('title', input.title);
- });
- });
-
- describe('by-value embeddable input', () => {
- const baseEmbeddableInput = {
- id: 'elementId',
- disableTriggers: true,
- filters: [],
- };
- it('converts to an embeddable expression', () => {
- const input: EmbeddableInput = baseEmbeddableInput;
-
- const expression = toExpression(input, 'visualization');
- const ast = fromExpression(expression);
-
- expect(ast.type).toBe('expression');
- expect(ast.chain[0].function).toBe('embeddable');
- expect(ast.chain[0].arguments.type[0]).toBe('visualization');
-
- const config = decode(ast.chain[0].arguments.config[0] as string);
- expect(config.filters).toStrictEqual(input.filters);
- expect(config.disableTriggers).toStrictEqual(input.disableTriggers);
- });
-
- it('includes optional input values', () => {
- const input: EmbeddableInput = {
- ...baseEmbeddableInput,
- title: 'title',
- timeRange: {
- from: 'now-1h',
- to: 'now',
- },
- };
-
- const expression = toExpression(input, 'visualization');
- const ast = fromExpression(expression);
-
- const config = decode(ast.chain[0].arguments.config[0] as string);
-
- expect(config).toHaveProperty('title', input.title);
- expect(config).toHaveProperty('timeRange');
- expect(config.timeRange).toHaveProperty('from', input.timeRange?.from);
- expect(config.timeRange).toHaveProperty('to', input.timeRange?.to);
- });
-
- it('includes empty panel title', () => {
- const input: EmbeddableInput = {
- ...baseEmbeddableInput,
- title: '',
- };
-
- const expression = toExpression(input, 'visualization');
- const ast = fromExpression(expression);
-
- const config = decode(ast.chain[0].arguments.config[0] as string);
-
- expect(config).toHaveProperty('title', input.title);
- });
- });
-});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.ts
deleted file mode 100644
index 94d86f6640be1d..00000000000000
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/embeddable.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { encode } from '../../../../common/lib/embeddable_dataurl';
-import { EmbeddableInput } from '../../../expression_types';
-
-export function toExpression(input: EmbeddableInput, embeddableType: string): string {
- return `embeddable config="${encode(input)}" type="${embeddableType}"`;
-}
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
index 224cdfba389d77..24da7238bcee94 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts
@@ -11,8 +11,7 @@ import { fromExpression, Ast } from '@kbn/interpreter/common';
import { chartPluginMock } from 'src/plugins/charts/public/mocks';
const baseEmbeddableInput = {
- id: 'elementId',
- savedObjectId: 'embeddableId',
+ id: 'embeddableId',
filters: [],
};
@@ -28,7 +27,7 @@ describe('toExpression', () => {
expect(ast.type).toBe('expression');
expect(ast.chain[0].function).toBe('savedLens');
- expect(ast.chain[0].arguments.id).toStrictEqual([input.savedObjectId]);
+ expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
expect(ast.chain[0].arguments).not.toHaveProperty('title');
expect(ast.chain[0].arguments).not.toHaveProperty('timerange');
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
index 5a13b73b3fe746..35e106f234fa4e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts
@@ -14,7 +14,7 @@ export function toExpression(input: SavedLensInput, palettes: PaletteRegistry):
expressionParts.push('savedLens');
- expressionParts.push(`id="${input.savedObjectId}"`);
+ expressionParts.push(`id="${input.id}"`);
if (input.title !== undefined) {
expressionParts.push(`title="${input.title}"`);
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
index af7b40a9b283d9..804d0d849cc7f7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts
@@ -6,12 +6,12 @@
*/
import { toExpression } from './map';
+import { MapEmbeddableInput } from '../../../../../../plugins/maps/public/embeddable';
import { fromExpression, Ast } from '@kbn/interpreter/common';
const baseSavedMapInput = {
- id: 'elementId',
attributes: { title: '' },
- savedObjectId: 'embeddableId',
+ id: 'embeddableId',
filters: [],
isLayerTOCOpen: false,
refreshConfig: {
@@ -23,7 +23,7 @@ const baseSavedMapInput = {
describe('toExpression', () => {
it('converts to a savedMap expression', () => {
- const input = {
+ const input: MapEmbeddableInput = {
...baseSavedMapInput,
};
@@ -33,7 +33,7 @@ describe('toExpression', () => {
expect(ast.type).toBe('expression');
expect(ast.chain[0].function).toBe('savedMap');
- expect(ast.chain[0].arguments.id).toStrictEqual([input.savedObjectId]);
+ expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
expect(ast.chain[0].arguments).not.toHaveProperty('title');
expect(ast.chain[0].arguments).not.toHaveProperty('center');
@@ -41,7 +41,7 @@ describe('toExpression', () => {
});
it('includes optional input values', () => {
- const input = {
+ const input: MapEmbeddableInput = {
...baseSavedMapInput,
mapCenter: {
lat: 1,
@@ -73,7 +73,7 @@ describe('toExpression', () => {
});
it('includes empty panel title', () => {
- const input = {
+ const input: MapEmbeddableInput = {
...baseSavedMapInput,
title: '',
};
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
index 03746f38b4696c..3fd6a68a327c60 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts
@@ -5,14 +5,13 @@
* 2.0.
*/
-import { MapEmbeddableInput } from '../../../../../../plugins/maps/public';
+import { MapEmbeddableInput } from '../../../../../../plugins/maps/public/embeddable';
-export function toExpression(input: MapEmbeddableInput & { savedObjectId: string }): string {
+export function toExpression(input: MapEmbeddableInput): string {
const expressionParts = [] as string[];
expressionParts.push('savedMap');
-
- expressionParts.push(`id="${input.savedObjectId}"`);
+ expressionParts.push(`id="${input.id}"`);
if (input.title !== undefined) {
expressionParts.push(`title="${input.title}"`);
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts
index 4c61a130f3c95f..c5106b9a102b40 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts
@@ -9,8 +9,7 @@ import { toExpression } from './visualization';
import { fromExpression, Ast } from '@kbn/interpreter/common';
const baseInput = {
- id: 'elementId',
- savedObjectId: 'embeddableId',
+ id: 'embeddableId',
};
describe('toExpression', () => {
@@ -25,7 +24,7 @@ describe('toExpression', () => {
expect(ast.type).toBe('expression');
expect(ast.chain[0].function).toBe('savedVisualization');
- expect(ast.chain[0].arguments.id).toStrictEqual([input.savedObjectId]);
+ expect(ast.chain[0].arguments.id).toStrictEqual([input.id]);
});
it('includes timerange if given', () => {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
index 364d7cd0755db4..bcb73b2081fee5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts
@@ -7,11 +7,11 @@
import { VisualizeInput } from 'src/plugins/visualizations/public';
-export function toExpression(input: VisualizeInput & { savedObjectId: string }): string {
+export function toExpression(input: VisualizeInput): string {
const expressionParts = [] as string[];
expressionParts.push('savedVisualization');
- expressionParts.push(`id="${input.savedObjectId}"`);
+ expressionParts.push(`id="${input.id}"`);
if (input.title !== undefined) {
expressionParts.push(`title="${input.title}"`);
diff --git a/x-pack/plugins/canvas/common/lib/embeddable_dataurl.ts b/x-pack/plugins/canvas/common/lib/embeddable_dataurl.ts
deleted file mode 100644
index e76dedfe63b14a..00000000000000
--- a/x-pack/plugins/canvas/common/lib/embeddable_dataurl.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EmbeddableInput } from '../../types';
-
-export const encode = (input: Partial) =>
- Buffer.from(JSON.stringify(input)).toString('base64');
-export const decode = (serializedInput: string) =>
- JSON.parse(Buffer.from(serializedInput, 'base64').toString());
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/embeddable.ts b/x-pack/plugins/canvas/i18n/functions/dict/embeddable.ts
deleted file mode 100644
index 279f58799e8c00..00000000000000
--- a/x-pack/plugins/canvas/i18n/functions/dict/embeddable.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { i18n } from '@kbn/i18n';
-import { embeddableFunctionFactory } from '../../../canvas_plugin_src/functions/external/embeddable';
-import { FunctionHelp } from '../function_help';
-import { FunctionFactory } from '../../../types';
-
-export const help: FunctionHelp>> = {
- help: i18n.translate('xpack.canvas.functions.embeddableHelpText', {
- defaultMessage: `Returns an embeddable with the provided configuration`,
- }),
- args: {
- config: i18n.translate('xpack.canvas.functions.embeddable.args.idHelpText', {
- defaultMessage: `The base64 encoded embeddable input object`,
- }),
- type: i18n.translate('xpack.canvas.functions.embeddable.args.typeHelpText', {
- defaultMessage: `The embeddable type`,
- }),
- },
-};
diff --git a/x-pack/plugins/canvas/i18n/functions/function_help.ts b/x-pack/plugins/canvas/i18n/functions/function_help.ts
index 520d32af1c272c..5eae785fefa2ea 100644
--- a/x-pack/plugins/canvas/i18n/functions/function_help.ts
+++ b/x-pack/plugins/canvas/i18n/functions/function_help.ts
@@ -27,7 +27,6 @@ import { help as demodata } from './dict/demodata';
import { help as doFn } from './dict/do';
import { help as dropdownControl } from './dict/dropdown_control';
import { help as eq } from './dict/eq';
-import { help as embeddable } from './dict/embeddable';
import { help as escount } from './dict/escount';
import { help as esdocs } from './dict/esdocs';
import { help as essql } from './dict/essql';
@@ -183,7 +182,6 @@ export const getFunctionHelp = (): FunctionHelpDict => ({
do: doFn,
dropdownControl,
eq,
- embeddable,
escount,
esdocs,
essql,
diff --git a/x-pack/plugins/canvas/kibana.json b/x-pack/plugins/canvas/kibana.json
index 2fd312502a3c74..9c4d1b2179d821 100644
--- a/x-pack/plugins/canvas/kibana.json
+++ b/x-pack/plugins/canvas/kibana.json
@@ -25,7 +25,6 @@
"features",
"inspector",
"presentationUtil",
- "visualizations",
"uiActions",
"share"
],
diff --git a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
index 57f52fcf21f0f9..bf731876bf8c88 100644
--- a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
+++ b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.component.tsx
@@ -5,7 +5,7 @@
* 2.0.
*/
-import React, { FC, useCallback } from 'react';
+import React, { FC } from 'react';
import { EuiFlyout, EuiFlyoutHeader, EuiFlyoutBody, EuiTitle } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
@@ -27,44 +27,38 @@ const strings = {
};
export interface Props {
onClose: () => void;
- onSelect: (id: string, embeddableType: string, isByValueEnabled?: boolean) => void;
+ onSelect: (id: string, embeddableType: string) => void;
availableEmbeddables: string[];
- isByValueEnabled?: boolean;
}
-export const AddEmbeddableFlyout: FC = ({
- onSelect,
- availableEmbeddables,
- onClose,
- isByValueEnabled,
-}) => {
+export const AddEmbeddableFlyout: FC = ({ onSelect, availableEmbeddables, onClose }) => {
const embeddablesService = useEmbeddablesService();
const platformService = usePlatformService();
const { getEmbeddableFactories } = embeddablesService;
const { getSavedObjects, getUISettings } = platformService;
- const onAddPanel = useCallback(
- (id: string, savedObjectType: string) => {
- const embeddableFactories = getEmbeddableFactories();
- // Find the embeddable type from the saved object type
- const found = Array.from(embeddableFactories).find((embeddableFactory) => {
- return Boolean(
- embeddableFactory.savedObjectMetaData &&
- embeddableFactory.savedObjectMetaData.type === savedObjectType
- );
- });
+ const onAddPanel = (id: string, savedObjectType: string, name: string) => {
+ const embeddableFactories = getEmbeddableFactories();
- const foundEmbeddableType = found ? found.type : 'unknown';
+ // Find the embeddable type from the saved object type
+ const found = Array.from(embeddableFactories).find((embeddableFactory) => {
+ return Boolean(
+ embeddableFactory.savedObjectMetaData &&
+ embeddableFactory.savedObjectMetaData.type === savedObjectType
+ );
+ });
- onSelect(id, foundEmbeddableType, isByValueEnabled);
- },
- [isByValueEnabled, getEmbeddableFactories, onSelect]
- );
+ const foundEmbeddableType = found ? found.type : 'unknown';
+
+ onSelect(id, foundEmbeddableType);
+ };
const embeddableFactories = getEmbeddableFactories();
const availableSavedObjects = Array.from(embeddableFactories)
- .filter((factory) => isByValueEnabled || availableEmbeddables.includes(factory.type))
+ .filter((factory) => {
+ return availableEmbeddables.includes(factory.type);
+ })
.map((factory) => factory.savedObjectMetaData)
.filter>(function (
maybeSavedObjectMetaData
diff --git a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx
index 4dc8d963932d8f..770a4cac606b0b 100644
--- a/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx
+++ b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx
@@ -8,14 +8,12 @@
import React, { useMemo, useEffect, useCallback } from 'react';
import { createPortal } from 'react-dom';
import { useSelector, useDispatch } from 'react-redux';
-import { encode } from '../../../common/lib/embeddable_dataurl';
import { AddEmbeddableFlyout as Component, Props as ComponentProps } from './flyout.component';
// @ts-expect-error untyped local
import { addElement } from '../../state/actions/elements';
import { getSelectedPage } from '../../state/selectors/workpad';
import { EmbeddableTypes } from '../../../canvas_plugin_src/expression_types/embeddable';
import { State } from '../../../types';
-import { useLabsService } from '../../services';
const allowedEmbeddables = {
[EmbeddableTypes.map]: (id: string) => {
@@ -67,9 +65,6 @@ export const AddEmbeddablePanel: React.FunctionComponent = ({
availableEmbeddables,
...restProps
}) => {
- const labsService = useLabsService();
- const isByValueEnabled = labsService.isProjectEnabled('labs:canvas:byValueEmbeddable');
-
const dispatch = useDispatch();
const pageId = useSelector((state) => getSelectedPage(state));
@@ -79,27 +74,18 @@ export const AddEmbeddablePanel: React.FunctionComponent = ({
);
const onSelect = useCallback(
- (id: string, type: string): void => {
+ (id: string, type: string) => {
const partialElement = {
expression: `markdown "Could not find embeddable for type ${type}" | render`,
};
-
- // If by-value is enabled, we'll handle both by-reference and by-value embeddables
- // with the new generic `embeddable` function.
- // Otherwise we fallback to the embeddable type specific expressions.
- if (isByValueEnabled) {
- const config = encode({ savedObjectId: id });
- partialElement.expression = `embeddable config="${config}"
- type="${type}"
-| render`;
- } else if (allowedEmbeddables[type]) {
+ if (allowedEmbeddables[type]) {
partialElement.expression = allowedEmbeddables[type](id);
}
addEmbeddable(pageId, partialElement);
restProps.onClose();
},
- [addEmbeddable, pageId, restProps, isByValueEnabled]
+ [addEmbeddable, pageId, restProps]
);
return (
@@ -107,7 +93,6 @@ export const AddEmbeddablePanel: React.FunctionComponent = ({
{...restProps}
availableEmbeddables={availableEmbeddables || []}
onSelect={onSelect}
- isByValueEnabled={isByValueEnabled}
/>
);
};
diff --git a/x-pack/plugins/canvas/public/components/hooks/workpad/index.tsx b/x-pack/plugins/canvas/public/components/hooks/workpad/index.tsx
index ffd5b095b12e52..50d527036560ad 100644
--- a/x-pack/plugins/canvas/public/components/hooks/workpad/index.tsx
+++ b/x-pack/plugins/canvas/public/components/hooks/workpad/index.tsx
@@ -6,5 +6,3 @@
*/
export { useDownloadWorkpad, useDownloadRenderedWorkpad } from './use_download_workpad';
-
-export { useIncomingEmbeddable } from './use_incoming_embeddable';
diff --git a/x-pack/plugins/canvas/public/components/hooks/workpad/use_incoming_embeddable.ts b/x-pack/plugins/canvas/public/components/hooks/workpad/use_incoming_embeddable.ts
deleted file mode 100644
index 2f8e2503ea57ef..00000000000000
--- a/x-pack/plugins/canvas/public/components/hooks/workpad/use_incoming_embeddable.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { useEffect } from 'react';
-import { useDispatch } from 'react-redux';
-import { fromExpression } from '@kbn/interpreter/common';
-import { CANVAS_APP } from '../../../../common/lib';
-import { decode, encode } from '../../../../common/lib/embeddable_dataurl';
-import { CanvasElement, CanvasPage } from '../../../../types';
-import { useEmbeddablesService, useLabsService } from '../../../services';
-// @ts-expect-error unconverted file
-import { addElement } from '../../../state/actions/elements';
-// @ts-expect-error unconverted file
-import { selectToplevelNodes } from '../../../state/actions/transient';
-
-import {
- updateEmbeddableExpression,
- fetchEmbeddableRenderable,
-} from '../../../state/actions/embeddable';
-import { clearValue } from '../../../state/actions/resolved_args';
-
-export const useIncomingEmbeddable = (selectedPage: CanvasPage) => {
- const embeddablesService = useEmbeddablesService();
- const labsService = useLabsService();
- const dispatch = useDispatch();
- const isByValueEnabled = labsService.isProjectEnabled('labs:canvas:byValueEmbeddable');
- const stateTransferService = embeddablesService.getStateTransfer();
-
- // fetch incoming embeddable from state transfer service.
- const incomingEmbeddable = stateTransferService.getIncomingEmbeddablePackage(CANVAS_APP, true);
-
- useEffect(() => {
- if (isByValueEnabled && incomingEmbeddable) {
- const { embeddableId, input: incomingInput, type } = incomingEmbeddable;
-
- // retrieve existing element
- const originalElement = selectedPage.elements.find(
- ({ id }: CanvasElement) => id === embeddableId
- );
-
- if (originalElement) {
- const originalAst = fromExpression(originalElement!.expression);
-
- const functionIndex = originalAst.chain.findIndex(
- ({ function: fn }) => fn === 'embeddable'
- );
-
- const originalInput = decode(
- originalAst.chain[functionIndex].arguments.config[0] as string
- );
-
- // clear out resolved arg for old embeddable
- const argumentPath = [embeddableId, 'expressionRenderable'];
- dispatch(clearValue({ path: argumentPath }));
-
- const updatedInput = { ...originalInput, ...incomingInput };
-
- const expression = `embeddable config="${encode(updatedInput)}"
- type="${type}"
-| render`;
-
- dispatch(
- updateEmbeddableExpression({
- elementId: originalElement.id,
- embeddableExpression: expression,
- })
- );
-
- // update resolved args
- dispatch(fetchEmbeddableRenderable(originalElement.id));
-
- // select new embeddable element
- dispatch(selectToplevelNodes([embeddableId]));
- } else {
- const expression = `embeddable config="${encode(incomingInput)}"
- type="${type}"
-| render`;
- dispatch(addElement(selectedPage.id, { expression }));
- }
- }
- }, [dispatch, selectedPage, incomingEmbeddable, isByValueEnabled]);
-};
diff --git a/x-pack/plugins/canvas/public/components/workpad/workpad.tsx b/x-pack/plugins/canvas/public/components/workpad/workpad.tsx
index 7cc077203c7372..622c885b6ef281 100644
--- a/x-pack/plugins/canvas/public/components/workpad/workpad.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad/workpad.tsx
@@ -27,7 +27,6 @@ import { WorkpadRoutingContext } from '../../routes/workpad';
import { usePlatformService } from '../../services';
import { Workpad as WorkpadComponent, Props } from './workpad.component';
import { State } from '../../../types';
-import { useIncomingEmbeddable } from '../hooks';
type ContainerProps = Pick;
@@ -59,9 +58,6 @@ export const Workpad: FC = (props) => {
};
});
- const selectedPage = propsFromState.pages[propsFromState.selectedPageNumber - 1];
- useIncomingEmbeddable(selectedPage);
-
const fetchAllRenderables = useCallback(() => {
dispatch(fetchAllRenderablesAction());
}, [dispatch]);
diff --git a/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss
index 0ddd44ed8f9a81..4acdca10d61cc2 100644
--- a/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss
+++ b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss
@@ -31,7 +31,7 @@ $canvasLayoutFontSize: $euiFontSizeS;
.canvasLayout__stageHeader {
flex-grow: 0;
flex-basis: auto;
- padding: $euiSizeS $euiSize;
+ padding: $euiSizeS;
font-size: $canvasLayoutFontSize;
border-bottom: $euiBorderThin;
background: $euiColorLightestShade;
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/__snapshots__/editor_menu.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/__snapshots__/editor_menu.stories.storyshot
deleted file mode 100644
index f4aab0e59e7ee6..00000000000000
--- a/x-pack/plugins/canvas/public/components/workpad_header/editor_menu/__stories__/__snapshots__/editor_menu.stories.storyshot
+++ /dev/null
@@ -1,81 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots components/WorkpadHeader/EditorMenu dark mode 1`] = `
-
-
-
-
-
-
-
-
-