Merge async fix

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.actions.md

@@ -8,6 +8,7 @@
 
 ```typescript
 actions: {
-        createFiltersFromEvent: typeof createFiltersFromEvent;
+        createFiltersFromValueClickAction: typeof createFiltersFromValueClickAction;
+        createFiltersFromRangeSelectAction: typeof createFiltersFromRangeSelectAction;
     };
 ```

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.datapublicpluginstart.md

@@ -14,7 +14,7 @@ export interface DataPublicPluginStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [actions](./kibana-plugin-plugins-data-public.datapublicpluginstart.actions.md) | <code>{</code><br/><code>        createFiltersFromEvent: typeof createFiltersFromEvent;</code><br/><code>    }</code> |  |
+|  [actions](./kibana-plugin-plugins-data-public.datapublicpluginstart.actions.md) | <code>{</code><br/><code>        createFiltersFromValueClickAction: typeof createFiltersFromValueClickAction;</code><br/><code>        createFiltersFromRangeSelectAction: typeof createFiltersFromRangeSelectAction;</code><br/><code>    }</code> |  |
 |  [autocomplete](./kibana-plugin-plugins-data-public.datapublicpluginstart.autocomplete.md) | <code>AutocompleteStart</code> |  |
 |  [fieldFormats](./kibana-plugin-plugins-data-public.datapublicpluginstart.fieldformats.md) | <code>FieldFormatsStart</code> |  |
 |  [indexPatterns](./kibana-plugin-plugins-data-public.datapublicpluginstart.indexpatterns.md) | <code>IndexPatternsContract</code> |  |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformats.md

