[SECURITY] Bug do not allow saving when opening a timeline (#74139) (#…

…74232) * only saved timeline when you are duplicating them * fix unit test
elastic · Aug 4, 2020 · a1b852e · a1b852e
1 parent 485f438
commit a1b852e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
@@ -967,6 +967,7 @@ describe('helpers', () => {
 
       expect(dispatchAddTimeline).toHaveBeenCalledWith({
         id: 'timeline-1',
+        savedTimeline: true,
         timeline: mockTimelineModel,
       });
     });

diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
@@ -374,7 +374,7 @@ export const dispatchUpdateTimeline = (dispatch: Dispatch): DispatchUpdateTimeli
   ruleNote,
 }: UpdateTimeline): (() => void) => () => {
   dispatch(dispatchSetTimelineRangeDatePicker({ from, to }));
-  dispatch(dispatchAddTimeline({ id, timeline }));
+  dispatch(dispatchAddTimeline({ id, timeline, savedTimeline: duplicate }));
   if (
     timeline.kqlQuery != null &&
     timeline.kqlQuery.filterQuery != null &&

diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/actions.ts
@@ -104,6 +104,7 @@ export const updateTimeline = actionCreator<{
 export const addTimeline = actionCreator<{
   id: string;
   timeline: TimelineModel;
+  savedTimeline?: boolean;
 }>('ADD_TIMELINE');
 
 export const setInsertTimeline = actionCreator<InsertTimeline | null>('SET_INSERT_TIMELINE');

diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic.ts
@@ -6,6 +6,7 @@
 
 import {
   get,
+  getOr,
   has,
   merge as mergeObject,
   set,
@@ -172,7 +173,7 @@ export const createTimelineEpic = <State>(): Epic<
           myEpicTimelineId.setTimelineVersion(addNewTimeline.version);
           myEpicTimelineId.setTemplateTimelineId(addNewTimeline.templateTimelineId);
           myEpicTimelineId.setTemplateTimelineVersion(addNewTimeline.templateTimelineVersion);
-          return true;
+          return getOr(false, 'payload.savedTimeline', action);
         } else if (
           timelineActionsType.includes(action.type) &&
           !timelineObj.isLoading &&