fix cypress tests

elastic · Jun 22, 2021 · aa34392 · aa34392
1 parent a4ddf6f
commit aa34392
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
@@ -176,9 +176,7 @@ const EventsViewerComponent: React.FC<Props> = ({
 
   const getManageTimeline = useMemo(() => timelineSelectors.getManageTimelineById(), []);
   const unit = useMemo(() => (n: number) => i18n.UNIT(n), []);
-  const { queryFields, title = i18n.EVENTS } = useDeepEqualSelector((state) =>
-    getManageTimeline(state, id)
-  );
+  const { queryFields, title } = useDeepEqualSelector((state) => getManageTimeline(state, id));
 
   const justTitle = useMemo(() => <TitleText data-test-subj="title">{title}</TitleText>, [title]);
 

diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/helpers.ts
@@ -196,8 +196,8 @@ export const addNewTimeline = ({
     ...timelineById,
     [id]: {
       id,
-      ...timelineDefaults,
       ...(timeline ? timeline : {}),
+      ...timelineDefaults,
       ...timelineProps,
       dateRange,
       savedObjectId: null,

diff --git a/x-pack/plugins/timelines/public/store/t_grid/defaults.ts b/x-pack/plugins/timelines/public/store/t_grid/defaults.ts
@@ -98,6 +98,6 @@ export const getTGridManageDefaults = (id: string) => ({
   id,
   isLoading: false,
   queryFields: [],
-  title: i18n.EVENTS,
+  title: '',
   unit: (n: number) => i18n.UNIT(n),
 });
diff --git a/x-pack/plugins/timelines/public/store/t_grid/helpers.ts b/x-pack/plugins/timelines/public/store/t_grid/helpers.ts
@@ -160,6 +160,7 @@ export const setInitializeTgridSettings = ({
   return {
     ...timelineById,
     [id]: {
+      ...tGridDefaults,
       ...timeline,
       ...getTGridManageDefaults(id),
       ...tGridSettingsProps,