adding fields to the storage cleaning

Author: semd

x-pack/plugins/security_solution/public/common/mock/global_state.ts

@@ -242,6 +242,9 @@ export const mockGlobalState: State = {
         activeTab: TimelineTabs.query,
         prevActiveTab: TimelineTabs.notes,
         deletedEventIds: [],
+        documentType: '',
+        queryFields: [],
+        selectAll: false,
         id: 'test',
         savedObjectId: null,
         columns: defaultHeaders,

x-pack/plugins/security_solution/public/common/mock/timeline_results.ts

@@ -1979,6 +1979,7 @@ export const mockTimelineModel: TimelineModel = {
   },
   deletedEventIds: [],
   description: 'This is a sample rule description',
+  documentType: '',
   eqlOptions: {
     eventCategoryField: 'event.category',
     tiebreakerField: 'event.sequence',
@@ -2017,13 +2018,15 @@ export const mockTimelineModel: TimelineModel = {
   kqlQuery: {
     filterQuery: null,
   },
+  queryFields: [],
   itemsPerPage: 25,
   itemsPerPageOptions: [10, 25, 50, 100],
   loadingEventIds: [],
   noteIds: [],
   pinnedEventIds: {},
   pinnedEventsSaveObject: {},
   savedObjectId: 'ef579e40-jibber-jabber',
+  selectAll: false,
   selectedEventIds: {},
   show: false,
   showCheckboxes: false,
@@ -2110,6 +2113,7 @@ export const defaultTimelineProps: CreateTimelineProps = {
     dateRange: { end: '2018-11-05T19:03:25.937Z', start: '2018-11-05T18:58:25.937Z' },
     deletedEventIds: [],
     description: '',
+    documentType: '',
     eqlOptions: {
       eventCategoryField: 'event.category',
       query: '',
@@ -2141,7 +2145,9 @@ export const defaultTimelineProps: CreateTimelineProps = {
     noteIds: [],
     pinnedEventIds: {},
     pinnedEventsSaveObject: {},
+    queryFields: [],
     savedObjectId: null,
+    selectAll: false,
     selectedEventIds: {},
     show: false,
     showCheckboxes: false,

x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx

@@ -94,8 +94,17 @@ export const addTimelineInStorage = (
 };
 
 const cleanStorageTimeline = (timeline: TimelineModel) => {
-  // clean filterManager as it contains circular references within observer subscriptions
-  const { filterManager, ...timelineToStore } = timeline;
+  // discard unneeded fields to make sure the object serialization works
+  const {
+    documentType,
+    filterManager,
+    isLoading,
+    loadingText,
+    queryFields,
+    selectAll,
+    unit,
+    ...timelineToStore
+  } = timeline;
   return timelineToStore;
 };
 

x-pack/plugins/security_solution/public/timelines/store/timeline/defaults.ts

@@ -19,6 +19,7 @@ export const timelineDefaults: SubsetTimelineModel &
   activeTab: TimelineTabs.query,
   prevActiveTab: TimelineTabs.query,
   columns: defaultHeaders,
+  documentType: '',
   defaultColumns: defaultHeaders,
   dataProviders: [],
   dateRange: { start, end },
@@ -51,6 +52,7 @@ export const timelineDefaults: SubsetTimelineModel &
     filterQuery: null,
   },
   loadingEventIds: [],
+  queryFields: [],
   title: '',
   timelineType: TimelineType.default,
   templateTimelineId: null,
@@ -59,6 +61,7 @@ export const timelineDefaults: SubsetTimelineModel &
   pinnedEventIds: {},
   pinnedEventsSaveObject: {},
   savedObjectId: null,
+  selectAll: false,
   selectedEventIds: {},
   show: false,
   showCheckboxes: false,

x-pack/plugins/security_solution/public/timelines/store/timeline/epic.test.ts

@@ -92,6 +92,7 @@ describe('Epic Timeline', () => {
         ],
         deletedEventIds: [],
         description: '',
+        documentType: '',
         eqlOptions: {
           eventCategoryField: 'event.category',
           tiebreakerField: '',
@@ -146,6 +147,8 @@ describe('Epic Timeline', () => {
           },
         },
         loadingEventIds: [],
+        queryFields: [],
+        selectAll: false,
         title: 'saved',
         timelineType: TimelineType.default,
         templateTimelineId: null,

x-pack/plugins/security_solution/public/timelines/store/timeline/model.ts

@@ -85,10 +85,12 @@ export type SubsetTimelineModel = Readonly<
     | 'dataProviders'
     | 'deletedEventIds'
     | 'description'
+    | 'documentType'
     | 'eventType'
     | 'eventIdToNoteIds'
     | 'excludedRowRendererIds'
     | 'expandedDetail'
+    | 'footerText'
     | 'graphEventId'
     | 'highlightedDropAndProviderId'
     | 'historyIds'
@@ -100,22 +102,26 @@ export type SubsetTimelineModel = Readonly<
     | 'itemsPerPageOptions'
     | 'kqlMode'
     | 'kqlQuery'
+    | 'queryFields'
     | 'title'
     | 'timelineType'
     | 'templateTimelineId'
     | 'templateTimelineVersion'
     | 'loadingEventIds'
+    | 'loadingText'
     | 'noteIds'
     | 'pinnedEventIds'
     | 'pinnedEventsSaveObject'
     | 'dateRange'
+    | 'selectAll'
     | 'selectedEventIds'
     | 'show'
     | 'showCheckboxes'
     | 'sort'
     | 'isSaving'
     | 'isLoading'
     | 'savedObjectId'
+    | 'unit'
     | 'version'
     | 'status'
   >

x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts

@@ -88,6 +88,7 @@ const basicTimeline: TimelineModel = {
   },
   deletedEventIds: [],
   description: '',
+  documentType: '',
   eqlOptions: {
     eventCategoryField: 'event.category',
     tiebreakerField: '',
@@ -113,7 +114,9 @@ const basicTimeline: TimelineModel = {
   noteIds: [],
   pinnedEventIds: {},
   pinnedEventsSaveObject: {},
+  queryFields: [],
   savedObjectId: null,
+  selectAll: false,
   selectedEventIds: {},
   show: true,
   showCheckboxes: false,

x-pack/plugins/timelines/public/store/t_grid/model.ts

@@ -92,24 +92,30 @@ export type TGridModelForTimeline = Pick<
   | 'dataProviders'
   | 'dateRange'
   | 'deletedEventIds'
+  | 'documentType'
   | 'excludedRowRendererIds'
   | 'expandedDetail'
   | 'filters'
   | 'filterManager'
+  | 'footerText'
   | 'graphEventId'
   | 'kqlQuery'
+  | 'queryFields'
   | 'id'
   | 'indexNames'
   | 'isLoading'
   | 'isSelectAllChecked'
   | 'itemsPerPage'
   | 'itemsPerPageOptions'
   | 'loadingEventIds'
+  | 'loadingText'
+  | 'selectAll'
   | 'showCheckboxes'
   | 'sort'
   | 'selectedEventIds'
   | 'savedObjectId'
   | 'title'
+  | 'unit'
   | 'version'
 >;