allow selection of relative history

elastic · Jan 10, 2018 · d45ebad · d45ebad
1 parent 040e075
commit d45ebad
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
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
@@ -138,6 +138,20 @@
   </div>
 
   <div class="kbn-timepicker-actions kuiVerticalRhythm">
+    <select
+      ng-if="history.length > 0"
+      ng-change="selectHistory(selectedIndex)"
+      ng-model="selectedIndex"
+      class="kuiSelect fullWidth"
+    >
+      <option value="" disabled selected hidden>Select previous absolute time</option>
+      <option
+        ng-repeat="time in history"
+        value="{{$index}}"
+      >
+        {{time.from}} to {{time.to}}
+      </option>
+    </select>
     <span
       class="kbn-timepicker-action-item kbn-timepicker-error"
       ng-show="checkRelative()"

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
@@ -1,5 +1,7 @@
 import template from './kbn_timepicker_relative_panel.html';
 import { uiModules } from 'ui/modules';
+import { timeHistory } from 'ui/timefilter/time_history';
+import { TIME_MODES } from 'ui/timepicker/modes';
 
 const module = uiModules.get('ui/timepicker');
 
@@ -14,10 +16,20 @@ module.directive('kbnTimepickerRelativePanel', function () {
       relative: '=',
       relativeOptions: '=',
       setRelativeToNow: '&',
+      setRelative: '&',
       units: '='
     },
     template,
-    controller: function () {
+    controller: function ($scope) {
+      $scope.history = timeHistory.getTimeHistory(TIME_MODES.RELATIVE);
+      $scope.selectHistory = function (selectedIndex) {
+        if ($scope.history[selectedIndex]) {
+          $scope.setRelative({
+            from: $scope.history[selectedIndex].from,
+            to: $scope.history[selectedIndex].to
+          });
+        }
+      };
     }
   };
 });
diff --git a/src/ui/public/timepicker/timepicker.html b/src/ui/public/timepicker/timepicker.html
@@ -69,6 +69,7 @@ <h2 class="kuiLocalDropdownTitle kbn-timepicker-title__text">
           relative="relative"
           relative-options="relativeOptions"
           set-relative-to-now="setRelativeToNow(key)"
+          set-relative="setRelative(from, to)"
           units="units"
           role="tabpanel"
           aria-labelledby="timepickerRelative"

diff --git a/src/ui/public/timepicker/timepicker.js b/src/ui/public/timepicker/timepicker.js
@@ -130,9 +130,7 @@ module.directive('kbnTimepicker', function (timeUnits, refreshIntervals) {
           case TIME_MODES.QUICK:
             break;
           case TIME_MODES.RELATIVE:
-            $scope.relative = parseRelativeParts($scope.from, $scope.to);
-            $scope.formatRelative('from');
-            $scope.formatRelative('to');
+            $scope.setRelative($scope.from, $scope.to);
             break;
           case TIME_MODES.ABSOLUTE:
             $scope.absolute.from = dateMath.parse($scope.from || moment().subtract(15, 'minutes'));
@@ -157,6 +155,12 @@ module.directive('kbnTimepicker', function (timeUnits, refreshIntervals) {
         $scope.formatRelative(key);
       };
 
+      $scope.setRelative = function (from, to) {
+        $scope.relative = parseRelativeParts(from, to);
+        $scope.formatRelative('from');
+        $scope.formatRelative('to');
+      };
+
       $scope.checkRelative = function () {
         if ($scope.relative.from.count != null && $scope.relative.to.count != null) {
           const from = dateMath.parse(getRelativeString('from'));