From fa8ef7b956f6ded309aa4a3abf553e40c0852794 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Fri, 28 Feb 2020 11:51:09 -0700 Subject: [PATCH] fix typescript errors --- .../public/discover/np_ready/angular/context_state.ts | 3 ++- .../components/field_chooser/lib/visualize_url_utils.ts | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts index 8fb6140d55e319..381a0a06db1136 100644 --- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts +++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts @@ -24,7 +24,7 @@ import { syncStates, BaseStateContainer, } from '../../../../../../../plugins/kibana_utils/public'; -import { esFilters, FilterManager, Filter } from '../../../../../../../plugins/data/public'; +import { esFilters, FilterManager, Filter, Query } from '../../../../../../../plugins/data/public'; interface AppState { /** @@ -47,6 +47,7 @@ interface AppState { * Number of records to be fetched after the anchor records (older records) */ successorCount: number; + query: Query; } interface GlobalState { diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/visualize_url_utils.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/visualize_url_utils.ts index 66630f722e608b..6b30611fb9bfcc 100644 --- a/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/visualize_url_utils.ts +++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/components/field_chooser/lib/visualize_url_utils.ts @@ -19,6 +19,7 @@ import uuid from 'uuid/v4'; import rison from 'rison-node'; import { IFieldType, IIndexPattern } from 'src/plugins/data/public'; +import { AppState } from '../../../angular/context_state'; import { getServices } from '../../../../kibana_services'; function getMapsAppBaseUrl() { @@ -48,7 +49,7 @@ export function isFieldVisualizable(field: IFieldType) { export function getMapsAppUrl( field: IFieldType, indexPattern: IIndexPattern, - appState: any, + appState: AppState, columns: string[] ) { const mapAppParams = new URLSearchParams(); @@ -57,7 +58,10 @@ export function getMapsAppUrl( const locationSplit = window.location.href.split('discover?'); if (locationSplit.length > 1) { const discoverParams = new URLSearchParams(locationSplit[1]); - mapAppParams.set('_g', discoverParams.get('_g')); + const globalStateUrlValue = discoverParams.get('_g'); + if (globalStateUrlValue) { + mapAppParams.set('_g', globalStateUrlValue); + } } // Copy filters and query in app state