From 05064c621bfaf111c29c9babc81779aad0485cf9 Mon Sep 17 00:00:00 2001 From: DziyanaDzeraviankina Date: Thu, 31 Mar 2022 15:10:15 +0300 Subject: [PATCH 1/2] Replace "Save and return" button with "Save" for Lens visualization created from Discover histogram to avoid confusion --- .../application/main/components/chart/discover_chart.tsx | 2 +- .../components/sidebar/lib/visualize_trigger_utils.ts | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx b/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx index bd0f637f14c71..8b6d1b5ce4f69 100644 --- a/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx +++ b/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx @@ -83,7 +83,7 @@ export function DiscoverChart({ if (!timeField) { return; } - triggerVisualizeActions(timeField, indexPattern.id, savedSearch.columns || []); + triggerVisualizeActions(timeField, indexPattern.id, savedSearch.columns || [], false); }, [indexPattern.id, savedSearch, timeField]); const onShowChartOptions = useCallback(() => { diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts index 50ca2cae1bcc7..df035d5ac2903 100644 --- a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts +++ b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts @@ -46,7 +46,8 @@ async function getCompatibleActions( export function triggerVisualizeActions( field: DataViewField, indexPatternId: string | undefined, - contextualFields: string[] + contextualFields: string[], + shouldPassOriginatingApp: boolean = true ) { if (!indexPatternId) return; const trigger = getTriggerConstant(field.type); @@ -54,7 +55,11 @@ export function triggerVisualizeActions( indexPatternId, fieldName: field.name, contextualFields, - originatingApp: APP_ID, + ...(shouldPassOriginatingApp + ? { + originatingApp: APP_ID, + } + : {}), }; getUiActions().getTrigger(trigger).exec(triggerOptions); } From 23b27aba974db4c34e4b74e6bfef8a59aedda2a4 Mon Sep 17 00:00:00 2001 From: DziyanaDzeraviankina Date: Wed, 6 Apr 2022 12:10:12 +0300 Subject: [PATCH 2/2] Remove passing originatingApp as trigger options at all to replace "Save and return" with "Save" for the field visualized from Discover --- src/plugins/discover/common/index.ts | 1 - .../application/main/components/chart/discover_chart.tsx | 2 +- .../components/sidebar/lib/visualize_trigger_utils.ts | 9 +-------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/plugins/discover/common/index.ts b/src/plugins/discover/common/index.ts index f2a9e53fc067c..98ce5fc3b0b2b 100644 --- a/src/plugins/discover/common/index.ts +++ b/src/plugins/discover/common/index.ts @@ -6,7 +6,6 @@ * Side Public License, v 1. */ -export const APP_ID = 'discover'; export const DEFAULT_COLUMNS_SETTING = 'defaultColumns'; export const SAMPLE_SIZE_SETTING = 'discover:sampleSize'; export const SORT_DEFAULT_ORDER_SETTING = 'discover:sort:defaultOrder'; diff --git a/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx b/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx index 8b6d1b5ce4f69..bd0f637f14c71 100644 --- a/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx +++ b/src/plugins/discover/public/application/main/components/chart/discover_chart.tsx @@ -83,7 +83,7 @@ export function DiscoverChart({ if (!timeField) { return; } - triggerVisualizeActions(timeField, indexPattern.id, savedSearch.columns || [], false); + triggerVisualizeActions(timeField, indexPattern.id, savedSearch.columns || []); }, [indexPattern.id, savedSearch, timeField]); const onShowChartOptions = useCallback(() => { diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts index df035d5ac2903..ff9406c21c02f 100644 --- a/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts +++ b/src/plugins/discover/public/application/main/components/sidebar/lib/visualize_trigger_utils.ts @@ -15,7 +15,6 @@ import { import { getUiActions } from '../../../../../kibana_services'; import type { DataViewField } from '../../../../../../../data_views/public'; import { KBN_FIELD_TYPES } from '../../../../../../../data/public'; -import { APP_ID } from '../../../../../../common'; function getTriggerConstant(type: string) { return type === KBN_FIELD_TYPES.GEO_POINT || type === KBN_FIELD_TYPES.GEO_SHAPE @@ -46,8 +45,7 @@ async function getCompatibleActions( export function triggerVisualizeActions( field: DataViewField, indexPatternId: string | undefined, - contextualFields: string[], - shouldPassOriginatingApp: boolean = true + contextualFields: string[] ) { if (!indexPatternId) return; const trigger = getTriggerConstant(field.type); @@ -55,11 +53,6 @@ export function triggerVisualizeActions( indexPatternId, fieldName: field.name, contextualFields, - ...(shouldPassOriginatingApp - ? { - originatingApp: APP_ID, - } - : {}), }; getUiActions().getTrigger(trigger).exec(triggerOptions); }