Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SIEM] Add SavedQuery in Timeline - cleanup #50884

Merged
merged 1 commit into from
Nov 18, 2019
Merged

[SIEM] Add SavedQuery in Timeline - cleanup #50884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions x-pack/legacy/plugins/siem/public/components/timeline/helpers.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down
21 changes: 8 additions & 13 deletions x-pack/legacy/plugins/siem/public/components/timeline/query_bar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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)
);
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -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 {
Expand All @@ -304,7 +299,7 @@ export const getDataProviderFilter = (dataProviderDsl: string): Filter => {
value: dataProviderDsl,
},
$state: {
store: FilterStateStore.APP_STATE,
store: esFilters.FilterStateStore.APP_STATE,
},
};
};
5 changes: 2 additions & 3 deletions x-pack/legacy/plugins/siem/public/store/timeline/epic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ', () => {
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down