[SECURITY SOLUTIONS] Keep context of timeline when switching tabs in security solutions

x-pack/plugins/security_solution/public/common/components/query_bar/index.tsx

@@ -62,7 +62,10 @@ export const QueryBar = memo<QueryBarComponentProps>(
     const [draftQuery, setDraftQuery] = useState(filterQuery);
 
     useEffect(() => {
-      // Reset draftQuery when `Create new timeline` is clicked
+      setDraftQuery(filterQuery);
+    }, [filterQuery]);
+
+    useEffect(() => {
       if (filterQueryDraft == null) {
         setDraftQuery(filterQuery);
       }

x-pack/plugins/security_solution/public/common/components/search_bar/index.tsx

@@ -132,7 +132,7 @@ export const SearchBarComponent = memo<SiemSearchBarProps & PropsFromRedux>(
 
         if (!isStateUpdated) {
           // That mean we are doing a refresh!
-          if (isQuickSelection) {
+          if (isQuickSelection && payload.dateRange.to !== payload.dateRange.from) {
             updateSearchBar.updateTime = true;
             updateSearchBar.end = payload.dateRange.to;
             updateSearchBar.start = payload.dateRange.from;
@@ -313,7 +313,7 @@ const makeMapStateToProps = () => {
       fromStr: getFromStrSelector(inputsRange),
       filterQuery: getFilterQuerySelector(inputsRange),
       isLoading: getIsLoadingSelector(inputsRange),
-      queries: getQueriesSelector(inputsRange),
+      queries: getQueriesSelector(state, id),
       savedQuery: getSavedQuerySelector(inputsRange),
       start: getStartSelector(inputsRange),
       toStr: getToStrSelector(inputsRange),
@@ -351,15 +351,27 @@ export const dispatchUpdateSearch = (dispatch: Dispatch) => ({
     const fromDate = formatDate(start);
     let toDate = formatDate(end, { roundUp: true });
     if (isQuickSelection) {
-      dispatch(
-        inputsActions.setRelativeRangeDatePicker({
-          id,
-          fromStr: start,
-          toStr: end,
-          from: fromDate,
-          to: toDate,
-        })
-      );
+      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(

x-pack/plugins/security_solution/public/common/components/super_date_picker/index.test.tsx

@@ -139,7 +139,7 @@ describe('SIEM Super Date Picker', () => {
         expect(store.getState().inputs.global.timerange.toStr).toBe('now');
       });
 
-      test('Make Sure it is Today date', () => {
+      test('Make Sure it is Today date is an absolute date', () => {
         wrapper
           .find('[data-test-subj="superDatePickerToggleQuickMenuButton"]')
           .first()
@@ -151,8 +151,22 @@ describe('SIEM Super Date Picker', () => {
           .first()
           .simulate('click');
         wrapper.update();
-        expect(store.getState().inputs.global.timerange.fromStr).toBe('now/d');
-        expect(store.getState().inputs.global.timerange.toStr).toBe('now/d');
+        expect(store.getState().inputs.global.timerange.kind).toBe('absolute');
+      });
+
+      test('Make Sure it is This Week date is an absolute date', () => {
+        wrapper
+          .find('[data-test-subj="superDatePickerToggleQuickMenuButton"]')
+          .first()
+          .simulate('click');
+        wrapper.update();
+
+        wrapper
+          .find('[data-test-subj="superDatePickerCommonlyUsed_This_week"]')
+          .first()
+          .simulate('click');
+        wrapper.update();
+        expect(store.getState().inputs.global.timerange.kind).toBe('absolute');
       });
 
       test('Make Sure to (end date) is superior than from (start date)', () => {

x-pack/plugins/security_solution/public/common/components/super_date_picker/index.tsx

@@ -91,12 +91,13 @@ export const SuperDatePickerComponent = React.memo<SuperDatePickerProps>(
     toStr,
     updateReduxTime,
   }) => {
-    const [isQuickSelection, setIsQuickSelection] = useState(true);
+    // const [isQuickSelection, setIsQuickSelection] = useState(true);
     const [recentlyUsedRanges, setRecentlyUsedRanges] = useState<EuiSuperDatePickerRecentRange[]>(
       []
     );
     const onRefresh = useCallback(
       ({ start: newStart, end: newEnd }: OnRefreshProps): void => {
+        const isQuickSelection = newStart.includes('now') || newEnd.includes('now');
         const { kqlHaveBeenUpdated } = updateReduxTime({
           end: newEnd,
           id,
@@ -117,12 +118,12 @@ export const SuperDatePickerComponent = React.memo<SuperDatePickerProps>(
           refetchQuery(queries);
         }
       },
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      [end, id, isQuickSelection, kqlQuery, start, timelineId]
+      [end, id, kqlQuery, queries, start, timelineId, updateReduxTime]
     );
 
     const onRefreshChange = useCallback(
       ({ isPaused, refreshInterval }: OnRefreshChangeProps): void => {
+        const isQuickSelection = fromStr?.includes('now') || toStr?.includes('now');
         if (duration !== refreshInterval) {
           setDuration({ id, duration: refreshInterval });
         }
@@ -138,26 +139,22 @@ export const SuperDatePickerComponent = React.memo<SuperDatePickerProps>(
         }
       },
       // eslint-disable-next-line react-hooks/exhaustive-deps
-      [id, isQuickSelection, duration, policy, toStr]
+      [id, fromStr, duration, policy, toStr]
     );
 
-    const refetchQuery = (newQueries: inputsModel.GlobalGraphqlQuery[]) => {
+    const refetchQuery = (newQueries: inputsModel.GlobalQuery[]) => {
       newQueries.forEach((q) => q.refetch && (q.refetch as inputsModel.Refetch)());
     };
 
     const onTimeChange = useCallback(
-      ({
-        start: newStart,
-        end: newEnd,
-        isQuickSelection: newIsQuickSelection,
-        isInvalid,
-      }: OnTimeChangeProps) => {
+      ({ start: newStart, end: newEnd, isInvalid }: OnTimeChangeProps) => {
+        const isQuickSelection = newStart.includes('now') || newEnd.includes('now');
         if (!isInvalid) {
           updateReduxTime({
             end: newEnd,
             id,
             isInvalid,
-            isQuickSelection: newIsQuickSelection,
+            isQuickSelection,
             kql: kqlQuery,
             start: newStart,
             timelineId,
@@ -174,15 +171,14 @@ export const SuperDatePickerComponent = React.memo<SuperDatePickerProps>(
           ];
 
           setRecentlyUsedRanges(newRecentlyUsedRanges);
-          setIsQuickSelection(newIsQuickSelection);
         }
       },
       // eslint-disable-next-line react-hooks/exhaustive-deps
       [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)
@@ -232,15 +228,27 @@ export const dispatchUpdateReduxTime = (dispatch: Dispatch) => ({
   const fromDate = formatDate(start);
   let toDate = formatDate(end, { roundUp: true });
   if (isQuickSelection) {
-    dispatch(
-      inputsActions.setRelativeRangeDatePicker({
-        id,
-        fromStr: start,
-        toStr: end,
-        from: fromDate,
-        to: toDate,
-      })
-    );
+    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(
@@ -284,6 +292,7 @@ export const makeMapStateToProps = () => {
   const getToStrSelector = toStrSelector();
   return (state: State, { id }: OwnProps) => {
     const inputsRange: InputsRange = getOr({}, `inputs.${id}`, state);
+
     return {
       duration: getDurationSelector(inputsRange),
       end: getEndSelector(inputsRange),
@@ -292,7 +301,7 @@ export const makeMapStateToProps = () => {
       kind: getKindSelector(inputsRange),
       kqlQuery: getKqlQuerySelector(inputsRange) as inputsModel.GlobalKqlQuery,
       policy: getPolicySelector(inputsRange),
-      queries: getQueriesSelector(inputsRange) as inputsModel.GlobalGraphqlQuery[],
+      queries: getQueriesSelector(state, id),
       start: getStartSelector(inputsRange),
       toStr: getToStrSelector(inputsRange),
     };

x-pack/plugins/security_solution/public/common/components/super_date_picker/selectors.test.ts

@@ -17,6 +17,8 @@ import {
 } from './selectors';
 import { InputsRange, AbsoluteTimeRange, RelativeTimeRange } from '../../store/inputs/model';
 import { cloneDeep } from 'lodash/fp';
+import { mockGlobalState } from '../../mock';
+import { State } from '../../store';
 
 describe('selectors', () => {
   let absoluteTime: AbsoluteTimeRange = {
@@ -42,6 +44,8 @@ describe('selectors', () => {
     filters: [],
   };
 
+  let mockState: State = mockGlobalState;
+
   const getPolicySelector = policySelector();
   const getDurationSelector = durationSelector();
   const getKindSelector = kindSelector();
@@ -75,6 +79,8 @@ describe('selectors', () => {
       },
       filters: [],
     };
+
+    mockState = mockGlobalState;
   });
 
   describe('#policySelector', () => {
@@ -375,34 +381,61 @@ describe('selectors', () => {
 
   describe('#queriesSelector', () => {
     test('returns the same reference given the same identical input twice', () => {
-      const result1 = getQueriesSelector(inputState);
-      const result2 = getQueriesSelector(inputState);
+      const myMock = {
+        ...mockState,
+        inputs: {
+          ...mockState.inputs,
+          global: inputState,
+        },
+      };
+      const result1 = getQueriesSelector(myMock, 'global');
+      const result2 = getQueriesSelector(myMock, 'global');
       expect(result1).toBe(result2);
     });
 
     test('DOES NOT return the same reference given different input twice but with different deep copies since the query is not a primitive', () => {
-      const clone = cloneDeep(inputState);
-      const result1 = getQueriesSelector(inputState);
-      const result2 = getQueriesSelector(clone);
+      const myMock = {
+        ...mockState,
+        inputs: {
+          ...mockState.inputs,
+          global: inputState,
+        },
+      };
+      const clone = cloneDeep(myMock);
+      const result1 = getQueriesSelector(myMock, 'global');
+      const result2 = getQueriesSelector(clone, 'global');
       expect(result1).not.toBe(result2);
     });
 
     test('returns a different reference even if the contents are the same since query is an array and not a primitive', () => {
-      const result1 = getQueriesSelector(inputState);
-      const change: InputsRange = {
-        ...inputState,
-        queries: [
-          {
-            loading: false,
-            id: '1',
-            inspect: { dsl: [], response: [] },
-            isInspected: false,
-            refetch: null,
-            selectedInspectIndex: 0,
+      const myMock = {
+        ...mockState,
+        inputs: {
+          ...mockState.inputs,
+          global: inputState,
+        },
+      };
+      const result1 = getQueriesSelector(myMock, 'global');
+      const myMockChange: State = {
+        ...myMock,
+        inputs: {
+          ...mockState.inputs,
+          global: {
+            ...mockState.inputs.global,
+            queries: [
+              {
+                loading: false,
+                id: '1',
+                inspect: { dsl: [], response: [] },
+                isInspected: false,
+                refetch: null,
+                selectedInspectIndex: 0,
+              },
+            ],
           },
-        ],
+        },
       };
-      const result2 = getQueriesSelector(change);
+      const result2 = getQueriesSelector(myMockChange, 'global');
       expect(result1).not.toBe(result2);
     });
   });

x-pack/plugins/security_solution/public/common/components/super_date_picker/selectors.ts

@@ -4,7 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { isEmpty } from 'lodash';
 import { createSelector } from 'reselect';
+import { State } from '../../store';
+import { InputsModelId } from '../../store/inputs/constants';
 import { Policy, InputsRange, TimeRange, GlobalQuery } from '../../store/inputs/model';
 
 export const getPolicy = (inputState: InputsRange): Policy => inputState.policy;
@@ -13,6 +16,16 @@ export const getTimerange = (inputState: InputsRange): TimeRange => inputState.t
 
 export const getQueries = (inputState: InputsRange): GlobalQuery[] => inputState.queries;
 
+export const getGlobalQueries = (state: State, id: InputsModelId): GlobalQuery[] => {
+  const inputsRange = state.inputs[id];
+  return !isEmpty(inputsRange.linkTo)
+    ? inputsRange.linkTo.reduce<GlobalQuery[]>((acc, linkToId) => {
+        const linkToIdInputsRange: InputsRange = state.inputs[linkToId];
+        return [...acc, ...linkToIdInputsRange.queries];
+      }, inputsRange.queries)
+    : inputsRange.queries;
+};
+
 export const policySelector = () => createSelector(getPolicy, (policy) => policy.kind);
 
 export const durationSelector = () => createSelector(getPolicy, (policy) => policy.duration);
@@ -31,7 +44,7 @@ export const isLoadingSelector = () =>
   createSelector(getQueries, (queries) => queries.some((i) => i.loading === true));
 
 export const queriesSelector = () =>
-  createSelector(getQueries, (queries) => queries.filter((q) => q.id !== 'kql'));
+  createSelector(getGlobalQueries, (queries) => queries.filter((q) => q.id !== 'kql'));
 
 export const kqlQuerySelector = () =>
   createSelector(getQueries, (queries) => queries.find((q) => q.id === 'kql'));

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<{

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;
 }