fix absolute today/this week on timeline

elastic · Nov 3, 2020 · 56662b7 · 56662b7
1 parent 24a86d4
commit 56662b7
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 34 deletions.
diff --git a/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx b/x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx
@@ -350,16 +350,28 @@ export const dispatchUpdateSearch = (dispatch: Dispatch) => ({
   if (updateTime) {
     const fromDate = formatDate(start);
     let toDate = formatDate(end, { roundUp: true });
-    if (isQuickSelection && end !== start) {
-      dispatch(
-        inputsActions.setRelativeRangeDatePicker({
-          id,
-          fromStr: start,
-          toStr: end,
-          from: fromDate,
-          to: toDate,
-        })
-      );
+    if (isQuickSelection) {
+      if (end === start) {
+        dispatch(
+          inputsActions.setAbsoluteRangeDatePicker({
+            id,
+            fromStr: start,
+            toStr: end,
+            from: fromDate,
+            to: toDate,
+          })
+        );
+      } else {
+        dispatch(
+          inputsActions.setRelativeRangeDatePicker({
+            id,
+            fromStr: start,
+            toStr: end,
+            from: fromDate,
+            to: toDate,
+          })
+        );
+      }
     } else {
       toDate = formatDate(end);
       dispatch(

diff --git a/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.tsx b/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.tsx
@@ -180,8 +180,8 @@ export const SuperDatePickerComponent = React.memo<SuperDatePickerProps>(
       [recentlyUsedRanges, kqlQuery]
     );
 
-    const endDate = kind === 'relative' ? toStr : new Date(end).toISOString();
-    const startDate = kind === 'relative' ? fromStr : new Date(start).toISOString();
+    const endDate = toStr != null ? toStr : new Date(end).toISOString();
+    const startDate = fromStr != null ? fromStr : new Date(start).toISOString();
 
     const [quickRanges] = useUiSetting$<Range[]>(DEFAULT_TIMEPICKER_QUICK_RANGES);
     const commonlyUsedRanges = isEmpty(quickRanges)
@@ -230,16 +230,28 @@ export const dispatchUpdateReduxTime = (dispatch: Dispatch) => ({
 }: UpdateReduxTime): ReturnUpdateReduxTime => {
   const fromDate = formatDate(start);
   let toDate = formatDate(end, { roundUp: true });
-  if (isQuickSelection && end !== start) {
-    dispatch(
-      inputsActions.setRelativeRangeDatePicker({
-        id,
-        fromStr: start,
-        toStr: end,
-        from: fromDate,
-        to: toDate,
-      })
-    );
+  if (isQuickSelection) {
+    if (end === start) {
+      dispatch(
+        inputsActions.setAbsoluteRangeDatePicker({
+          id,
+          fromStr: start,
+          toStr: end,
+          from: fromDate,
+          to: toDate,
+        })
+      );
+    } else {
+      dispatch(
+        inputsActions.setRelativeRangeDatePicker({
+          id,
+          fromStr: start,
+          toStr: end,
+          from: fromDate,
+          to: toDate,
+        })
+      );
+    }
   } else {
     toDate = formatDate(end);
     dispatch(

diff --git a/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts b/x-pack/plugins/security_solution/public/common/store/inputs/actions.ts
@@ -16,6 +16,8 @@ export const setAbsoluteRangeDatePicker = actionCreator<{
   id: InputsModelId;
   from: string;
   to: string;
+  fromStr?: string;
+  toStr?: string;
 }>('SET_ABSOLUTE_RANGE_DATE_PICKER');
 
 export const setTimelineRangeDatePicker = actionCreator<{

diff --git a/x-pack/plugins/security_solution/public/common/store/inputs/model.ts b/x-pack/plugins/security_solution/public/common/store/inputs/model.ts
@@ -11,8 +11,8 @@ import { Query, Filter, SavedQuery } from '../../../../../../../src/plugins/data
 
 export interface AbsoluteTimeRange {
   kind: 'absolute';
-  fromStr: undefined;
-  toStr: undefined;
+  fromStr?: string;
+  toStr?: string;
   from: string;
   to: string;
 }

diff --git a/x-pack/plugins/security_solution/public/common/store/inputs/reducer.ts b/x-pack/plugins/security_solution/public/common/store/inputs/reducer.ts
@@ -149,16 +149,19 @@ export const inputsReducer = reducerWithInitialState(initialInputsState)
       },
     };
   })
-  .case(setAbsoluteRangeDatePicker, (state, { id, from, to }) => {
-    const timerange: TimeRange = {
-      kind: 'absolute',
-      fromStr: undefined,
-      toStr: undefined,
-      from,
-      to,
-    };
-    return updateInputTimerange(id, timerange, state);
-  })
+  .case(
+    setAbsoluteRangeDatePicker,
+    (state, { id, from, to, fromStr = undefined, toStr = undefined }) => {
+      const timerange: TimeRange = {
+        kind: 'absolute',
+        fromStr,
+        toStr,
+        from,
+        to,
+      };
+      return updateInputTimerange(id, timerange, state);
+    }
+  )
   .case(setRelativeRangeDatePicker, (state, { id, fromStr, from, to, toStr }) => {
     const timerange: TimeRange = {
       kind: 'relative',