Fixes for Dashboard Context for both TSVB and Timelion (#12214)

* Decoupling TSVB from timelion * Changing behavior back to the provider pattern * Fixing Timelion's dashboard context provider * Moving dashboard_context out of Timelion and TSVB into Kibana

Author: simianhacker

src/core_plugins/kibana/public/dashboard/dashboard_context.js

@@ -0,0 +1,35 @@
+// This file is used by Timelion and TSVB
+import _ from 'lodash';
+import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
+import 'ui/state_management/app_state';
+
+export function dashboardContextProvider(Private, getAppState) {
+ return () => {
+ const queryFilter = Private(FilterBarQueryFilterProvider);
+ const bool = { must: [], must_not: [] };
+ const filterBarFilters = queryFilter.getFilters();
+ const queryBarFilter = getAppState().query;
+
+ // Add the query bar filter, its handled differently.
+ bool.must.push(queryBarFilter);
+
+ // Add each of the filter bar filters
+ _.each(filterBarFilters, function (filter) {
+ const esFilter = _.omit(filter, function (val, key) {
+ if (key === 'meta' || key[0] === '$') return true;
+ return false;
+ });
+
+ if (filter.meta.disabled) return;
+ if (filter.meta.negate) {
+ bool.must_not = bool.must_not || [];
+ bool.must_not.push(esFilter.query || esFilter);
+ } else {
+ bool.must = bool.must || [];
+ bool.must.push(esFilter.query || esFilter);
+ }
+ });
+
+ return { bool: bool };
+ };
+}

src/core_plugins/metrics/public/lib/fetch.js

@@ -1,12 +1,13 @@
 import { validateInterval } from './validate_interval';
+import { dashboardContextProvider } from 'plugins/kibana/dashboard/dashboard_context';
 export default (
  timefilter,
  Private,
  Notifier,
  $http,
- config
+ config,
 ) => {
- const dashboardContext = Private(require('../../../timelion/public/services/dashboard_context'));
+ const dashboardContext = Private(dashboardContextProvider);
  const notify = new Notifier({ location: 'Metrics' });
  return $scope => () => {
  const panel = $scope.model;

src/core_plugins/timelion/public/services/dashboard_context.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter';
 import { uiModules } from 'ui/modules';
 import timezoneProvider from 'plugins/timelion/services/timezone';
-import dashboardContextProvider from 'plugins/timelion/services/dashboard_context';
+import { dashboardContextProvider } from 'plugins/kibana/dashboard/dashboard_context';
 import 'plugins/timelion/directives/chart/chart';
 import 'plugins/timelion/directives/timelion_interval/timelion_interval';
 import 'ui/state_management/app_state';