Revert most of changes to dashboard app because of changes in elastic…

…#55443
lizozom · Jan 29, 2020 · 469f41c · 469f41c
1 parent 62e54da
commit 469f41c
Show file tree

Hide file tree

Showing 3 changed files with 127 additions and 6 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.html b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.html
@@ -13,11 +13,22 @@
     show-save-query="showSaveQuery"
 
     query="model.query"
+    saved-query="savedQuery"
     screen-title="screenTitle"
     on-query-submit="updateQueryAndFetch"
-    index-patterns="indexPatterns"
-    use-default-behaviors="true"
+    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>
 
   <!--
@@ -32,10 +43,10 @@
     show-filter-bar="true"
     show-save-query="false"
     show-date-picker="false"
-    show-query-bar="false"
+
+    filters="model.filters"
     index-patterns="indexPatterns"
-
-    use-default-behaviors="true"
+    on-filters-updated="onFiltersUpdated"
   >
   </kbn-top-nav>
 

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx
@@ -25,7 +25,13 @@ import { IInjector } from '../legacy_imports';
 import { ViewMode } from '../../../../embeddable_api/public/np_ready/public';
 import { SavedObjectDashboard } from '../saved_dashboard/saved_dashboard';
 import { DashboardAppState, SavedDashboardPanel, ConfirmModalFn } from './types';
-import { IIndexPattern, TimeRange, Query, esFilters } from '../../../../../../plugins/data/public';
+import {
+  IIndexPattern,
+  TimeRange,
+  Query,
+  esFilters,
+  SavedQuery,
+} from '../../../../../../plugins/data/public';
 
 import { DashboardAppController } from './dashboard_app_controller';
 import { RenderDeps } from './application';
@@ -45,6 +51,7 @@ export interface DashboardAppScope extends ng.IScope {
       | { to: string | moment.Moment | undefined; from: string | moment.Moment | undefined };
     refreshInterval: any;
   };
+  savedQuery?: SavedQuery;
   refreshInterval: any;
   panels: SavedDashboardPanel[];
   indexPatterns: IIndexPattern[];
@@ -53,8 +60,19 @@ 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: esFilters.Filter[]) => void;
   onCancelApplyFilters: () => void;
   onApplyFilters: (filters: esFilters.Filter[]) => void;
+  onQuerySaved: (savedQuery: SavedQuery) => void;
+  onSavedQueryUpdated: (savedQuery: SavedQuery) => void;
+  onClearSavedQuery: () => void;
   topNavMenu: any;
   showFilterBar: () => boolean;
   showAddPanel: any;

diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx
@@ -40,6 +40,7 @@ import {
   IndexPattern,
   IndexPatternsContract,
   Query,
+  SavedQuery,
   syncAppFilters,
   syncQuery,
 } from '../../../../../../plugins/data/public';
@@ -440,6 +441,10 @@ export class DashboardAppController {
     };
 
     $scope.updateQueryAndFetch = function({ query, dateRange }) {
+      if (dateRange) {
+        timefilter.setTime(dateRange);
+      }
+
       const oldQuery = $scope.model.query;
       if (_.isEqual(oldQuery, query)) {
         // The user can still request a reload in the query bar, even if the
@@ -453,6 +458,93 @@ export class DashboardAppController {
       }
     };
 
+    $scope.onRefreshChange = function({ isPaused, refreshInterval }) {
+      timefilter.setRefreshInterval({
+        pause: isPaused,
+        value: refreshInterval ? refreshInterval : $scope.model.refreshInterval.value,
+      });
+    };
+
+    $scope.onFiltersUpdated = filters => {
+      // The filters will automatically be set when the filterManager emits an update event (see below)
+      filterManager.setFilters(filters);
+    };
+
+    $scope.onQuerySaved = savedQuery => {
+      $scope.savedQuery = savedQuery;
+    };
+
+    $scope.onSavedQueryUpdated = savedQuery => {
+      $scope.savedQuery = { ...savedQuery };
+    };
+
+    $scope.onClearSavedQuery = () => {
+      delete $scope.savedQuery;
+      dashboardStateManager.setSavedQueryId(undefined);
+      dashboardStateManager.applyFilters(
+        {
+          query: '',
+          language:
+            localStorage.get('kibana.userQueryLanguage') || config.get('search:queryLanguage'),
+        },
+        filterManager.getGlobalFilters()
+      );
+      // Making this method sync broke the updates.
+      // Temporary fix, until we fix the complex state in this file.
+      setTimeout(() => {
+        filterManager.setFilters(filterManager.getGlobalFilters());
+      }, 0);
+    };
+
+    const updateStateFromSavedQuery = (savedQuery: SavedQuery) => {
+      const savedQueryFilters = savedQuery.attributes.filters || [];
+      const globalFilters = filterManager.getGlobalFilters();
+      const allFilters = [...globalFilters, ...savedQueryFilters];
+
+      dashboardStateManager.applyFilters(savedQuery.attributes.query, allFilters);
+      if (savedQuery.attributes.timefilter) {
+        timefilter.setTime({
+          from: savedQuery.attributes.timefilter.from,
+          to: savedQuery.attributes.timefilter.to,
+        });
+        if (savedQuery.attributes.timefilter.refreshInterval) {
+          timefilter.setRefreshInterval(savedQuery.attributes.timefilter.refreshInterval);
+        }
+      }
+      // Making this method sync broke the updates.
+      // Temporary fix, until we fix the complex state in this file.
+      setTimeout(() => {
+        filterManager.setFilters(allFilters);
+      }, 0);
+    };
+
+    $scope.$watch('savedQuery', (newSavedQuery: SavedQuery) => {
+      if (!newSavedQuery) return;
+      dashboardStateManager.setSavedQueryId(newSavedQuery.id);
+
+      updateStateFromSavedQuery(newSavedQuery);
+    });
+
+    $scope.$watch(
+      () => {
+        return dashboardStateManager.getSavedQueryId();
+      },
+      newSavedQueryId => {
+        if (!newSavedQueryId) {
+          $scope.savedQuery = undefined;
+          return;
+        }
+        if (!$scope.savedQuery || newSavedQueryId !== $scope.savedQuery.id) {
+          savedQueryService.getSavedQuery(newSavedQueryId).then((savedQuery: SavedQuery) => {
+            $scope.$evalAsync(() => {
+              $scope.savedQuery = savedQuery;
+              updateStateFromSavedQuery(savedQuery);
+            });
+          });
+        }
+      }
+    );
+
     $scope.indexPatterns = [];
 
     $scope.$watch('model.query', (newQuery: Query) => {