From 18d3f8f8930f854f4da7650354a051cc405a7fad Mon Sep 17 00:00:00 2001 From: Liza K Date: Mon, 7 Oct 2019 18:29:11 +0300 Subject: [PATCH] changeTimeFilter --- .../core_plugins/data/public/filter/filter_manager/index.ts | 1 + src/legacy/core_plugins/data/public/index.ts | 1 + .../kibana/public/dashboard/dashboard_app_controller.tsx | 4 ++-- .../kibana/public/discover/controllers/discover.js | 4 ++-- .../core_plugins/kibana/public/visualize/editor/editor.js | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts b/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts index fcee72d02484cb..ac533eaaf89ea1 100644 --- a/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts +++ b/src/legacy/core_plugins/data/public/filter/filter_manager/index.ts @@ -22,4 +22,5 @@ export { FilterStateManager } from './filter_state_manager'; export { uniqFilters } from './lib/uniq_filters'; export { extractTimeFilter } from './lib/extract_time_filter'; +export { changeTimeFilter } from './lib/change_time_filter'; export { onlyDisabledFiltersChanged } from './lib/only_disabled'; diff --git a/src/legacy/core_plugins/data/public/index.ts b/src/legacy/core_plugins/data/public/index.ts index 150501bdebff8b..d9abacd45eda4e 100644 --- a/src/legacy/core_plugins/data/public/index.ts +++ b/src/legacy/core_plugins/data/public/index.ts @@ -48,6 +48,7 @@ export { FilterStateManager, uniqFilters, extractTimeFilter, + changeTimeFilter, onlyDisabledFiltersChanged, } from './filter/filter_manager'; export { diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx index 93fa3d9ed0c791..3f37dd4db162d0 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx +++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app_controller.tsx @@ -57,7 +57,7 @@ import { capabilities } from 'ui/capabilities'; import { Subscription } from 'rxjs'; import { npStart } from 'ui/new_platform'; import { SavedObjectFinder } from 'ui/saved_objects/components/saved_object_finder'; -import { extractTimeFilter } from '../../../data/public'; +import { extractTimeFilter, changeTimeFilter } from '../../../data/public'; import { data } from '../../../data/public/setup'; import { @@ -436,7 +436,7 @@ export class DashboardAppController { filters ); queryFilter.addFilters(restOfFilters); - timefilter.setTime(timeRangeFilter as any); + if (timeRangeFilter) changeTimeFilter(timefilter, timeRangeFilter); } $scope.appState.$newFilters = []; diff --git a/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js b/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js index f79b47e7772a57..0b882a72c87204 100644 --- a/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js +++ b/src/legacy/core_plugins/kibana/public/discover/controllers/discover.js @@ -72,7 +72,7 @@ import { buildVislibDimensions } from 'ui/visualize/loader/pipeline_helpers/buil import 'ui/capabilities/route_setup'; import { addHelpMenuToAppChrome } from '../components/help_menu/help_menu_util'; -import { extractTimeFilter } from '../../../../data/public'; +import { extractTimeFilter, changeTimeFilter } from '../../../../data/public'; import { setup as data } from '../../../../data/public/legacy'; import { npStart } from 'ui/new_platform'; @@ -426,7 +426,7 @@ function discoverController( $scope.applyFilters = filters => { const { timeRangeFilter, restOfFilters } = extractTimeFilter($scope.indexPattern.timeFieldName, filters); queryFilter.addFilters(restOfFilters); - timefilter.setTime(timeRangeFilter); + if (timeRangeFilter) changeTimeFilter(timefilter, timeRangeFilter); $scope.state.$newFilters = []; }; diff --git a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js index d1d5113ca6031a..17b54bfc2d2480 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js +++ b/src/legacy/core_plugins/kibana/public/visualize/editor/editor.js @@ -53,7 +53,7 @@ import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal'; import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal'; import { getEditBreadcrumbs, getCreateBreadcrumbs } from '../breadcrumbs'; import { npStart } from 'ui/new_platform'; -import { extractTimeFilter } from '../../../../data/public'; +import { extractTimeFilter, changeTimeFilter } from '../../../../data/public'; import { start as data } from '../../../../data/public/legacy'; import { start as visualizations } from '../../../../visualizations/public/np_ready/public/legacy'; @@ -346,7 +346,7 @@ function VisEditor( $scope.onApplyFilters = filters => { const { timeRangeFilter, restOfFilters } = extractTimeFilter($scope.indexPattern.timeFieldName, filters); queryFilter.addFilters(restOfFilters); - timefilter.setTime(timeRangeFilter); + if (timeRangeFilter) changeTimeFilter(timefilter, timeRangeFilter); $scope.state.$newFilters = []; };