diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js
index 2f64e8d96160d..6c0a4f417209c 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.js
@@ -125,7 +125,7 @@ app.directive('dashboardApp', function ($injector) {
// The 'previouslyStored' check is so we only update the time filter on dashboard open, not during
// normal cross app navigation.
if (dashboardStateManager.getIsTimeSavedWithDashboard() && !getAppState.previouslyStored()) {
- dashboardStateManager.syncTimefilterWithDashboard(timefilter, config.get('timepicker:quickRanges'));
+ dashboardStateManager.syncTimefilterWithDashboard(timefilter);
}
const updateState = () => {
@@ -307,7 +307,7 @@ app.directive('dashboardApp', function ($injector) {
// it does on 'open' because it's been saved to the url and the getAppState.previouslyStored() check on
// reload will cause it not to sync.
if (dashboardStateManager.getIsTimeSavedWithDashboard()) {
- dashboardStateManager.syncTimefilterWithDashboard(timefilter, config.get('timepicker:quickRanges'));
+ dashboardStateManager.syncTimefilterWithDashboard(timefilter);
}
}
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.js b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.js
index 57207ef60e341..b3d817361e6d8 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state.test.js
@@ -33,7 +33,6 @@ describe('DashboardState', function () {
time: {},
setTime: function (time) { this.time = time; },
};
- const mockQuickTimeRanges = [{ from: 'now/w', to: 'now/w', display: 'This week', section: 0 }];
const mockIndexPattern = { id: 'index1' };
function initDashboardState() {
@@ -52,12 +51,10 @@ describe('DashboardState', function () {
mockTimefilter.time.from = '2015-09-19 06:31:44.000';
mockTimefilter.time.to = '2015-09-29 06:31:44.000';
- mockTimefilter.time.mode = 'absolute';
initDashboardState();
- dashboardState.syncTimefilterWithDashboard(mockTimefilter, mockQuickTimeRanges);
+ dashboardState.syncTimefilterWithDashboard(mockTimefilter);
- expect(mockTimefilter.time.mode).toBe('quick');
expect(mockTimefilter.time.to).toBe('now/w');
expect(mockTimefilter.time.from).toBe('now/w');
});
@@ -69,12 +66,10 @@ describe('DashboardState', function () {
mockTimefilter.time.from = '2015-09-19 06:31:44.000';
mockTimefilter.time.to = '2015-09-29 06:31:44.000';
- mockTimefilter.time.mode = 'absolute';
initDashboardState();
- dashboardState.syncTimefilterWithDashboard(mockTimefilter, mockQuickTimeRanges);
+ dashboardState.syncTimefilterWithDashboard(mockTimefilter);
- expect(mockTimefilter.time.mode).toBe('relative');
expect(mockTimefilter.time.to).toBe('now');
expect(mockTimefilter.time.from).toBe('now-13d');
});
@@ -86,12 +81,10 @@ describe('DashboardState', function () {
mockTimefilter.time.from = 'now/w';
mockTimefilter.time.to = 'now/w';
- mockTimefilter.time.mode = 'quick';
initDashboardState();
- dashboardState.syncTimefilterWithDashboard(mockTimefilter, mockQuickTimeRanges);
+ dashboardState.syncTimefilterWithDashboard(mockTimefilter);
- expect(mockTimefilter.time.mode).toBe('absolute');
expect(mockTimefilter.time.to).toBe(savedDashboard.timeTo);
expect(mockTimefilter.time.from).toBe(savedDashboard.timeFrom);
});
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.js b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.js
index cff4438ce3a5d..e8480435d9816 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.js
+++ b/src/legacy/core_plugins/kibana/public/dashboard/dashboard_state_manager.js
@@ -19,7 +19,6 @@
import { i18n } from '@kbn/i18n';
import _ from 'lodash';
-import moment from 'moment';
import { DashboardViewMode } from './dashboard_view_mode';
import { FilterUtils } from './lib/filter_utils';
@@ -144,13 +143,11 @@ export class DashboardStateManager {
* or a relative time (now-15m), or a moment object
* @param {String|Object} newTimeFilter.from - either a string representing an absolute or a relative time, or a
* moment object
- * @param {String} newTimeFilter.mode
*/
handleTimeChange(newTimeFilter) {
store.dispatch(updateTimeRange({
from: FilterUtils.convertTimeToUTCString(newTimeFilter.from),
to: FilterUtils.convertTimeToUTCString(newTimeFilter.to),
- mode: newTimeFilter.mode,
}));
}
@@ -543,30 +540,17 @@ export class DashboardStateManager {
* @param {Object} timeFilter
* @param {func} timeFilter.setTime
* @param {func} timeFilter.setRefreshInterval
- * @param quickTimeRanges
*/
- syncTimefilterWithDashboard(timeFilter, quickTimeRanges) {
+ syncTimefilterWithDashboard(timeFilter) {
if (!this.getIsTimeSavedWithDashboard()) {
throw new Error(i18n.translate('kbn.dashboard.stateManager.timeNotSavedWithDashboardErrorMessage', {
defaultMessage: 'The time is not saved with this dashboard so should not be synced.',
}));
}
- let mode;
- const isMoment = moment(this.savedDashboard.timeTo).isValid();
- if (isMoment) {
- mode = 'absolute';
- } else {
- const quickTime = _.find(
- quickTimeRanges,
- (timeRange) => timeRange.from === this.savedDashboard.timeFrom && timeRange.to === this.savedDashboard.timeTo);
-
- mode = quickTime ? 'quick' : 'relative';
- }
timeFilter.setTime({
from: this.savedDashboard.timeFrom,
to: this.savedDashboard.timeTo,
- mode
});
if (this.savedDashboard.refreshInterval) {
diff --git a/src/legacy/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap b/src/legacy/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap
index a6eacbf0ec7fb..ebc27316d4675 100644
--- a/src/legacy/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap
+++ b/src/legacy/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap
@@ -425,20 +425,13 @@ Array [
-
+
Expand your time range
- One or more of the indices you’re looking at contains a date field. Your query may not match anything in the current time range, or there may not be any data at all in the currently selected time range. You can try
-
- and changing the time range to one which contains data.
+ One or more of the indices you’re looking at contains a date field. Your query may not match anything in the current time range, or there may not be any data at all in the currently selected time range. You can try changing the time range to one which contains data.
diff --git a/src/ui/public/angular-bootstrap/index.js b/src/ui/public/angular-bootstrap/index.js
index c01f7f4a21064..b519abcaf5dee 100644
--- a/src/ui/public/angular-bootstrap/index.js
+++ b/src/ui/public/angular-bootstrap/index.js
@@ -21,7 +21,6 @@ angular.module('ui.bootstrap', [
'ui.bootstrap.buttons',
'ui.bootstrap.dateparser',
'ui.bootstrap.position',
- 'ui.bootstrap.datepicker',
'ui.bootstrap.dropdown',
'ui.bootstrap.modal',
'ui.bootstrap.pagination',
@@ -36,11 +35,6 @@ angular.module('ui.bootstrap', [
angular.module('ui.bootstrap.tpls', [
'template/alert/alert.html',
- 'template/datepicker/datepicker.html',
- 'template/datepicker/day.html',
- 'template/datepicker/month.html',
- 'template/datepicker/popup.html',
- 'template/datepicker/year.html',
'template/modal/backdrop.html',
'template/modal/window.html',
'template/pagination/pager.html',
@@ -65,7 +59,6 @@ import './bindHtml/bindHtml';
import './buttons/buttons';
import './collapse/collapse';
import './dateparser/dateparser';
-import './datepicker/datepicker';
import './dropdown/dropdown';
import './modal/modal';
import './pagination/pagination';
@@ -85,36 +78,6 @@ angular.module('template/alert/alert.html', []).run(['$templateCache', function(
$templateCache.put('template/alert/alert.html', alert);
}]);
-import datepicker from './datepicker/datepicker.html';
-
-angular.module('template/datepicker/datepicker.html', []).run(['$templateCache', function($templateCache) {
- $templateCache.put('template/datepicker/datepicker.html', datepicker);
-}]);
-
-import day from './datepicker/day.html';
-
-angular.module('template/datepicker/day.html', []).run(['$templateCache', function($templateCache) {
- $templateCache.put('template/datepicker/day.html', day);
-}]);
-
-import month from './datepicker/month.html';
-
-angular.module('template/datepicker/month.html', []).run(['$templateCache', function($templateCache) {
- $templateCache.put('template/datepicker/month.html', month);
-}]);
-
-import popup from './datepicker/popup.html';
-
-angular.module('template/datepicker/popup.html', []).run(['$templateCache', function($templateCache) {
- $templateCache.put('template/datepicker/popup.html', popup);
-}]);
-
-import year from './datepicker/year.html';
-
-angular.module('template/datepicker/year.html', []).run(['$templateCache', function($templateCache) {
- $templateCache.put('template/datepicker/year.html', year);
-}]);
-
import backdrop from './modal/backdrop.html';
angular.module('template/modal/backdrop.html', []).run(['$templateCache', function($templateCache) {
diff --git a/src/ui/public/chrome/config/filter.html b/src/ui/public/chrome/config/filter.html
deleted file mode 100644
index 91953acb23175..0000000000000
--- a/src/ui/public/chrome/config/filter.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/src/ui/public/chrome/config/interval.html b/src/ui/public/chrome/config/interval.html
deleted file mode 100644
index 9055429800c1a..0000000000000
--- a/src/ui/public/chrome/config/interval.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js
deleted file mode 100644
index 7eb9180a453a9..0000000000000
--- a/src/ui/public/directives/__tests__/timepicker.js
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import angular from 'angular';
-import moment from 'moment';
-import expect from 'expect.js';
-import _ from 'lodash';
-import sinon from 'sinon';
-import ngMock from 'ng_mock';
-import 'plugins/kibana/visualize/index';
-import 'plugins/kibana/dashboard/index';
-import 'plugins/kibana/discover/index';
-
-
-// TODO: This should not be needed, timefilter is only included here, it should move
-
-let $parentScope;
-
-let $scope;
-
-let $elem;
-const anchor = '2014-01-01T06:06:06.666Z';
-
-const init = function () {
- // Load the application
- ngMock.module('kibana');
-
- // Create the scope
- ngMock.inject(function ($rootScope, $compile) {
-
- // Give us a scope
- $parentScope = $rootScope;
-
- // Add some parameters to it
- const timefilter = {
- time: {
- from: moment().subtract(15, 'minutes'),
- to: moment(),
- mode: undefined
- },
- refreshInterval: {
- value: 0,
- display: 'Off'
- }
- };
- $parentScope.timefilter = timefilter;
- $parentScope.updateInterval = sinon.spy();
- $parentScope.updateFilter = sinon.spy();
-
- // Create the element
- $elem = angular.element(
- '' +
- ''
- );
-
- // And compile it
- $compile($elem)($parentScope);
-
- // Fire a digest cycle
- $elem.scope().$digest();
-
- // Grab the isolate scope so we can test it
- $scope = $elem.isolateScope();
- });
-};
-
-
-describe('timepicker directive', function () {
- const sandbox = sinon.createSandbox();
-
- beforeEach(function () {
- // Stub out the clock so 'now' doesn't move
- sandbox.useFakeTimers(moment(anchor).valueOf());
-
- init();
- });
-
- afterEach(function () {
- sandbox.restore();
- });
-
- describe('tabs', function () {
- it('should contain two tabs', function () {
- expect($elem.find('.tab-pane').length).to.be(2);
- });
- });
-
- describe('refresh interval', function () {
- beforeEach(function () {
- ngMock.inject(function ($rootScope) {
- $rootScope.$apply();
- });
- });
-
- it('should contain a list of options', function () {
- expect($elem.find('.kbn-refresh-section').length).to.be.greaterThan(0);
- });
-
- it('should have a $scope.setRefreshInterval() that calls handler', function () {
- $scope.setRefreshInterval({ value: 10000 });
- sinon.assert.calledOnce($parentScope.updateInterval);
- expect($parentScope.updateInterval.firstCall.args[0]).to.have.property('value', 10000);
- });
-
- it('should unpause when setRefreshInterval is called without pause:true', function () {
- $scope.setRefreshInterval({ value: 1000, pause: true });
- expect($parentScope.updateInterval.getCall(0).args[0]).to.have.property('pause', true);
-
- $scope.setRefreshInterval({ value: 1000, pause: false });
- expect($parentScope.updateInterval.getCall(1).args[0]).to.have.property('pause', false);
-
- $scope.setRefreshInterval({ value: 1000 });
- expect($parentScope.updateInterval.getCall(2).args[0]).to.have.property('pause', false);
- });
-
-
- it('should highlight the current active interval', function () {
- $scope.interval = { value: 300000 };
- $elem.scope().$digest();
- expect($elem.find('.refresh-interval-active').length).to.be(1);
- expect($elem.find('.refresh-interval-active').text().trim()).to.be('5 minutes');
- });
- });
-
- describe('mode setting', function () {
- it('should be in quick mode by default', function () {
- expect($scope.mode).to.be('quick');
- });
-
- it('should highlight the right mode', function () {
- expect($elem.find('.kbn-timepicker-modes .euiTab-isSelected').text().trim()).to.be('Quick');
-
- // Each of the 3 modes
- const modes = ['absolute', 'relative', 'quick'];
- _.each(modes, function (mode) {
- $scope.setMode(mode);
- $scope.$digest();
- expect($elem.find('.kbn-timepicker-modes .euiTab-isSelected').text().trim().toLowerCase()).to.be(mode);
- });
- });
- });
-
- describe('quick mode', function () {
-
- beforeEach(function () {
- $scope.setMode('quick');
- $scope.$digest();
- });
-
- it('should contain 3 lists of options', function () {
- expect($elem.find('.kbn-timepicker-section .list-unstyled').length).to.be(3);
- });
-
- it('should have a $scope.setQuick() that calls handler', function () {
- $scope.setQuick('now', 'now');
- sinon.assert.calledOnce($parentScope.updateFilter);
- expect($parentScope.updateFilter.firstCall.args[0]).to.be('now');
- expect($parentScope.updateFilter.firstCall.args[1]).to.be('now');
- });
- });
-
- describe('relative mode', function () {
-
- beforeEach(function () {
- $scope.setMode('relative');
- $scope.$digest();
- });
-
- it('has a preview of the "from" input', function () {
- const preview = $elem.find('.kbn-timepicker-section span[ng-show="relative.from.preview"]');
- expect(preview.text().trim()).to.be(moment().subtract(15, 'minutes').format($scope.format));
- });
-
- it('has a disabled "to" field that contains "Now"', function () {
- expect($elem.find('.kbn-timepicker-section span[ng-show="relative.to.preview"]').text().trim()).to.be('Now');
- });
-
- it('has a submit handler', function () {
- const form = $elem.find('form[ng-submit="applyRelative()"]');
- expect(form.length).to.be(1);
- });
-
- it('disables the submit button if the form is invalid', function () {
- let button;
- button = $elem.find('button[disabled]');
- expect(button.length).to.be(0);
-
- // Make the form invalid
- $scope.relative.from.count = -3;
- $scope.formatRelative('from');
- $scope.$digest();
-
- button = $elem.find('button[disabled]');
- expect(button.length).to.be(1);
- });
-
- it('has a dropdown bound to relative.from.unit that contains all of the intervals', function () {
- const select = $elem.find('.kbn-timepicker-section select[ng-model="relative.from.unit"]');
- expect(select.length).to.be(1);
- expect(select.find('option').length).to.be(14);
-
- // Check each relative option, make sure it is in the list
- _.each($scope.relativeOptions, function (unit, i) {
- expect(select.find('option')[i].text).to.be(unit.text);
- });
- });
-
- it('has a checkbox that is checked when rounding is enabled', function () {
- const checkbox = $elem.find('.kbn-timepicker-section input[ng-model="relative.from.round"]');
- expect(checkbox.length).to.be(1);
-
- // Rounding is disabled by default
- expect(checkbox.prop('checked')).to.be(false);
-
- // Enable rounding
- $scope.relative.from.round = true;
- $scope.$digest();
- expect(checkbox.prop('checked')).to.be(true);
- });
-
- it('rounds the preview down to the unit when rounding is enabled', function () {
- // Enable rounding
- $scope.relative.from.round = true;
- $scope.relative.from.count = 0;
-
- _.each($scope.units, function (longUnit, shortUnit) {
- $scope.relative.from.count = 0;
- $scope.relative.from.unit = shortUnit;
- $scope.formatRelative('from');
-
- // The preview should match the start of the unit e.g., the start of the minute
- expect($scope.relative.from.preview).to.be(moment().startOf(longUnit).format($scope.format));
- });
- });
-
- it('does not round the preview down to the unit when rounding is disable', function () {
- // Disable rounding
- $scope.relative.from.round = false;
- $scope.relative.from.count = 1;
-
- _.each($scope.units, function (longUnit, shortUnit) {
- $scope.relative.from.unit = shortUnit;
- $scope.formatRelative('from');
-
- const matches = shortUnit.match(/([smhdwMy])(\+)?/);
- let unit;
- let opp = '-';
- if (matches) {
- unit = matches[1];
- opp = matches[2];
- }
-
- const fn = opp === '+' ? 'add' : 'subtract';
-
- // The preview should match the start of the unit e.g., the start of the minute
- expect($scope.relative.from.preview).to.be(moment()[fn](1, unit).format($scope.format));
- });
- });
-
- it('has a $scope.applyRelative() that sets from and to based on relative.round, relative.count and relative.unit', function () {
- // Disable rounding
- $scope.relative.from.round = false;
- $scope.relative.from.count = 1;
- $scope.relative.from.unit = 's';
- $scope.applyRelative();
- sinon.assert.calledOnce($parentScope.updateFilter);
- expect($parentScope.updateFilter.getCall(0).args[0]).to.be('now-1s');
-
- $scope.relative.from.count = 2;
- $scope.relative.from.unit = 'm';
- $scope.applyRelative();
- expect($parentScope.updateFilter.getCall(1).args[0]).to.be('now-2m');
-
- $scope.relative.from.count = 3;
- $scope.relative.from.unit = 'h';
- $scope.applyRelative();
- expect($parentScope.updateFilter.getCall(2).args[0]).to.be('now-3h');
-
- // Enable rounding
- $scope.relative.from.round = true;
- $scope.relative.from.count = 7;
- $scope.relative.from.unit = 'd';
- $scope.applyRelative();
- expect($parentScope.updateFilter.getCall(3).args[0]).to.be('now-7d/d');
- });
-
- it('updates the input fields when the scope variables are changed', function () {
- const input = $elem.find('.kbn-timepicker-section input[ng-model="relative.from.count"]');
- const select = $elem.find('.kbn-timepicker-section select[ng-model="relative.from.unit"]');
-
- $scope.relative.from.count = 5;
- $scope.$digest();
- expect(input.val()).to.be('5');
-
-
- // Should update the selected option
- _.each($scope.units, function (longUnit, shortUnit) {
- $scope.relative.from.unit = shortUnit;
- $scope.$digest();
-
- expect(select.val().split(':')[1]).to.be(shortUnit);
- });
- });
- });
-
- describe('absolute mode', function () {
-
- let inputs;
-
- beforeEach(function () {
- $scope.setMode('absolute');
- $scope.$digest();
-
- inputs = {
- fromInput: $elem.find('.kbn-timepicker-section input[ng-model="absolute.from"]'),
- toInput: $elem.find('.kbn-timepicker-section input[ng-model="absolute.to"]'),
- fromCalendar: $elem.find('.kbn-timepicker-section div[ng-model="pickFromDate"] '),
- toCalendar: $elem.find('.kbn-timepicker-section div[ng-model="pickToDate"] '),
- };
- });
-
- it('should have input boxes for absolute.from and absolute.to', function () {
- expect(inputs.fromInput.length).to.be(1);
- expect(inputs.toInput.length).to.be(1);
- });
-
- it('should have tables that contain calendars bound to absolute.from and absolute.to', function () {
- expect(inputs.fromCalendar.length).to.be(1);
- expect(inputs.toCalendar.length).to.be(1);
- });
-
- it('should present a timeframe of 15 minutes ago to now if scope.from and scope.to are not set', function () {
- delete $scope.from;
- delete $scope.to;
- $scope.setMode('absolute');
- $scope.$digest();
-
- expect($scope.absolute.from.valueOf()).to.be(moment().subtract(15, 'minutes').valueOf());
- expect($scope.absolute.to.valueOf()).to.be(moment().valueOf());
- });
-
- it('should update its own variables if timefilter time is updated', function () {
- $scope.setMode('absolute');
- $scope.$digest();
-
- const startDate = moment('1980-01-01T00:11:02.001Z');
- const endDate = moment('1983-10-11T00:03:32.051Z');
-
- $parentScope.timefilter.time.from = startDate;
- $parentScope.timefilter.time.to = endDate;
- $parentScope.$digest();
-
- expect($scope.absolute.from.valueOf()).to.be(startDate.valueOf());
- expect($scope.absolute.to.valueOf()).to.be(endDate.valueOf());
- });
-
- it('should disable the "Go" button if from > to', function () {
- $scope.absolute.from = moment('2012-02-01');
- $scope.absolute.to = moment('2012-02-11');
- $scope.$digest();
- expect($elem.find('[data-test-subj="timepickerGoButton"]').attr('disabled')).to.be(undefined);
-
- $scope.absolute.from = moment('2012-02-12');
- $scope.absolute.to = moment('2012-02-11');
- $scope.$digest();
- expect($elem.find('[data-test-subj="timepickerGoButton"]').attr('disabled')).to.be('disabled');
- });
-
- it('should only copy its input to scope.from and scope.to when scope.applyAbsolute() is called', function () {
- $scope.from = 'now-30m';
- $scope.to = 'now';
-
- $scope.absolute.from = moment('2012-02-01');
- $scope.absolute.to = moment('2012-02-11');
- expect($scope.from).to.be('now-30m');
- expect($scope.to).to.be('now');
-
- $scope.applyAbsolute();
- expect($parentScope.updateFilter.firstCall.args[0]).to.eql(moment('2012-02-01'));
- expect($parentScope.updateFilter.firstCall.args[1]).to.eql(moment('2012-02-11'));
-
- $scope.$digest();
- });
-
- it('should set from/to to start/end of day if set from datepicker', function () {
- $scope.pickFromDate(new Date('2012-02-01 12:00'));
- $scope.pickToDate(new Date('2012-02-11 12:00'));
- $scope.applyAbsolute();
-
- expect($parentScope.updateFilter.firstCall.args[0].valueOf()).to.be(moment('2012-02-01 00:00:00.000').valueOf());
- expect($parentScope.updateFilter.firstCall.args[1].valueOf()).to.be(moment('2012-02-11 23:59:59.999').valueOf());
- });
-
- it('should allow setting hour/minute/second after setting from datepicker', function () {
- $scope.pickFromDate(new Date('2012-02-01 12:00'));
- $scope.pickToDate(new Date('2012-02-11 12:00'));
- $scope.applyAbsolute();
-
- expect($parentScope.updateFilter.firstCall.args[0].valueOf()).to.be(moment('2012-02-01 00:00:00.000').valueOf());
- expect($parentScope.updateFilter.firstCall.args[1].valueOf()).to.be(moment('2012-02-11 23:59:59.999').valueOf());
-
- $scope.absolute.from = moment('2012-02-01 01:23:45');
- $scope.absolute.to = moment('2012-02-11 12:34:56');
- $scope.applyAbsolute();
-
- expect($parentScope.updateFilter.secondCall.args[0].valueOf()).to.be(moment('2012-02-01 01:23:45').valueOf());
- expect($parentScope.updateFilter.secondCall.args[1].valueOf()).to.be(moment('2012-02-11 12:34:56').valueOf());
- });
-
- describe('datepicker timezone issue', function () {
- it('should ignore the timezone from the datepicker because it does not respect dateFormat:tz advanced setting', function () {
- moment.tz.setDefault('UTC');
-
- $scope.pickFromDate(new Date('2012-02-01 12:00-05:00'));
- $scope.pickToDate(new Date('2012-02-11 12:00-05:00'));
- $scope.$digest();
-
- const formattedFrom = inputs.fromInput.val();
- const formattedTo = inputs.toInput.val();
-
- expect(formattedFrom).to.be('2012-02-01 00:00:00.000');
- expect(formattedTo).to.be('2012-02-11 23:59:59.999');
- });
-
- after(function () {
- moment.tz.setDefault('Browser');
- });
- });
-
- });
-});
diff --git a/src/ui/public/filter_bar/lib/__tests__/change_time_filter.test.js b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.test.js
index 6f02c06aea5b1..b9916c1f08a06 100644
--- a/src/ui/public/filter_bar/lib/__tests__/change_time_filter.test.js
+++ b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.test.js
@@ -25,7 +25,7 @@ jest.mock('ui/chrome',
get: (key) => {
switch(key) {
case 'timepicker:timeDefaults':
- return { from: 'now-15m', to: 'now', mode: 'quick' };
+ return { from: 'now-15m', to: 'now' };
case 'timepicker:refreshIntervalDefaults':
return { display: 'Off', pause: false, value: 0 };
default:
@@ -47,8 +47,7 @@ describe('changeTimeFilter()', function () {
test('should change the timefilter to match the range gt/lt', function () {
const filter = { range: { '@timestamp': { gt, lt } } };
changeTimeFilter(filter);
- const { mode, to, from } = timefilter.getTime();
- expect(mode).to.be('absolute');
+ const { to, from } = timefilter.getTime();
expect(to).to.be(new Date(lt).toISOString());
expect(from).to.be(new Date(gt).toISOString());
});
@@ -56,8 +55,7 @@ describe('changeTimeFilter()', function () {
test('should change the timefilter to match the range gte/lte', function () {
const filter = { range: { '@timestamp': { gte: gt, lte: lt } } };
changeTimeFilter(filter);
- const { mode, to, from } = timefilter.getTime();
- expect(mode).to.be('absolute');
+ const { to, from } = timefilter.getTime();
expect(to).to.be(new Date(lt).toISOString());
expect(from).to.be(new Date(gt).toISOString());
});
diff --git a/src/ui/public/filters/__tests__/moment.js b/src/ui/public/filters/__tests__/moment.js
index ffc404630c4ca..e3550df031ee7 100644
--- a/src/ui/public/filters/__tests__/moment.js
+++ b/src/ui/public/filters/__tests__/moment.js
@@ -57,11 +57,11 @@ describe('moment formatting filter', function () {
// MMMM Do YYYY, HH:mm:ss.SSS
it('should format moments', function () {
- expect(filter(moment())).to.be('January 1st 2014, 06:06:06.666');
+ expect(filter(moment())).to.be('Jan 1, 2014 @ 06:06:06.666');
});
it('should format dates', function () {
- expect(filter(new Date())).to.be('January 1st 2014, 06:06:06.666');
+ expect(filter(new Date())).to.be('Jan 1, 2014 @ 06:06:06.666');
});
it('should return the original value if passed anything other than a moment or Date', function () {
diff --git a/src/ui/public/kbn_top_nav/kbn_top_nav.js b/src/ui/public/kbn_top_nav/kbn_top_nav.js
index b08d469b20642..5daac89f97121 100644
--- a/src/ui/public/kbn_top_nav/kbn_top_nav.js
+++ b/src/ui/public/kbn_top_nav/kbn_top_nav.js
@@ -38,10 +38,10 @@
/**
* kbnTopNav directive
*
- * The top section that shows the timepicker, load, share and save dialogues.
+ * The top section that optionally shows the timepicker and menu items.
*
* ```
- *
+ *
* ```
*
* Menu items/templates are passed to the kbnTopNav via the config attribute
@@ -149,6 +149,10 @@ module.directive('kbnTopNav', function (Private) {
initTopNav(topNavConfig, null);
+ if (!_.has($scope, 'showTimepickerInTopNav')) {
+ $scope.showTimepickerInTopNav = true;
+ }
+
return $scope.kbnTopNav;
},
diff --git a/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js b/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js
index d3df4bb6f704f..00400b93f994c 100644
--- a/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js
+++ b/src/ui/public/kbn_top_nav/kbn_top_nav_controller.js
@@ -20,8 +20,6 @@
import { capitalize, isArray, isFunction, get } from 'lodash';
import chrome from '../chrome';
-import filterTemplate from '../chrome/config/filter.html';
-import intervalTemplate from '../chrome/config/interval.html';
import { i18n } from '@kbn/i18n';
export function KbnTopNavControllerProvider($compile) {
@@ -34,10 +32,7 @@ export function KbnTopNavControllerProvider($compile) {
this.opts = [];
this.menuItems = [];
this.currentKey = null;
- this.templates = {
- interval: intervalTemplate,
- filter: filterTemplate,
- };
+ this.templates = {};
this.locals = new Map();
this.addItems(opts);
diff --git a/src/ui/public/react_components.js b/src/ui/public/react_components.js
index 3475eefba926e..542fe19d8a09d 100644
--- a/src/ui/public/react_components.js
+++ b/src/ui/public/react_components.js
@@ -29,6 +29,7 @@ import {
EuiColorPicker,
EuiIconTip,
EuiCallOut,
+ EuiSuperDatePicker,
} from '@elastic/eui';
import { uiModules } from './modules';
@@ -46,3 +47,19 @@ app.directive('colorPicker', reactDirective => reactDirective(EuiColorPicker));
app.directive('iconTip', reactDirective => reactDirective(EuiIconTip, ['content', 'type', 'position', 'title', 'color']));
app.directive('callOut', reactDirective => reactDirective(EuiCallOut, ['title', 'color', 'size', 'iconType', 'children']));
+
+app.directive('superDatePicker', reactDirective => reactDirective(EuiSuperDatePicker, [
+ 'start',
+ 'end',
+ 'isPaused',
+ 'refreshInterval',
+ 'commonlyUsedRanges',
+ 'dateFormat',
+ 'recentlyUsedRanges',
+ 'onTimeChange',
+ 'onRefreshChange',
+ 'isAutoRefreshOnly',
+ 'commonlyUsedRanges',
+ 'dateFormat',
+ 'recentlyUsedRanges',
+]));
diff --git a/src/ui/public/styles/bootstrap/bootstrap_dark.less b/src/ui/public/styles/bootstrap/bootstrap_dark.less
index 7f9e37f6294e9..459efed37dd75 100644
--- a/src/ui/public/styles/bootstrap/bootstrap_dark.less
+++ b/src/ui/public/styles/bootstrap/bootstrap_dark.less
@@ -62,7 +62,7 @@
@import "responsive-utilities.less"; // Minimal usage
// Decent usage in multiple areas
-@import "dropdowns.less"; // Used in console, datepicker, watcher
+@import "dropdowns.less"; // Used in console, watcher
@import "input-groups.less"; // Used in ML, typeahead, reporting, graph
@import "pagination.less";
@import "pager.less";
diff --git a/src/ui/public/styles/bootstrap_dark.less b/src/ui/public/styles/bootstrap_dark.less
index 0e1dd7b017825..a0079df56a4e2 100644
--- a/src/ui/public/styles/bootstrap_dark.less
+++ b/src/ui/public/styles/bootstrap_dark.less
@@ -2,6 +2,3 @@
// COMPILER FOR BOOTSTRAP
@import "~ui/styles/bootstrap/bootstrap_dark";
-
-// Components -- waiting on EUI conversion
-@import "~ui/timepicker/timepicker";
diff --git a/src/ui/public/styles/bootstrap_light.less b/src/ui/public/styles/bootstrap_light.less
index 9c15f6c0d5646..b251875489fb5 100644
--- a/src/ui/public/styles/bootstrap_light.less
+++ b/src/ui/public/styles/bootstrap_light.less
@@ -5,4 +5,3 @@
// Components -- waiting on EUI conversion
@import "~ui/filter_bar/filter_bar";
-@import "~ui/timepicker/timepicker";
diff --git a/src/ui/public/timefilter/time_history.d.ts b/src/ui/public/timefilter/time_history.d.ts
index 4a7331dbb8c58..bc13fb06d03b1 100644
--- a/src/ui/public/timefilter/time_history.d.ts
+++ b/src/ui/public/timefilter/time_history.d.ts
@@ -20,7 +20,6 @@
interface TimeRange {
from: string;
to: string;
- mode?: string;
}
export interface TimeHistory {
diff --git a/src/ui/public/timefilter/time_history.js b/src/ui/public/timefilter/time_history.js
index 50d6d0d3917e0..1ae908d174f97 100644
--- a/src/ui/public/timefilter/time_history.js
+++ b/src/ui/public/timefilter/time_history.js
@@ -19,13 +19,15 @@
import moment from 'moment';
import { PersistedLog } from '../persisted_log';
-import { TIME_MODES } from '../timepicker/modes';
class TimeHistory {
constructor() {
const historyOptions = {
maxLength: 10,
- filterDuplicates: true
+ filterDuplicates: true,
+ isDuplicate: (oldItem, newItem) => {
+ return oldItem.from === newItem.from && oldItem.to === newItem.to;
+ }
};
this.history = new PersistedLog('kibana.timepicker.timeHistory', historyOptions);
}
@@ -38,7 +40,6 @@ class TimeHistory {
// time from/to can be strings or moment objects - convert to strings so always dealing with same types
const justStringsTime = {
from: moment.isMoment(time.from) ? time.from.toISOString() : time.from,
- mode: TIME_MODES.RECENT,
to: moment.isMoment(time.to) ? time.to.toISOString() : time.to
};
this.history.add(justStringsTime);
diff --git a/src/ui/public/timefilter/timefilter.js b/src/ui/public/timefilter/timefilter.js
index 8f2bbd799efa4..f2d2f4dea5c6b 100644
--- a/src/ui/public/timefilter/timefilter.js
+++ b/src/ui/public/timefilter/timefilter.js
@@ -51,7 +51,6 @@ class Timefilter extends SimpleEmitter {
* @param {Object} time
* @property {string|moment} time.from
* @property {string|moment} time.to
- * @property {string} time.mode (quick | relative | absolute)
*/
setTime = (time) => {
// Object.assign used for partially composed updates
@@ -60,7 +59,6 @@ class Timefilter extends SimpleEmitter {
this._time = {
from: newTime.from,
to: newTime.to,
- mode: newTime.mode
};
timeHistory.add(this._time);
this.emit('timeUpdate');
diff --git a/src/ui/public/timefilter/timefilter.test.js b/src/ui/public/timefilter/timefilter.test.js
index f35f5addaa250..eb07711126e48 100644
--- a/src/ui/public/timefilter/timefilter.test.js
+++ b/src/ui/public/timefilter/timefilter.test.js
@@ -25,7 +25,7 @@ jest.mock('ui/chrome',
get: (key) => {
switch (key) {
case 'timepicker:timeDefaults':
- return { from: 'now-15m', to: 'now', mode: 'quick' };
+ return { from: 'now-15m', to: 'now' };
case 'timepicker:refreshIntervalDefaults':
return { pause: false, value: 0 };
default:
@@ -69,15 +69,14 @@ describe('setTime', () => {
timefilter.setTime({
from: 0,
to: 1,
- mode: 'absolute'
});
timefilter.on('timeUpdate', update);
timefilter.on('fetch', fetch);
});
test('should update time', () => {
- timefilter.setTime({ from: 5, to: 10, mode: 'absolute' });
- expect(timefilter.getTime()).to.eql({ from: 5, to: 10, mode: 'absolute' });
+ timefilter.setTime({ from: 5, to: 10 });
+ expect(timefilter.getTime()).to.eql({ from: 5, to: 10 });
});
test('should not add unexpected object keys to time state', () => {
@@ -88,7 +87,7 @@ describe('setTime', () => {
test('should allow partial updates to time', () => {
timefilter.setTime({ from: 5, to: 10 });
- expect(timefilter.getTime()).to.eql({ from: 5, to: 10, mode: 'absolute' });
+ expect(timefilter.getTime()).to.eql({ from: 5, to: 10 });
});
test('not emit anything if the time has not changed', () => {
@@ -106,11 +105,10 @@ describe('setTime', () => {
test('should return strings and not moment objects', () => {
const from = moment().subtract(15, 'minutes');
const to = moment();
- timefilter.setTime({ to, from, mode: 'absolute' });
+ timefilter.setTime({ to, from });
expect(timefilter.getTime()).to.eql({
from: from.toISOString(),
to: to.toISOString(),
- mode: 'absolute'
});
});
});
diff --git a/src/ui/public/timepicker/__tests__/parse_relative_parts.js b/src/ui/public/timepicker/__tests__/parse_relative_parts.js
deleted file mode 100644
index 52e4dc41262e7..0000000000000
--- a/src/ui/public/timepicker/__tests__/parse_relative_parts.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { parseRelativeString, parseRelativeParts } from '../parse_relative_parts';
-import expect from 'expect.js';
-import moment from 'moment';
-
-describe('parseRelativeParts(from, to, relativeOptions)', () => {
-
- it('should parse relative string', () => {
- const results = parseRelativeString('now-2h');
- expect(results).to.have.property('count', 2);
- expect(results).to.have.property('unit', 'h');
- expect(results).to.have.property('round', false);
- });
-
- it('should parse now', () => {
- const results = parseRelativeString('now');
- expect(results).to.have.property('count', 0);
- expect(results).to.have.property('unit', 's');
- expect(results).to.have.property('round', false);
- });
-
- it('should parse set round options', () => {
- const results = parseRelativeString('now-2h/h');
- expect(results).to.have.property('round', true);
- });
-
- it('should parse now-2h to now-10m/m', () => {
- expect(parseRelativeParts('now-2h', 'now-10m/m')).to.eql({
- from: {
- count: 2,
- unit: 'h',
- round: false
- },
- to: {
- count: 10,
- unit: 'm',
- round: true
- }
- });
- });
-
- it('should parse now-2h to now+10m/m', () => {
- expect(parseRelativeParts('now-2h', 'now+10m/m')).to.eql({
- from: {
- count: 2,
- unit: 'h',
- round: false
- },
- to: {
- count: 10,
- unit: 'm+',
- round: true
- }
- });
- });
-
- it('should parse 3 months ago to now', () => {
- expect(parseRelativeParts(moment().subtract(3, 'M'), moment())).to.eql({
- from: {
- count: 3,
- unit: 'M',
- round: false
- },
- to: {
- count: 0,
- unit: 's',
- round: false
- }
- });
- });
-
- it('should parse 3 months ago to 15 minutes ago', () => {
- const from = moment().subtract(3, 'M');
- const to = moment().subtract(15, 'm');
- expect(parseRelativeParts(from, to)).to.eql({
- from: {
- count: 3,
- unit: 'M',
- round: false
- },
- to: {
- count: 15,
- unit: 'm',
- round: false
- }
- });
- });
-
- it('should parse 3 months ago to 2 hours from now', () => {
- const from = moment().subtract(3, 'M');
- const to = moment().add(2, 'h');
- expect(parseRelativeParts(from, to)).to.eql({
- from: {
- count: 3,
- unit: 'M',
- round: false
- },
- to: {
- count: 2,
- unit: 'h+',
- round: false
- }
- });
- });
-
-});
diff --git a/src/ui/public/timepicker/__tests__/time_navigation.js b/src/ui/public/timepicker/__tests__/time_navigation.js
deleted file mode 100644
index ab5e9cef1b053..0000000000000
--- a/src/ui/public/timepicker/__tests__/time_navigation.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from 'expect.js';
-import moment from 'moment';
-import { timeNavigation } from '../time_navigation';
-
-describe('timeNavigation', () => {
- let bounds;
-
- beforeEach(() => {
- bounds = {
- min: moment('2016-01-01T00:00:00.000Z'),
- max: moment('2016-01-01T00:15:00.000Z')
- };
- });
-
- it('should step forward by the amount of the duration', () => {
- const { from, to, mode } = timeNavigation.stepForward(bounds);
- expect(from).to.be('2016-01-01T00:15:00.001Z');
- expect(to).to.be('2016-01-01T00:30:00.001Z');
- expect(mode).to.be('absolute');
- });
-
- it('should step backward by the amount of the duration', () => {
- const { from, to, mode } = timeNavigation.stepBackward(bounds);
- expect(from).to.be('2015-12-31T23:44:59.999Z');
- expect(to).to.be('2015-12-31T23:59:59.999Z');
- expect(mode).to.be('absolute');
- });
-
- it('should zoom out to be double the original duration', () => {
- const { from, to, mode } = timeNavigation.zoomOut(bounds);
- expect(from).to.be('2015-12-31T23:52:30.000Z');
- expect(to).to.be('2016-01-01T00:22:30.000Z');
- expect(mode).to.be('absolute');
- });
-
- it('should zoom in to be half the original duration', () => {
- const { from, to, mode } = timeNavigation.zoomIn(bounds);
- expect(from).to.be('2016-01-01T00:03:45.000Z');
- expect(to).to.be('2016-01-01T00:11:15.000Z');
- expect(mode).to.be('absolute');
- });
-});
diff --git a/src/ui/public/timepicker/__tests__/toggle.js b/src/ui/public/timepicker/__tests__/toggle.js
deleted file mode 100644
index 57684bcc3c8e5..0000000000000
--- a/src/ui/public/timepicker/__tests__/toggle.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from 'expect.js';
-import ngMock from 'ng_mock';
-import $ from 'jquery';
-import { timefilter } from 'ui/timefilter';
-
-describe('kbnGlobalTimepicker', function () {
- let compile;
- let scope;
-
- beforeEach(() => {
- ngMock.module('kibana');
- ngMock.inject(($compile, $rootScope) => {
- scope = $rootScope.$new();
- compile = () => {
- const $el = $('');
- $el.data('$kbnTopNavController', {}); // Mock the kbnTopNav
- $compile($el)(scope);
- scope.$apply();
- return $el;
- };
- });
- });
-
- it('injects the timepicker into the DOM', () => {
- const $el = compile();
- expect($el.attr('data-test-subj')).to.be('globalTimepicker');
- });
-
- it('sets data-shared-timefilter-* using the timefilter when auto-refresh selector is enabled', function () {
- const minString = '2000-01-01T00:00:00Z';
- const maxString = '2001-01-01T00:00:00Z';
-
- timefilter.enableAutoRefreshSelector();
- timefilter.disableTimeRangeSelector();
- timefilter.setTime({
- from: minString,
- to: maxString,
- mode: 'absolute'
- });
-
- const $el = compile();
-
- expect($el.attr('data-shared-timefilter-from')).to.eql(minString);
- expect($el.attr('data-shared-timefilter-to')).to.eql(maxString);
- });
-
- it('sets data-shared-timefilter-* using the timefilter when time range selector is enabled', function () {
- const minString = '2000-01-01T00:00:00Z';
- const maxString = '2001-01-01T00:00:00Z';
-
- timefilter.disableAutoRefreshSelector();
- timefilter.enableTimeRangeSelector();
- timefilter.setTime({
- from: minString,
- to: maxString,
- mode: 'absolute'
- });
-
- const $el = compile();
-
- expect($el.attr('data-shared-timefilter-from')).to.eql(minString);
- expect($el.attr('data-shared-timefilter-to')).to.eql(maxString);
- });
-
- it(`doesn't set data-shared-timefilter-* when auto-refresh and time range selectors are both disabled`, function () {
- const minString = '2000-01-01T00:00:00Z';
- const maxString = '2001-01-01T00:00:00Z';
-
- timefilter.disableAutoRefreshSelector();
- timefilter.disableTimeRangeSelector();
- timefilter.setTime({
- from: minString,
- to: maxString,
- mode: 'absolute'
- });
-
- const $el = compile();
-
- expect($el.attr('data-shared-timefilter-from')).to.eql('');
- expect($el.attr('data-shared-timefilter-to')).to.eql('');
- });
-});
diff --git a/src/ui/public/timepicker/absolute_panel/index.js b/src/ui/public/timepicker/absolute_panel/index.js
deleted file mode 100644
index 0433e8fe86a6f..0000000000000
--- a/src/ui/public/timepicker/absolute_panel/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import './kbn_timepicker_absolute_panel';
diff --git a/src/ui/public/timepicker/absolute_panel/kbn_timepicker_absolute_panel.html b/src/ui/public/timepicker/absolute_panel/kbn_timepicker_absolute_panel.html
deleted file mode 100644
index d12e78c1c14f1..0000000000000
--- a/src/ui/public/timepicker/absolute_panel/kbn_timepicker_absolute_panel.html
+++ /dev/null
@@ -1,110 +0,0 @@
-
diff --git a/src/ui/public/timepicker/absolute_panel/kbn_timepicker_absolute_panel.js b/src/ui/public/timepicker/absolute_panel/kbn_timepicker_absolute_panel.js
deleted file mode 100644
index 37504cec058c4..0000000000000
--- a/src/ui/public/timepicker/absolute_panel/kbn_timepicker_absolute_panel.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import template from './kbn_timepicker_absolute_panel.html';
-import { uiModules } from '../../modules';
-
-const module = uiModules.get('ui/timepicker');
-
-module.directive('kbnTimepickerAbsolutePanel', function () {
- return {
- restrict: 'E',
- replace: true,
- scope: {
- absolute: '=',
- applyAbsolute: '&',
- format: '=',
- pickFromDate: '=',
- pickToDate: '=',
- setToNow: '&'
- },
- template,
- controller: function () {
- }
- };
-});
diff --git a/src/ui/public/timepicker/index.js b/src/ui/public/timepicker/index.js
index 2cea4af1a5430..5e68b5bc41103 100644
--- a/src/ui/public/timepicker/index.js
+++ b/src/ui/public/timepicker/index.js
@@ -17,4 +17,4 @@
* under the License.
*/
-import './timepicker';
+import './kbn_global_timepicker';
diff --git a/src/ui/public/timepicker/kbn_global_timepicker.html b/src/ui/public/timepicker/kbn_global_timepicker.html
index 9413ef4f35ad7..8ef4dcfe1c960 100644
--- a/src/ui/public/timepicker/kbn_global_timepicker.html
+++ b/src/ui/public/timepicker/kbn_global_timepicker.html
@@ -1,90 +1,20 @@
-
-
-
-
-
-
-
-
-
+
diff --git a/src/ui/public/timepicker/kbn_global_timepicker.js b/src/ui/public/timepicker/kbn_global_timepicker.js
index 8d4dcbae0be16..2ff0e8b1c8f54 100644
--- a/src/ui/public/timepicker/kbn_global_timepicker.js
+++ b/src/ui/public/timepicker/kbn_global_timepicker.js
@@ -20,16 +20,12 @@
import { uiModules } from '../modules';
import toggleHtml from './kbn_global_timepicker.html';
-import { timeNavigation } from './time_navigation';
import { timefilter } from 'ui/timefilter';
-import { prettyDuration } from './pretty_duration';
-import { prettyInterval } from './pretty_interval';
+import { timeHistory } from 'ui/timefilter/time_history';
uiModules
.get('kibana')
.directive('kbnGlobalTimepicker', (globalState, config) => {
- const getConfig = (...args) => config.get(...args);
-
const listenForUpdates = ($scope) => {
$scope.$listenAndDigestAsync(timefilter, 'refreshIntervalUpdate', () => {
setTimefilterValues($scope);
@@ -48,44 +44,51 @@ uiModules
$scope.timefilterValues = {
refreshInterval: refreshInterval,
time: time,
- display: {
- time: prettyDuration(time.from, time.to, getConfig),
- refreshInterval: prettyInterval(refreshInterval.value),
- },
isAutoRefreshSelectorEnabled: timefilter.isAutoRefreshSelectorEnabled,
isTimeRangeSelectorEnabled: timefilter.isTimeRangeSelectorEnabled,
};
+ $scope.recentlyUsedRanges = timeHistory.get().map(({ from, to }) => {
+ return {
+ start: from,
+ end: to,
+ };
+ });
}
return {
template: toggleHtml,
replace: true,
- require: '^kbnTopNav',
- link: ($scope, element, attributes, kbnTopNav) => {
+ link: ($scope) => {
listenForUpdates($scope);
setTimefilterValues($scope);
- $scope.toggleRefresh = () => {
- timefilter.toggleRefresh();
- };
+ config.watch('timepicker:quickRanges', (quickRanges) => {
+ // quickRanges is null when timepicker:quickRanges is set to default value
+ const ranges = quickRanges ? quickRanges : config.get('timepicker:quickRanges');
+ $scope.commonlyUsedRanges = ranges.map(({ from, to, display }) => {
+ return {
+ start: from,
+ end: to,
+ label: display,
+ };
+ });
+ });
- $scope.forward = function () {
- timefilter.setTime(timeNavigation.stepForward(timefilter.getBounds()));
- };
-
- $scope.back = function () {
- timefilter.setTime(timeNavigation.stepBackward(timefilter.getBounds()));
- };
+ config.watch('dateFormat', (dateFormat) => {
+ // dateFormat is null when dateFormat is set to default value
+ $scope.dateFormat = dateFormat ? dateFormat : config.get('dateFormat');
+ });
- $scope.updateFilter = function (from, to, mode) {
- timefilter.setTime({ from, to, mode });
- kbnTopNav.close('filter');
+ $scope.updateFilter = function ({ start, end }) {
+ timefilter.setTime({ from: start, to: end });
};
- $scope.updateInterval = function (interval) {
- timefilter.setRefreshInterval(interval);
- kbnTopNav.close('interval');
+ $scope.updateInterval = function ({ isPaused, refreshInterval }) {
+ timefilter.setRefreshInterval({
+ pause: isPaused,
+ value: refreshInterval ? refreshInterval : $scope.timefilterValues.refreshInterval.value
+ });
};
$scope.getSharedTimeFilterFromDate = function () {
diff --git a/src/ui/public/timepicker/modes.js b/src/ui/public/timepicker/modes.js
deleted file mode 100644
index 150c1c6d59a4e..0000000000000
--- a/src/ui/public/timepicker/modes.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export const TIME_MODES = {
- ABSOLUTE: 'absolute',
- QUICK: 'quick',
- RECENT: 'recent',
- RELATIVE: 'relative',
-};
diff --git a/src/ui/public/timepicker/parse_relative_parts.js b/src/ui/public/timepicker/parse_relative_parts.js
deleted file mode 100644
index 1c4ffbf69f567..0000000000000
--- a/src/ui/public/timepicker/parse_relative_parts.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import dateMath from '@elastic/datemath';
-import moment from 'moment';
-import _ from 'lodash';
-import { relativeOptions } from './relative_options';
-
-export function parseRelativeString(part) {
- let results = {};
- const matches = _.isString(part) && part.match(/now(([\-\+])([0-9]+)([smhdwMy])(\/[smhdwMy])?)?/);
-
- const isNow = matches && !matches[1];
- const operator = matches && matches[2];
- const count = matches && matches[3];
- const unit = matches && matches[4];
- const roundBy = matches && matches[5];
-
- if (isNow) {
- return { count: 0, unit: 's', round: false };
- }
-
- if (count && unit) {
- results.count = parseInt(count, 10);
- results.unit = unit;
- if (operator === '+') results.unit += '+';
- results.round = roundBy ? true : false;
- return results;
-
- } else {
- results = { count: 0, unit: 's', round: false };
- const duration = moment.duration(moment().diff(dateMath.parse(part)));
- const units = _.pluck(_.clone(relativeOptions).reverse(), 'value')
- .filter(s => /^[smhdwMy]$/.test(s));
- let unitOp = '';
- for (let i = 0; i < units.length; i++) {
- const as = duration.as(units[i]);
- if (as < 0) unitOp = '+';
- if (Math.abs(as) > 1) {
- results.count = Math.round(Math.abs(as));
- results.unit = units[i] + unitOp;
- results.round = false;
- break;
- }
- }
- return results;
- }
-
-
-}
-
-export function parseRelativeParts(from, to) {
- const results = {};
- results.from = parseRelativeString(from);
- results.to = parseRelativeString(to);
- if (results.from && results.to) return results;
-}
diff --git a/src/ui/public/timepicker/pretty_duration.js b/src/ui/public/timepicker/pretty_duration.js
deleted file mode 100644
index 0ce945cdb08be..0000000000000
--- a/src/ui/public/timepicker/pretty_duration.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import dateMath from '@elastic/datemath';
-import moment from 'moment';
-import { timeUnits } from './time_units';
-import { i18n } from '@kbn/i18n';
-
-const TIME_NOW = 'now';
-
-function cantLookup(timeFrom, timeTo, dateFormat) {
- const displayFrom = formatTimeString(timeFrom, dateFormat);
- const displayTo = formatTimeString(timeTo, dateFormat, true);
- return i18n.translate('common.ui.timepicker.fullTimeRange', {
- defaultMessage: '{displayFrom} to {displayTo}',
- values: {
- displayFrom,
- displayTo
- }
- });
-}
-
-function formatTimeString(timeString, dateFormat, roundUp = false) {
- if (moment(timeString).isValid()) {
- return moment(timeString).format(dateFormat);
- } else {
- if (timeString === TIME_NOW) {
- return i18n.translate('common.ui.timepicker.timeNow', { defaultMessage: 'now' });
- } else {
- const tryParse = dateMath.parse(timeString, { roundUp: roundUp });
- return moment.isMoment(tryParse) ? '~ ' + tryParse.fromNow() : timeString;
- }
- }
-}
-
-function getDateLookupKey(startDate, endDate) {
- return startDate + ' to ' + endDate;
-}
-
-export function prettyDuration(timeFrom, timeTo, getConfig) {
- const quickRanges = getConfig('timepicker:quickRanges');
- const dateFormat = getConfig('dateFormat');
-
- const lookupByRange = {};
- quickRanges.forEach((frame) => {
- lookupByRange[getDateLookupKey(frame.from, frame.to)] = frame;
- });
-
- // If both parts are date math, try to look up a reasonable string
- if (timeFrom && timeTo && !moment.isMoment(timeFrom) && !moment.isMoment(timeTo)) {
- const tryLookup = lookupByRange[getDateLookupKey(timeFrom, timeTo)];
- if (tryLookup) {
- return tryLookup.display;
- } else {
- const [start, end] = timeFrom.toString().split('-');
- if (timeTo.toString() === TIME_NOW && start === TIME_NOW && end) {
- const [amount, unitId] = end.split('/');
- let text = i18n.translate('common.ui.timepicker.timeUntilNowStr', {
- defaultMessage: 'Last {amount}',
- values: { amount }
- });
-
- if (unitId) {
- text = text + ' ' + i18n.translate('common.ui.timepicker.roundedTo', {
- defaultMessage: 'rounded to the {unit}',
- values: { unit: timeUnits[unitId] }
- });
- }
- return text;
- } else {
- return cantLookup(timeFrom, timeTo, dateFormat);
- }
- }
- }
-
- // If at least one part is a moment, try to make pretty strings by parsing date math
- return cantLookup(timeFrom, timeTo, dateFormat);
-}
diff --git a/src/ui/public/timepicker/pretty_duration.test.js b/src/ui/public/timepicker/pretty_duration.test.js
deleted file mode 100644
index 3a49c7c939634..0000000000000
--- a/src/ui/public/timepicker/pretty_duration.test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from 'expect.js';
-import moment from 'moment-timezone';
-import { prettyDuration } from './pretty_duration';
-
-const config = {};
-moment.tz.setDefault('UTC');
-config.dateFormat = 'MMMM Do YYYY, HH:mm:ss.SSS';
-config['timepicker:quickRanges'] = [
- {
- from: 'now-15m',
- to: 'now',
- display: 'quick range 15 minutes custom display',
- }
-];
-const getConfig = (key) => config[key];
-
-test('quick range', () => {
- const timeFrom = 'now-15m';
- const timeTo = 'now';
- expect(prettyDuration(timeFrom, timeTo, getConfig)).to.be('quick range 15 minutes custom display');
-});
-
-describe('relative range', () => {
- test('from = now', () => {
- const timeFrom = 'now-1M';
- const timeTo = 'now';
- expect(prettyDuration(timeFrom, timeTo, getConfig)).to.be('Last 1M');
- });
-
- test('from is in past', () => {
- const timeFrom = 'now-17m';
- const timeTo = 'now-15m';
- expect(prettyDuration(timeFrom, timeTo, getConfig)).to.be('~ 17 minutes ago to ~ 15 minutes ago');
- });
-});
-
-describe('absolute range', () => {
- test('dates in string format)', () => {
- const timeFrom = '2018-01-17T18:57:57.149Z';
- const timeTo = '2018-01-17T20:00:00.000Z';
- expect(prettyDuration(timeFrom, timeTo, getConfig)).to.be('January 17th 2018, 18:57:57.149 to January 17th 2018, 20:00:00.000');
- });
-
- test('dates as moment objects', () => {
- const timeFrom = moment('2018-01-17T18:57:57.149Z');
- const timeTo = moment('2018-01-17T20:00:00.000Z');
- expect(prettyDuration(timeFrom, timeTo, getConfig)).to.be('January 17th 2018, 18:57:57.149 to January 17th 2018, 20:00:00.000');
- });
-});
-
-
diff --git a/src/ui/public/timepicker/pretty_interval.js b/src/ui/public/timepicker/pretty_interval.js
deleted file mode 100644
index 57ba6340ed336..0000000000000
--- a/src/ui/public/timepicker/pretty_interval.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-const MS_IN_SECOND = 1000;
-const MS_IN_MINUTE = 60 * MS_IN_SECOND;
-const MS_IN_HOUR = 60 * MS_IN_MINUTE;
-const MS_IN_DAY = 24 * MS_IN_HOUR;
-
-export function prettyInterval(intervalInMs) {
- let interval;
- if (intervalInMs === 0) {
- return i18n.translate('common.ui.timepicker.off', { defaultMessage: 'Off' });
- } else if (intervalInMs < MS_IN_MINUTE) {
- interval = Math.round(intervalInMs / MS_IN_SECOND);
- return i18n.translate('common.ui.timepicker.totalSeconds', {
- defaultMessage: `{interval} {interval, plural,
- one {second}
- other {seconds}
- }`,
- values: { interval },
- });
- } else if (intervalInMs < MS_IN_HOUR) {
- interval = Math.round(intervalInMs / MS_IN_MINUTE);
- return i18n.translate('common.ui.timepicker.totalMinutes', {
- defaultMessage: `{interval} {interval, plural,
- one {minute}
- other {minutes}
- }`,
- values: { interval },
- });
- } else if (intervalInMs < MS_IN_DAY) {
- interval = Math.round(intervalInMs / MS_IN_HOUR);
- return i18n.translate('common.ui.timepicker.totalHours', {
- defaultMessage: `{interval} {interval, plural,
- one {hour}
- other {hours}
- }`,
- values: { interval },
- });
- } else {
- interval = Math.round(intervalInMs / MS_IN_DAY);
- return i18n.translate('common.ui.timepicker.totalDays', {
- defaultMessage: `{interval} {interval, plural,
- one {day}
- other {days}
- }`,
- values: { interval },
- });
- }
-}
diff --git a/src/ui/public/timepicker/pretty_interval.test.js b/src/ui/public/timepicker/pretty_interval.test.js
deleted file mode 100644
index 72b99d0c43908..0000000000000
--- a/src/ui/public/timepicker/pretty_interval.test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from 'expect.js';
-import { prettyInterval } from './pretty_interval';
-
-test('Off', () => {
- expect(prettyInterval(0)).to.be('Off');
-});
-
-test('seconds', () => {
- expect(prettyInterval(1000)).to.be('1 second');
- expect(prettyInterval(15000)).to.be('15 seconds');
-});
-
-test('minutes', () => {
- expect(prettyInterval(60000)).to.be('1 minute');
- expect(prettyInterval(1800000)).to.be('30 minutes');
-});
-
-test('hours', () => {
- expect(prettyInterval(3600000)).to.be('1 hour');
- expect(prettyInterval(43200000)).to.be('12 hours');
-});
-
-test('days', () => {
- expect(prettyInterval(86400000)).to.be('1 day');
- expect(prettyInterval(86400000 * 2)).to.be('2 days');
-});
diff --git a/src/ui/public/timepicker/quick_panel/index.js b/src/ui/public/timepicker/quick_panel/index.js
deleted file mode 100644
index 4bdadf9358644..0000000000000
--- a/src/ui/public/timepicker/quick_panel/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import './kbn_timepicker_quick_panel';
diff --git a/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.html b/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.html
deleted file mode 100644
index 7855e5aae8f41..0000000000000
--- a/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.js b/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.js
deleted file mode 100644
index 46ef2d7cb84d6..0000000000000
--- a/src/ui/public/timepicker/quick_panel/kbn_timepicker_quick_panel.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import _ from 'lodash';
-import template from './kbn_timepicker_quick_panel.html';
-import { uiModules } from '../../modules';
-
-const module = uiModules.get('ui/timepicker');
-
-module.directive('kbnTimepickerQuickPanel', function (config) {
- return {
- restrict: 'E',
- replace: true,
- scope: {
- setQuick: '&'
- },
- template,
- controller: function ($scope) {
- const quickRanges = config.get('timepicker:quickRanges');
- $scope.quickLists = _(quickRanges).groupBy('section').values().value();
- }
- };
-});
diff --git a/src/ui/public/timepicker/recent_panel/index.js b/src/ui/public/timepicker/recent_panel/index.js
deleted file mode 100644
index ac90ee48fc69b..0000000000000
--- a/src/ui/public/timepicker/recent_panel/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import './kbn_timepicker_recent_panel';
diff --git a/src/ui/public/timepicker/recent_panel/kbn_timepicker_recent_panel.html b/src/ui/public/timepicker/recent_panel/kbn_timepicker_recent_panel.html
deleted file mode 100644
index 2be79b1383af6..0000000000000
--- a/src/ui/public/timepicker/recent_panel/kbn_timepicker_recent_panel.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- No time history. Your most recent time ranges show up here, so you can easily view them later.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/ui/public/timepicker/recent_panel/kbn_timepicker_recent_panel.js b/src/ui/public/timepicker/recent_panel/kbn_timepicker_recent_panel.js
deleted file mode 100644
index 597cc5b1ed22a..0000000000000
--- a/src/ui/public/timepicker/recent_panel/kbn_timepicker_recent_panel.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import template from './kbn_timepicker_recent_panel.html';
-import { uiModules } from '../../modules';
-import { timeHistory } from '../../timefilter/time_history';
-import { prettyDuration } from '../pretty_duration';
-
-const module = uiModules.get('ui/timepicker');
-
-module.directive('kbnTimepickerRecentPanel', function () {
- return {
- restrict: 'E',
- replace: true,
- scope: {
- setQuick: '&'
- },
- template,
- controller: function ($scope, config) {
- const getConfig = (...args) => config.get(...args);
- $scope.recent = timeHistory.get().map(time => {
- time.display = prettyDuration(time.from, time.to, getConfig);
- return time;
- });
- }
- };
-});
diff --git a/src/ui/public/timepicker/refresh_intervals.js b/src/ui/public/timepicker/refresh_intervals.js
deleted file mode 100644
index 4dd66a16e028d..0000000000000
--- a/src/ui/public/timepicker/refresh_intervals.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { uiModules } from '../modules';
-const module = uiModules.get('kibana');
-
-module.constant('refreshIntervals', [
- { value: 0, section: 0 },
-
- { value: 5000, section: 1 },
- { value: 10000, section: 1 },
- { value: 30000, section: 1 },
- { value: 45000, section: 1 },
-
- { value: 60000, section: 2 },
- { value: 300000, section: 2 },
- { value: 900000, section: 2 },
- { value: 1800000, section: 2 },
-
- { value: 3600000, section: 3 },
- { value: 7200000, section: 3 },
- { value: 43200000, section: 3 },
- { value: 86400000, section: 3 }
-]);
-
diff --git a/src/ui/public/timepicker/relative_panel/index.js b/src/ui/public/timepicker/relative_panel/index.js
deleted file mode 100644
index 7262dbb26899a..0000000000000
--- a/src/ui/public/timepicker/relative_panel/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import './kbn_timepicker_relative_panel';
diff --git a/src/ui/public/timepicker/relative_panel/kbn_timepicker_relative_panel.html b/src/ui/public/timepicker/relative_panel/kbn_timepicker_relative_panel.html
deleted file mode 100644
index 3a36461734a32..0000000000000
--- a/src/ui/public/timepicker/relative_panel/kbn_timepicker_relative_panel.html
+++ /dev/null
@@ -1,191 +0,0 @@
-
diff --git a/src/ui/public/timepicker/relative_panel/kbn_timepicker_relative_panel.js b/src/ui/public/timepicker/relative_panel/kbn_timepicker_relative_panel.js
deleted file mode 100644
index 78bd136b2bb3e..0000000000000
--- a/src/ui/public/timepicker/relative_panel/kbn_timepicker_relative_panel.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import template from './kbn_timepicker_relative_panel.html';
-import { uiModules } from '../../modules';
-
-const module = uiModules.get('ui/timepicker');
-
-module.directive('kbnTimepickerRelativePanel', function () {
- return {
- restrict: 'E',
- replace: true,
- scope: {
- applyRelative: '&',
- checkRelative: '&',
- formatRelative: '&',
- relative: '=',
- relativeOptions: '=',
- setRelativeToNow: '&',
- units: '='
- },
- template,
- controller: function () {
- }
- };
-});
diff --git a/src/ui/public/timepicker/time_navigation.js b/src/ui/public/timepicker/time_navigation.js
deleted file mode 100644
index 54b0f9fb9fd6b..0000000000000
--- a/src/ui/public/timepicker/time_navigation.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import moment from 'moment';
-
-export const timeNavigation = {
- // travel forward in time based on the interval between from and to
- stepForward({ min, max }) {
- const diff = max.diff(min);
- return {
- from: moment(max).add(1, 'ms').toISOString(),
- to: moment(max).add(diff + 1, 'ms').toISOString(),
- mode: 'absolute'
- };
- },
-
- // travel backwards in time based on the interval between from and to
- stepBackward({ min, max }) {
- const diff = max.diff(min);
- return {
- from: moment(min).subtract(diff + 1, 'ms').toISOString(),
- to: moment(min).subtract(1, 'ms').toISOString(),
- mode: 'absolute'
- };
- },
-
- // zoom out, doubling the difference between start and end, keeping the same time range center
- zoomOut({ min, max }) {
- const diff = max.diff(min);
- return {
- from: moment(min).subtract(diff / 2, 'ms').toISOString(),
- to: moment(max).add(diff / 2, 'ms').toISOString(),
- mode: 'absolute'
- };
- },
-
- // zoom in, halving the difference between start and end, keeping the same time range center
- zoomIn({ min, max }) {
- const diff = max.diff(min);
- return {
- from: moment(min).add(diff / 4, 'ms').toISOString(),
- to: moment(max).subtract(diff / 4, 'ms').toISOString(),
- mode: 'absolute'
- };
- }
-};
diff --git a/src/ui/public/timepicker/time_units.js b/src/ui/public/timepicker/time_units.js
deleted file mode 100644
index 627202264de7a..0000000000000
--- a/src/ui/public/timepicker/time_units.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export const timeUnits = {
- s: 'second',
- m: 'minute',
- h: 'hour',
- d: 'day',
- w: 'week',
- M: 'month',
- y: 'year'
-};
-
diff --git a/src/ui/public/timepicker/timepicker.html b/src/ui/public/timepicker/timepicker.html
deleted file mode 100644
index 563491e8dd74d..0000000000000
--- a/src/ui/public/timepicker/timepicker.html
+++ /dev/null
@@ -1,141 +0,0 @@
-