fix stringify circular ref crash and default columns on createTimeline

elastic · Aug 31, 2021 · b4eef3e · b4eef3e
1 parent 0346951
commit b4eef3e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/x-pack/plugins/security_solution/common/types/timeline/store.ts b/x-pack/plugins/security_solution/common/types/timeline/store.ts
@@ -48,6 +48,7 @@ export interface TimelinePersistInput {
   expandedDetail?: TimelineExpandedDetail;
   filters?: Filter[];
   columns: ColumnHeaderOptions[];
+  defaultColumns?: ColumnHeaderOptions[];
   itemsPerPage?: number;
   indexNames: string[];
   kqlQuery?: {

diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
@@ -78,6 +78,7 @@ type Props = OwnProps & PropsFromRedux;
 const StatefulEventsViewerComponent: React.FC<Props> = ({
   createTimeline,
   columns,
+  defaultColumns,
   dataProviders,
   defaultCellActions,
   deletedEventIds,
@@ -127,6 +128,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
       createTimeline({
         id,
         columns,
+        defaultColumns,
         excludedRowRendererIds,
         indexNames: selectedPatterns,
         sort,
@@ -241,6 +243,7 @@ const makeMapStateToProps = () => {
     const timeline: TimelineModel = getTimeline(state, id) ?? defaultModel;
     const {
       columns,
+      defaultColumns,
       dataProviders,
       deletedEventIds,
       excludedRowRendererIds,
@@ -254,6 +257,7 @@ const makeMapStateToProps = () => {
 
     return {
       columns,
+      defaultColumns,
       dataProviders,
       deletedEventIds,
       excludedRowRendererIds,

diff --git a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.tsx
@@ -85,13 +85,20 @@ export const addTimelineInStorage = (
   id: TimelineIdLiteral,
   timeline: TimelineModel
 ) => {
+  const timelineToStore = cleanStorageTimeline(timeline);
   const timelines = getAllTimelinesInStorage(storage);
   storage.set(LOCAL_STORAGE_TIMELINE_KEY, {
     ...timelines,
-    [id]: timeline,
+    [id]: timelineToStore,
   });
 };
 
+const cleanStorageTimeline = (timeline: TimelineModel) => {
+  // clean filterManager as it contains circular references within observer subscriptions
+  const { filterManager, ...timelineToStore } = timeline;
+  return timelineToStore;
+};
+
 export const useTimelinesStorage = (): TimelinesStorage => {
   const { storage } = useKibana().services;
 

diff --git a/x-pack/plugins/timelines/public/store/t_grid/model.ts b/x-pack/plugins/timelines/public/store/t_grid/model.ts
@@ -95,6 +95,7 @@ export type TGridModelForTimeline = Pick<
   | 'excludedRowRendererIds'
   | 'expandedDetail'
   | 'filters'
+  | 'filterManager'
   | 'graphEventId'
   | 'kqlQuery'
   | 'id'