[SIEM] Add SavedQuery in Timeline - cleanup (#50884) (#51004)

elastic · Nov 19, 2019 · 43e905e · 43e905e
1 parent e5eddc8
commit 43e905e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 20 deletions.
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/helpers.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/helpers.test.tsx
@@ -5,8 +5,6 @@
  */
 
 import { cloneDeep } from 'lodash/fp';
-
-import { FilterStateStore } from '../../../../../../../src/plugins/data/common/es_query/filters';
 import { mockIndexPattern } from '../../mock';
 
 import { mockDataProviders } from './data_providers/mock/mock_data_providers';
@@ -171,7 +169,7 @@ describe('Combined Queries', () => {
         browserFields: mockBrowserFields,
         filters: [
           {
-            $state: { store: FilterStateStore.APP_STATE },
+            $state: { store: esFilters.FilterStateStore.APP_STATE },
             meta: {
               alias: null,
               disabled: false,
@@ -183,7 +181,7 @@ describe('Combined Queries', () => {
             query: { match_phrase: { 'event.category': 'file' } },
           },
           {
-            $state: { store: FilterStateStore.APP_STATE },
+            $state: { store: esFilters.FilterStateStore.APP_STATE },
             meta: {
               alias: null,
               disabled: false,

diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx
@@ -7,16 +7,11 @@
 import { isEqual, isEmpty } from 'lodash/fp';
 import React, { memo, useCallback, useState, useEffect } from 'react';
 import { StaticIndexPattern } from 'ui/index_patterns';
-import { Query } from 'src/plugins/data/common/types';
 import { Subscription } from 'rxjs';
 
 import { SavedQueryTimeFilter } from '../../../../../../../../src/legacy/core_plugins/data/public/search';
 import { SavedQuery } from '../../../../../../../../src/legacy/core_plugins/data/public';
-import { FilterManager } from '../../../../../../../../src/plugins/data/public';
-import {
-  Filter,
-  FilterStateStore,
-} from '../../../../../../../../src/plugins/data/common/es_query/filters';
+import { Query, esFilters, FilterManager } from '../../../../../../../../src/plugins/data/public';
 
 import { BrowserFields } from '../../../containers/source';
 import { convertKueryToElasticSearchQuery } from '../../../lib/keury';
@@ -33,7 +28,7 @@ export interface QueryBarTimelineComponentProps {
   applyKqlFilterQuery: (expression: string, kind: KueryFilterQueryKind) => void;
   browserFields: BrowserFields;
   dataProviders: DataProvider[];
-  filters: Filter[];
+  filters: esFilters.Filter[];
   filterQuery: KueryFilterQuery;
   filterQueryDraft: KueryFilterQuery;
   from: number;
@@ -43,7 +38,7 @@ export interface QueryBarTimelineComponentProps {
   isRefreshPaused: boolean;
   refreshInterval: number;
   savedQueryId: string | null;
-  setFilters: (filters: Filter[]) => void;
+  setFilters: (filters: esFilters.Filter[]) => void;
   setKqlFilterQueryDraft: (expression: string, kind: KueryFilterQueryKind) => void;
   setSavedQueryId: (savedQueryId: string | null) => void;
   timelineId: string;
@@ -89,7 +84,7 @@ export const QueryBarTimeline = memo<QueryBarTimelineComponentProps>(
       query: filterQuery != null ? filterQuery.expression : '',
       language: filterQuery != null ? filterQuery.kind : 'kuery',
     });
-    const [queryBarFilters, setQueryBarFilters] = useState<Filter[]>([]);
+    const [queryBarFilters, setQueryBarFilters] = useState<esFilters.Filter[]>([]);
     const [dataProvidersDsl, setDataProvidersDsl] = useState<string>(
       convertKueryToElasticSearchQuery(buildGlobalQuery(dataProviders, browserFields), indexPattern)
     );
@@ -109,7 +104,7 @@ export const QueryBarTimeline = memo<QueryBarTimelineComponentProps>(
             if (isSubscribed) {
               const filterWithoutDropArea = filterManager
                 .getFilters()
-                .filter((f: Filter) => f.meta.controlledBy !== timelineFilterDropArea);
+                .filter((f: esFilters.Filter) => f.meta.controlledBy !== timelineFilterDropArea);
               setFilters(filterWithoutDropArea);
               setQueryBarFilters(filterWithoutDropArea);
             }
@@ -126,7 +121,7 @@ export const QueryBarTimeline = memo<QueryBarTimelineComponentProps>(
     useEffect(() => {
       const filterWithoutDropArea = filterManager
         .getFilters()
-        .filter((f: Filter) => f.meta.controlledBy !== timelineFilterDropArea);
+        .filter((f: esFilters.Filter) => f.meta.controlledBy !== timelineFilterDropArea);
       if (!isEqual(filters, filterWithoutDropArea)) {
         filterManager.setFilters(filters);
       }
@@ -289,7 +284,7 @@ export const QueryBarTimeline = memo<QueryBarTimelineComponentProps>(
   }
 );
 
-export const getDataProviderFilter = (dataProviderDsl: string): Filter => {
+export const getDataProviderFilter = (dataProviderDsl: string): esFilters.Filter => {
   const dslObject = JSON.parse(dataProviderDsl);
   const key = Object.keys(dslObject);
   return {
@@ -304,7 +299,7 @@ export const getDataProviderFilter = (dataProviderDsl: string): Filter => {
       value: dataProviderDsl,
     },
     $state: {
-      store: FilterStateStore.APP_STATE,
+      store: esFilters.FilterStateStore.APP_STATE,
     },
   };
 };
diff --git a/x-pack/legacy/plugins/siem/public/store/timeline/epic.test.ts b/x-pack/legacy/plugins/siem/public/store/timeline/epic.test.ts
@@ -9,7 +9,6 @@ import { Direction } from '../../graphql/types';
 import { convertTimelineAsInput } from './epic';
 
 import { esFilters } from '../../../../../../../src/plugins/data/public';
-import { FilterStateStore } from '../../../../../../../src/plugins/data/common/es_query/filters';
 
 describe('Epic Timeline', () => {
   describe('#convertTimelineAsInput ', () => {
@@ -92,7 +91,7 @@ describe('Epic Timeline', () => {
         historyIds: [],
         filters: [
           {
-            $state: { store: FilterStateStore.APP_STATE },
+            $state: { store: esFilters.FilterStateStore.APP_STATE },
             meta: {
               alias: null,
               disabled: false,
@@ -104,7 +103,7 @@ describe('Epic Timeline', () => {
             query: { match_phrase: { 'event.category': 'file' } },
           },
           {
-            $state: { store: FilterStateStore.APP_STATE },
+            $state: { store: esFilters.FilterStateStore.APP_STATE },
             meta: {
               alias: null,
               disabled: false,