Merge branch 'master' into ml-migrate-router

x-pack/plugins/maps/public/actions/map_actions.ts

@@ -14,9 +14,11 @@ import { Filter, Query, TimeRange } from 'src/plugins/data/public';
 import { MapStoreState } from '../reducers/store';
 import {
   getDataFilters,
+  getFilters,
   getMapSettings,
   getWaitingForMapReadyLayerListRaw,
   getQuery,
+  getTimeFilters,
 } from '../selectors/map_selectors';
 import {
   CLEAR_GOTO,
@@ -217,13 +219,13 @@ export function setQuery({
 
     dispatch({
       type: SET_QUERY,
-      timeFilters,
+      timeFilters: timeFilters ? timeFilters : getTimeFilters(getState()),
       query: {
-        ...query,
+        ...(query ? query : getQuery(getState())),
         // ensure query changes to trigger re-fetch when "Refresh" clicked
         queryLastTriggeredAt: refresh ? generateQueryTimestamp() : prevTriggeredAt,
       },
-      filters,
+      filters: filters ? filters : getFilters(getState()),
     });
 
     if (getMapSettings(getState()).autoFitToDataBounds) {

x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts

@@ -48,7 +48,7 @@ export class MapEmbeddableFactory implements EmbeddableFactoryDefinition {
     const {
       addLayerWithoutDataSync,
       createMapStore,
-      getIndexPatternService,
+      getIndexPatternsFromIds,
       getQueryableUniqueIndexPatternIds,
     } = await lazyLoadMapModules();
     const store = createMapStore();
@@ -66,17 +66,7 @@ export class MapEmbeddableFactory implements EmbeddableFactoryDefinition {
       );
     }
 
-    const promises = queryableIndexPatternIds.map(async (indexPatternId) => {
-      try {
-        // @ts-ignore
-        return await getIndexPatternService().get(indexPatternId);
-      } catch (error) {
-        // Unable to load index pattern, better to not throw error so map embeddable can render
-        // Error will be surfaced by map embeddable since it too will be unable to locate the index pattern
-        return null;
-      }
-    });
-    const indexPatterns = await Promise.all(promises);
+    const indexPatterns = await getIndexPatternsFromIds(queryableIndexPatternIds);
     return _.compact(indexPatterns) as IIndexPattern[];
   }
 

x-pack/plugins/maps/public/index_pattern_util.ts

@@ -30,11 +30,17 @@ export function getGeoTileAggNotSupportedReason(field: IFieldType): string | nul
 export async function getIndexPatternsFromIds(
   indexPatternIds: string[] = []
 ): Promise<IndexPattern[]> {
-  const promises: Array<Promise<IndexPattern>> = [];
-  indexPatternIds.forEach((id) => {
-    promises.push(getIndexPatternService().get(id));
+  const promises: IndexPattern[] = [];
+  indexPatternIds.forEach(async (indexPatternId) => {
+    try {
+      // @ts-ignore
+      promises.push(getIndexPatternService().get(indexPatternId));
+    } catch (error) {
+      // Unable to load index pattern, better to not throw error so map can render
+      // Error will be surfaced by layer since it too will be unable to locate the index pattern
+      return null;
+    }
   });
-
   return await Promise.all(promises);
 }
 

x-pack/plugins/maps/public/lazy_load_bundle/index.ts

@@ -8,6 +8,7 @@ import { AnyAction } from 'redux';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { IndexPatternsService } from 'src/plugins/data/public/index_patterns';
 import { ReactElement } from 'react';
+import { IndexPattern } from 'src/plugins/data/public';
 import { Embeddable, IContainer } from '../../../../../src/plugins/embeddable/public';
 import { LayerDescriptor } from '../../common/descriptor_types';
 import { MapStore, MapStoreState } from '../reducers/store';
@@ -44,8 +45,9 @@ interface LazyLoadedMapModules {
     indexPatternId: string,
     indexPatternTitle: string
   ) => LayerDescriptor[];
-  registerLayerWizard(layerWizard: LayerWizard): void;
+  registerLayerWizard: (layerWizard: LayerWizard) => void;
   registerSource(entry: SourceRegistryEntry): void;
+  getIndexPatternsFromIds: (indexPatternIds: string[]) => Promise<IndexPattern[]>;
 }
 
 export async function lazyLoadMapModules(): Promise<LazyLoadedMapModules> {
@@ -71,6 +73,7 @@ export async function lazyLoadMapModules(): Promise<LazyLoadedMapModules> {
       createSecurityLayerDescriptors,
       registerLayerWizard,
       registerSource,
+      getIndexPatternsFromIds,
     } = await import('./lazy');
 
     resolve({
@@ -88,6 +91,7 @@ export async function lazyLoadMapModules(): Promise<LazyLoadedMapModules> {
       createSecurityLayerDescriptors,
       registerLayerWizard,
       registerSource,
+      getIndexPatternsFromIds,
     });
   });
   return loadModulesPromise;

x-pack/plugins/maps/public/lazy_load_bundle/lazy/index.ts

@@ -21,3 +21,4 @@ export * from '../../routing/maps_router';
 export * from '../../classes/layers/solution_layers/security';
 export { registerLayerWizard } from '../../classes/layers/layer_wizard_registry';
 export { registerSource } from '../../classes/sources/source_registry';
+export { getIndexPatternsFromIds } from '../../index_pattern_util';

x-pack/plugins/maps/public/routing/bootstrap/get_initial_layers.js

@@ -3,7 +3,10 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
 import _ from 'lodash';
+import rison from 'rison-node';
+import { i18n } from '@kbn/i18n';
 // Import each layer type, even those not used, to init in registry
 import '../../classes/sources/wms_source';
 import '../../classes/sources/ems_file_source';
@@ -16,7 +19,7 @@ import { KibanaTilemapSource } from '../../classes/sources/kibana_tilemap_source
 import { TileLayer } from '../../classes/layers/tile_layer/tile_layer';
 import { EMSTMSSource } from '../../classes/sources/ems_tms_source';
 import { VectorTileLayer } from '../../classes/layers/vector_tile_layer/vector_tile_layer';
-import { getIsEmsEnabled } from '../../kibana_services';
+import { getIsEmsEnabled, getToasts } from '../../kibana_services';
 import { getKibanaTileMap } from '../../meta';
 
 export function getInitialLayers(layerListJSON, initialLayers = []) {
@@ -41,3 +44,33 @@ export function getInitialLayers(layerListJSON, initialLayers = []) {
 
   return initialLayers;
 }
+
+export function getInitialLayersFromUrlParam() {
+  const locationSplit = window.location.href.split('?');
+  if (locationSplit.length <= 1) {
+    return [];
+  }
+  const mapAppParams = new URLSearchParams(locationSplit[1]);
+  if (!mapAppParams.has('initialLayers')) {
+    return [];
+  }
+
+  try {
+    let mapInitLayers = mapAppParams.get('initialLayers');
+    if (mapInitLayers[mapInitLayers.length - 1] === '#') {
+      mapInitLayers = mapInitLayers.substr(0, mapInitLayers.length - 1);
+    }
+    return rison.decode_array(mapInitLayers);
+  } catch (e) {
+    getToasts().addWarning({
+      title: i18n.translate('xpack.maps.initialLayers.unableToParseTitle', {
+        defaultMessage: `Initial layers not added to map`,
+      }),
+      text: i18n.translate('xpack.maps.initialLayers.unableToParseMessage', {
+        defaultMessage: `Unable to parse contents of 'initialLayers' parameter. Error: {errorMsg}`,
+        values: { errorMsg: e.message },
+      }),
+    });
+    return [];
+  }
+}

x-pack/plugins/maps/public/routing/page_elements/top_nav_menu/index.js

@@ -10,20 +10,27 @@ import {
   enableFullScreen,
   openMapSettings,
   removePreviewLayers,
-  setRefreshConfig,
   setSelectedLayer,
   updateFlyout,
 } from '../../../actions';
 import { FLYOUT_STATE } from '../../../reducers/ui';
 import { getInspectorAdapters } from '../../../reducers/non_serializable_instances';
 import { getFlyoutDisplay } from '../../../selectors/ui_selectors';
-import { hasDirtyState } from '../../../selectors/map_selectors';
+import {
+  getQuery,
+  getRefreshConfig,
+  getTimeFilters,
+  hasDirtyState,
+} from '../../../selectors/map_selectors';
 
 function mapStateToProps(state = {}) {
   return {
     isOpenSettingsDisabled: getFlyoutDisplay(state) !== FLYOUT_STATE.NONE,
     inspectorAdapters: getInspectorAdapters(state),
     isSaveDisabled: hasDirtyState(state),
+    query: getQuery(state),
+    refreshConfig: getRefreshConfig(state),
+    timeFilters: getTimeFilters(state),
   };
 }
 
@@ -34,7 +41,6 @@ function mapDispatchToProps(dispatch) {
       dispatch(updateFlyout(FLYOUT_STATE.NONE));
       dispatch(removePreviewLayers());
     },
-    setRefreshStoreConfig: (refreshConfig) => dispatch(setRefreshConfig(refreshConfig)),
     enableFullScreen: () => dispatch(enableFullScreen()),
     openMapSettings: () => dispatch(openMapSettings()),
   };

x-pack/plugins/maps/public/routing/page_elements/top_nav_menu/top_nav_menu.js

@@ -29,18 +29,16 @@ export function MapsTopNavMenu({
   onQuerySaved,
   onSavedQueryUpdated,
   savedQuery,
-  time,
+  timeFilters,
   refreshConfig,
-  setRefreshConfig,
-  setRefreshStoreConfig,
+  onRefreshConfigChange,
   indexPatterns,
-  updateFiltersAndDispatch,
+  onFiltersChange,
   isSaveDisabled,
   closeFlyout,
   enableFullScreen,
   openMapSettings,
   inspectorAdapters,
-  syncAppAndGlobalState,
   setBreadcrumbs,
   isOpenSettingsDisabled,
 }) {
@@ -75,31 +73,20 @@ export function MapsTopNavMenu({
     });
   };
 
-  const onRefreshChange = function ({ isPaused, refreshInterval }) {
-    const newRefreshConfig = {
-      isPaused,
-      interval: isNaN(refreshInterval) ? refreshConfig.interval : refreshInterval,
-    };
-    setRefreshConfig(newRefreshConfig, () => {
-      setRefreshStoreConfig(newRefreshConfig);
-      syncAppAndGlobalState();
-    });
-  };
-
   return (
     <TopNavMenu
       appName="maps"
       config={config}
-      indexPatterns={indexPatterns || []}
+      indexPatterns={indexPatterns}
       filters={filterManager.getFilters()}
       query={query}
       onQuerySubmit={submitQuery}
-      onFiltersUpdated={updateFiltersAndDispatch}
-      dateRangeFrom={time.from}
-      dateRangeTo={time.to}
+      onFiltersUpdated={onFiltersChange}
+      dateRangeFrom={timeFilters.from}
+      dateRangeTo={timeFilters.to}
       isRefreshPaused={refreshConfig.isPaused}
       refreshInterval={refreshConfig.interval}
-      onRefreshChange={onRefreshChange}
+      onRefreshChange={onRefreshConfigChange}
       showSearchBar={true}
       showFilterBar={true}
       showDatePicker={true}

x-pack/plugins/maps/public/routing/routes/maps_app/index.js

@@ -9,8 +9,10 @@ import { MapsAppView } from './maps_app_view';
 import { getFlyoutDisplay, getIsFullScreen } from '../../../selectors/ui_selectors';
 import {
   getFilters,
+  getQuery,
   getQueryableUniqueIndexPatternIds,
   getRefreshConfig,
+  getTimeFilters,
   hasUnsavedChanges,
 } from '../../../selectors/map_selectors';
 import {
@@ -38,17 +40,19 @@ function mapStateToProps(state = {}) {
     hasUnsavedChanges: (savedMap, initialLayerListConfig) => {
       return hasUnsavedChanges(state, savedMap, initialLayerListConfig);
     },
+    query: getQuery(state),
+    timeFilters: getTimeFilters(state),
   };
 }
 
 function mapDispatchToProps(dispatch) {
   return {
-    dispatchSetQuery: (refresh, filters, query, time) => {
+    dispatchSetQuery: ({ refresh, filters, query, timeFilters }) => {
       dispatch(
         setQuery({
           filters,
           query,
-          timeFilters: time,
+          timeFilters,
           refresh,
         })
       );