Fix API

elastic · Jul 17, 2020 · 4605896 · 4605896
1 parent 1d03ac7
commit 4605896
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
@@ -167,8 +167,3 @@ export const showAllOthersBucket: string[] = [
   'destination.ip',
   'user.name',
 ];
-
-/*
- * This should be set to true after https://github.com/elastic/kibana/pull/67496 is merged
- */
-export const enableElasticFilter = false;
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
@@ -217,8 +217,8 @@ export const getTimelineTitle = (
   duplicate: boolean,
   timelineType?: TimelineType
 ) => {
-  const isCreateFromAction = timeline.timelineType !== timelineType;
-  if (isCreateFromAction) return '';
+  const isCreateTimelineFromAction = timelineType && timeline.timelineType !== timelineType;
+  if (isCreateTimelineFromAction) return '';
 
   return duplicate ? `${timeline.title} - Duplicate` : timeline.title || '';
 };
@@ -228,7 +228,7 @@ export const getTimelineStatus = (
   duplicate: boolean,
   timelineType?: TimelineType
 ) => {
-  const isCreateTimelineFromAction = timeline.timelineType !== timelineType;
+  const isCreateTimelineFromAction = timelineType && timeline.timelineType !== timelineType;
   if (isCreateTimelineFromAction) return TimelineStatus.draft;
 
   return duplicate ? TimelineStatus.active : timeline.status;

diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object.ts
@@ -7,7 +7,7 @@
 import { getOr } from 'lodash/fp';
 
 import { SavedObjectsFindOptions } from '../../../../../../src/core/server';
-import { UNAUTHENTICATED_USER, enableElasticFilter } from '../../../common/constants';
+import { UNAUTHENTICATED_USER } from '../../../common/constants';
 import { NoteSavedObject } from '../../../common/types/timeline/note';
 import { PinnedEventSavedObject } from '../../../common/types/timeline/pinned_event';
 import {
@@ -125,7 +125,9 @@ const getTimelineTypeFilter = (
   status: TimelineStatusLiteralWithNull
 ) => {
   const typeFilter =
-    timelineType === TimelineType.template
+    timelineType == null
+      ? null
+      : timelineType === TimelineType.template
       ? `siem-ui-timeline.attributes.timelineType: ${TimelineType.template}` /** Show only whose timelineType exists and equals to "template" */
       : /** Show me every timeline whose timelineType is not "template".
          * which includes timelineType === 'default' and
@@ -151,12 +153,10 @@ const getTimelineTypeFilter = (
     templateTimelineType == null
       ? null
       : templateTimelineType === TemplateTimelineType.elastic
-      ? `siem-ui-timeline.attributes.createdBy: "Elsatic"`
+      ? `siem-ui-timeline.attributes.createdBy: "Elastic"`
       : `not siem-ui-timeline.attributes.createdBy: "Elastic"`;
 
-  const filters = enableElasticFilter
-    ? [typeFilter, draftFilter, immutableFilter, templateTimelineTypeFilter]
-    : [typeFilter, draftFilter, immutableFilter];
+  const filters = [typeFilter, draftFilter, immutableFilter, templateTimelineTypeFilter];
   return filters.filter((f) => f != null).join(' and ');
 };