@@ -10,7 +10,7 @@
 fieldFormats: {
     FieldFormat: typeof FieldFormat;
     FieldFormatsRegistry: typeof FieldFormatsRegistry;
-    serialize: (agg: import("./search").AggConfig) => import("../../expressions/common").SerializedFieldFormat<object>;
+    serialize: (agg: import("./search").AggConfig) => import("../../expressions").SerializedFieldFormat<object>;
     DEFAULT_CONVERTER_COLOR: {
         range: string;
         regex: string;

docs/development/plugins/data/server/kibana-plugin-plugins-data-server.fieldformats.md

@@ -10,7 +10,7 @@
 fieldFormats: {
     FieldFormatsRegistry: typeof FieldFormatsRegistry;
     FieldFormat: typeof FieldFormat;
-    serializeFieldFormat: (agg: import("../public/search").AggConfig) => import("../../expressions/common").SerializedFieldFormat<object>;
+    serializeFieldFormat: (agg: import("../public/search").AggConfig) => import("../../expressions").SerializedFieldFormat<object>;
     BoolFormat: typeof BoolFormat;
     BytesFormat: typeof BytesFormat;
     ColorFormat: typeof ColorFormat;

src/legacy/core_plugins/kibana/public/discover/plugin.ts

@@ -147,6 +147,9 @@ export class DiscoverPlugin implements Plugin<void, void> {
         await this.initializeServices();
         await this.initializeInnerAngular();
 
+        // make sure the index pattern list is up to date
+        const [, { data: dataStart }] = await core.getStartServices();
+        await dataStart.indexPatterns.clearCache();
         const { renderApp } = await import('./np_ready/application');
         const unmount = await renderApp(innerAngularName, params.element);
         return () => {

src/legacy/core_plugins/vis_type_vislib/public/plugin.ts

@@ -108,6 +108,6 @@ export class VisTypeVislibPlugin implements Plugin<void, void> {
 
   public start(core: CoreStart, { data }: VisTypeVislibPluginStartDependencies) {
     setFormatService(data.fieldFormats);
-    setDataActions({ createFiltersFromEvent: data.actions.createFiltersFromEvent });
+    setDataActions(data.actions);
   }
 }

src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx

@@ -36,7 +36,9 @@ jest.mock('../../../legacy_imports', () => ({
 }));
 
 jest.mock('../../../services', () => ({
-  getDataActions: () => ({ createFiltersFromEvent: jest.fn().mockResolvedValue(['yes']) }),
+  getDataActions: () => ({
+    createFiltersFromValueClickAction: jest.fn().mockResolvedValue(['yes']),
+  }),
 }));
 
 const vis = {

src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx

@@ -101,7 +101,7 @@ export class VisLegend extends PureComponent<VisLegendProps, VisLegendState> {
       return false;
     }
 
-    const filters = await getDataActions().createFiltersFromEvent(item.values);
+    const filters = await getDataActions().createFiltersFromValueClickAction({ data: item.values });
     return Boolean(filters.length);
   };
 

src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/handler.js

@@ -83,10 +83,21 @@ export class Handler {
 
     // memoize so that the same function is returned every time,
     // allowing us to remove/re-add the same function
-    this.getProxyHandler = _.memoize(function(event) {
+    this.getProxyHandler = _.memoize(function(eventType) {
       const self = this;
-      return function(e) {
-        self.vis.emit(event, e);
+      return function(eventPayload) {
+        switch (eventType) {
+          case 'brush':
+            const xRaw = _.get(eventPayload.data, 'series[0].values[0].xRaw');
+            if (!xRaw) return; // not sure if this is possible?
+            return self.vis.emit(eventType, {
+              table: xRaw.table,
+              range: eventPayload.range,
+              column: xRaw.column,
+            });
+          case 'click':
+            return self.vis.emit(eventType, eventPayload);
+        }
       };
     });
 

src/legacy/ui/public/new_platform/new_platform.karma_mock.js

@@ -377,7 +377,8 @@ export const npStart = {
     },
     data: {
       actions: {
-        createFiltersFromEvent: Promise.resolve(['yes']),
+        createFiltersFromValueClickAction: Promise.resolve(['yes']),
+        createFiltersFromRangeSelectAction: sinon.fake(),
       },
       autocomplete: {
         getProvider: sinon.fake(),

src/plugins/dashboard/public/application/application.ts

@@ -38,12 +38,7 @@ import { EmbeddableStart } from '../../../embeddable/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../navigation/public';
 import { DataPublicPluginStart } from '../../../data/public';
 import { SharePluginStart } from '../../../share/public';
-import {
-  KibanaLegacyStart,
-  configureAppAngularModule,
-  createTopNavDirective,
-  createTopNavHelper,
-} from '../../../kibana_legacy/public';
+import { KibanaLegacyStart, configureAppAngularModule } from '../../../kibana_legacy/public';
 import { SavedObjectLoader } from '../../../saved_objects/public';
 
 export interface RenderDeps {
@@ -114,13 +109,11 @@ function mountDashboardApp(appBasePath: string, element: HTMLElement) {
 
 function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) {
   createLocalI18nModule();
-  createLocalTopNavModule(navigation);
   createLocalIconModule();
 
   const dashboardAngularModule = angular.module(moduleName, [
     ...thirdPartyAngularDependencies,
     'app/dashboard/I18n',
-    'app/dashboard/TopNav',
     'app/dashboard/icon',
   ]);
   return dashboardAngularModule;
@@ -132,13 +125,6 @@ function createLocalIconModule() {
     .directive('icon', reactDirective => reactDirective(EuiIcon));
 }
 
-function createLocalTopNavModule(navigation: NavigationStart) {
-  angular
-    .module('app/dashboard/TopNav', ['react'])
-    .directive('kbnTopNav', createTopNavDirective)
-    .directive('kbnTopNavHelper', createTopNavHelper(navigation.ui));
-}
-
 function createLocalI18nModule() {
   angular
     .module('app/dashboard/I18n', [])

src/plugins/dashboard/public/application/dashboard_app.html

@@ -2,52 +2,7 @@
   class="app-container dshAppContainer"
   ng-class="{'dshAppContainer--withMargins': model.useMargins}"
 >
-  <!-- Local nav. -->
-  <kbn-top-nav
-    ng-show="isVisible"
-    app-name="'dashboard'"
-    config="topNavMenu"
-
-    show-search-bar="isVisible"
-    show-filter-bar="showFilterBar()"
-    show-save-query="showSaveQuery"
-
-    query="model.query"
-    saved-query="savedQuery"
-    screen-title="screenTitle"
-    on-query-submit="updateQueryAndFetch"
-    index-patterns="indexPatterns"
-    filters="model.filters"
-    on-filters-updated="onFiltersUpdated"
-    date-range-from="model.timeRange.from"
-    date-range-to="model.timeRange.to"
-    is-refresh-paused="model.refreshInterval.pause"
-    refresh-interval="model.refreshInterval.value"
-    on-saved="onQuerySaved"
-    on-saved-query-updated="onSavedQueryUpdated"
-    on-clear-saved-query="onClearSavedQuery"
-    on-refresh-change="onRefreshChange">
-  </kbn-top-nav>
-
-  <!--
-  The top nav is hidden in embed mode but the filter bar must still be present so
-  we show the filter bar on its own here if the chrome is not visible.
--->
-  <kbn-top-nav
-    ng-if="showFilterBar() && !isVisible"
-
-    app-name="'dashboard'"
-    show-search-bar="true"
-    show-filter-bar="true"
-    show-save-query="false"
-    show-date-picker="false"
-
-    filters="model.filters"
-    index-patterns="indexPatterns"
-    on-filters-updated="onFiltersUpdated"
-  >
-  </kbn-top-nav>
-
+  <div id="dashboardChrome"></div>
   <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
   <div id="dashboardViewport"></div>
 

src/plugins/dashboard/public/application/dashboard_app.tsx

@@ -33,7 +33,6 @@ import { SavedObjectDashboard } from '../saved_dashboards';
 export interface DashboardAppScope extends ng.IScope {
   dash: SavedObjectDashboard;
   appState: DashboardAppState;
-  screenTitle: string;
   model: {
     query: Query;
     filters: Filter[];
@@ -54,21 +53,7 @@ export interface DashboardAppScope extends ng.IScope {
   getShouldShowEditHelp: () => boolean;
   getShouldShowViewHelp: () => boolean;
   updateQueryAndFetch: ({ query, dateRange }: { query: Query; dateRange?: TimeRange }) => void;
-  onRefreshChange: ({
-    isPaused,
-    refreshInterval,
-  }: {
-    isPaused: boolean;
-    refreshInterval: any;
-  }) => void;
-  onFiltersUpdated: (filters: Filter[]) => void;
-  onCancelApplyFilters: () => void;
-  onApplyFilters: (filters: Filter[]) => void;
-  onQuerySaved: (savedQuery: SavedQuery) => void;
-  onSavedQueryUpdated: (savedQuery: SavedQuery) => void;
-  onClearSavedQuery: () => void;
   topNavMenu: any;
-  showFilterBar: () => boolean;
   showAddPanel: any;
   showSaveQuery: boolean;
   kbnTopNav: any;