Skip to content

Commit 601b920

Browse files
patrykkopycinskipatrykkopycinski
committed
fix merge
1 parent 91aa552 commit 601b920

File tree

11 files changed

+71
-56
lines changed

11 files changed

+71
-56
lines changed

‎x-pack/plugins/siem/public/common/components/top_n/index.test.tsx‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,19 @@ import { mount, ReactWrapper } from 'enzyme';
88
import React from 'react';
99

1010
import { mockBrowserFields } from '../../containers/source/mock';
11-
import { apolloClientObservable, mockGlobalState, TestProviders } from '../../mock';
11+
import {
12+
apolloClientObservable,
13+
mockGlobalState,
14+
TestProviders,
15+
SUB_PLUGINS_REDUCER,
16+
} from '../../mock';
1217
import { createKibanaCoreStartMock } from '../../mock/kibana_core';
13-
import { FilterManager } from '../../../../../../src/plugins/data/public';
18+
import { FilterManager } from '../../../../../../../src/plugins/data/public';
1419
import { createStore, State } from '../../store';
15-
import { TimelineContext, TimelineTypeContext } from '../timeline/timeline_context';
20+
import {
21+
TimelineContext,
22+
TimelineTypeContext,
23+
} from '../../../timelines/components/timeline/timeline_context';
1624

1725
import { Props } from './top_n';
1826
import { ACTIVE_TIMELINE_REDUX_ID, StatefulTopN } from '.';
@@ -133,7 +141,7 @@ const state: State = {
133141
},
134142
},
135143
};
136-
const store = createStore(state, apolloClientObservable);
144+
const store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable);
137145

138146
describe('StatefulTopN', () => {
139147
// Suppress warnings about "react-beautiful-dnd"

‎x-pack/plugins/siem/public/common/mock/timeline_results.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
* or more contributor license agreements. Licensed under the Elastic License;
44
* you may not use this file except in compliance with the Elastic License.
55
*/
6-
import { FilterStateStore } from '../../../../../src/plugins/data/common/es_query/filters/meta_filter';
6+
import { FilterStateStore } from '../../../../../../src/plugins/data/common/es_query/filters/meta_filter';
77

8-
import { TimelineType } from '../../common/types/timeline';
8+
import { TimelineType } from '../../../common/types/timeline';
99

10-
import { OpenTimelineResult } from '../components/open_timeline/types';
11-
import { GetAllTimeline, SortFieldTimeline, TimelineResult, Direction } from '../graphql/types';
12-
import { allTimelinesQuery } from '../containers/timeline/all/index.gql_query';
13-
import { CreateTimelineProps } from '../pages/detection_engine/components/signals/types';
14-
import { TimelineModel } from '../store/timeline/model';
15-
import { timelineDefaults } from '../store/timeline/defaults';
10+
import { OpenTimelineResult } from '../../timelines/components/open_timeline/types';
11+
import { GetAllTimeline, SortFieldTimeline, TimelineResult, Direction } from '../../graphql/types';
12+
import { allTimelinesQuery } from '../../timelines/containers/all/index.gql_query';
13+
import { CreateTimelineProps } from '../../alerts/components/signals/types';
14+
import { TimelineModel } from '../../timelines/store/timeline/model';
15+
import { timelineDefaults } from '../../timelines/store/timeline/defaults';
1616
export interface MockedProvidedQuery {
1717
request: {
1818
query: GetAllTimeline.Query;

‎x-pack/plugins/siem/public/timelines/components/open_timeline/helpers.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import {
1010
mockTimelineResults,
1111
mockTimelineResult,
1212
mockTimelineModel,
13-
} from '../../mock/timeline_results';
13+
} from '../../../common/mock/timeline_results';
1414
import { timelineDefaults } from '../../store/timeline/defaults';
15-
import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../store/inputs/actions';
15+
import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../../common/store/inputs/actions';
1616
import {
1717
setKqlFilterQueryDraft as dispatchSetKqlFilterQueryDraft,
1818
applyKqlFilterQuery as dispatchApplyKqlFilterQuery,
@@ -22,7 +22,7 @@ import {
2222
import {
2323
addNotes as dispatchAddNotes,
2424
updateNote as dispatchUpdateNote,
25-
} from '../../store/app/actions';
25+
} from '../../../common/store/app/actions';
2626
import {
2727
defaultTimelineToTimelineModel,
2828
getNotesCount,
@@ -32,11 +32,11 @@ import {
3232
dispatchUpdateTimeline,
3333
} from './helpers';
3434
import { OpenTimelineResult, DispatchUpdateTimeline } from './types';
35-
import { KueryFilterQueryKind } from '../../store/model';
36-
import { Note } from '../../lib/note';
35+
import { KueryFilterQueryKind } from '../../../common/store/model';
36+
import { Note } from '../../../common/lib/note';
3737
import moment from 'moment';
3838
import sinon from 'sinon';
39-
import { TimelineType } from '../../../common/types/timeline';
39+
import { TimelineType } from '../../../../common/types/timeline';
4040

4141
jest.mock('../../store/inputs/actions');
4242
jest.mock('../../store/timeline/actions');

‎x-pack/plugins/siem/public/timelines/components/open_timeline/index.test.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ import { mount } from 'enzyme';
88
import { MockedProvider } from 'react-apollo/test-utils';
99
import React from 'react';
1010

11-
import { wait } from '../../lib/helpers';
12-
import { TestProviders, apolloClient } from '../../mock/test_providers';
13-
import { mockOpenTimelineQueryResults } from '../../mock/timeline_results';
14-
import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../pages/timelines/timelines_page';
11+
import { wait } from '../../../common/lib/helpers';
12+
import { TestProviders, apolloClient } from '../../../common/mock/test_providers';
13+
import { mockOpenTimelineQueryResults } from '../../../common/mock/timeline_results';
14+
import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../pages/timelines_page';
1515

1616
import { NotePreviews } from './note_previews';
1717
import { OPEN_TIMELINE_CLASS_NAME } from './helpers';
1818
import { TimelineTabsStyle } from './types';
1919

2020
import { StatefulOpenTimeline } from '.';
21-
import { useGetAllTimeline, getAllTimeline } from '../../containers/timeline/all';
22-
jest.mock('../../lib/kibana');
23-
jest.mock('../../containers/timeline/all', () => {
24-
const originalModule = jest.requireActual('../../containers/timeline/all');
21+
import { useGetAllTimeline, getAllTimeline } from '../../containers/all';
22+
jest.mock('../../../common/lib/kibana');
23+
jest.mock('../../containers/all', () => {
24+
const originalModule = jest.requireActual('../../containers/all');
2525
return {
2626
...originalModule,
2727
useGetAllTimeline: jest.fn(),

‎x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ import { OPEN_TIMELINE_CLASS_NAME } from './helpers';
1111
import { OpenTimelineProps, OpenTimelineResult, ActionTimelineToShow } from './types';
1212
import { SearchRow } from './search_row';
1313
import { TimelinesTable } from './timelines_table';
14-
import { ImportDataModal } from '../import_data_modal';
14+
import { ImportDataModal } from '../../../common/components/import_data_modal';
1515
import * as i18n from './translations';
16-
import { importTimelines } from '../../containers/timeline/api';
16+
import { importTimelines } from '../../containers/api';
1717

1818
import {
1919
UtilityBarGroup,
2020
UtilityBarText,
2121
UtilityBar,
2222
UtilityBarSection,
2323
UtilityBarAction,
24-
} from '../utility_bar';
24+
} from '../../../common/components/utility_bar';
2525
import { useEditTimelineBatchActions } from './edit_timeline_batch_actions';
2626
import { useEditTimelineActions } from './edit_timeline_actions';
2727
import { EditOneTimelineAction } from './export_timeline';

‎x-pack/plugins/siem/public/timelines/components/open_timeline/types.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*/
66

77
import { SetStateAction, Dispatch } from 'react';
8-
import { AllTimelinesVariables } from '../../containers/timeline/all';
8+
import { AllTimelinesVariables } from '../../containers/all';
99
import { TimelineModel } from '../../store/timeline/model';
10-
import { NoteResult } from '../../graphql/types';
11-
import { TimelineTypeLiteral } from '../../../common/types/timeline';
10+
import { NoteResult } from '../../../graphql/types';
11+
import { TimelineTypeLiteral } from '../../../../common/types/timeline';
1212

1313
/** The users who added a timeline to favorites */
1414
export interface FavoriteTimelineResult {

‎x-pack/plugins/siem/public/timelines/containers/api.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ import {
2121
TIMELINE_EXPORT_URL,
2222
} from '../../../common/constants';
2323

24-
import { KibanaServices } from '../../lib/kibana';
25-
import { ExportSelectedData } from '../../components/generic_downloader';
24+
import { KibanaServices } from '../../common/lib/kibana';
25+
import { ExportSelectedData } from '../../common/components/generic_downloader';
2626

27-
import { createToasterPlainError } from '../case/utils';
28-
import { ImportDataProps, ImportDataResponse } from '../detection_engine/rules';
27+
import { createToasterPlainError } from '../../cases/containers/utils';
28+
import {
29+
ImportDataProps,
30+
ImportDataResponse,
31+
} from '../../alerts/containers/detection_engine/rules';
2932

3033
interface RequestPostTimeline {
3134
timeline: SavedTimeline;

‎x-pack/plugins/siem/public/timelines/pages/index.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import { Switch, Route, Redirect } from 'react-router-dom';
1111
import { ChromeBreadcrumb } from '../../../../../../src/core/public';
1212

1313
import { TimelineType } from '../../../common/types/timeline';
14-
import { TAB_TIMELINES, TAB_TEMPLATES } from '../../components/open_timeline/translations';
15-
import { getTimelinesUrl } from '../../components/link_to';
16-
import { TimelineRouteSpyState } from '../../utils/route/types';
14+
import { TAB_TIMELINES, TAB_TEMPLATES } from '../components/open_timeline/translations';
15+
import { getTimelinesUrl } from '../../common/components/link_to';
16+
import { TimelineRouteSpyState } from '../../common/utils/route/types';
1717

18-
import { SiemPageName } from '../home/types';
18+
import { SiemPageName } from '../../app/types';
1919

2020
import { TimelinesPage } from './timelines_page';
2121
import { PAGE_TITLE } from './translations';
22-
import { appendSearch } from '../../components/link_to/helpers';
22+
import { appendSearch } from '../../common/components/link_to/helpers';
2323
const timelinesPagePath = `/:pageName(${SiemPageName.timelines})/:tabName(${TimelineType.default}|${TimelineType.template})`;
2424
const timelinesDefaultPath = `/${SiemPageName.timelines}/${TimelineType.default}`;
2525

‎x-pack/plugins/siem/public/timelines/store/timeline/defaults.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* you may not use this file except in compliance with the Elastic License.
55
*/
66

7-
import { TimelineType } from '../../../common/types/timeline';
7+
import { TimelineType } from '../../../../common/types/timeline';
88

9-
import { Direction } from '../../graphql/types';
9+
import { Direction } from '../../../graphql/types';
1010
import { DEFAULT_TIMELINE_WIDTH } from '../../components/timeline/body/constants';
1111
import { defaultHeaders } from '../../components/timeline/body/column_headers/default_headers';
1212
import { SubsetTimelineModel, TimelineModel } from './model';

‎x-pack/plugins/siem/public/timelines/store/timeline/epic.ts‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,17 @@ import {
2828
takeUntil,
2929
} from 'rxjs/operators';
3030

31-
import { esFilters, Filter, MatchAllFilter } from '../../../../../../src/plugins/data/public';
32-
import { TimelineType } from '../../../common/types/timeline';
33-
import { TimelineInput, ResponseTimeline, TimelineResult } from '../../graphql/types';
34-
import { AppApolloClient } from '../../lib/lib';
35-
import { addError } from '../app/actions';
36-
import { NotesById } from '../app/model';
37-
import { inputsModel } from '../inputs';
31+
import {
32+
esFilters,
33+
Filter,
34+
MatchAllFilter,
35+
} from '../../../../../../.../../../src/plugins/data/public';
36+
import { TimelineType } from '../../../../common/types/timeline';
37+
import { TimelineInput, ResponseTimeline, TimelineResult } from '../../../graphql/types';
38+
import { AppApolloClient } from '../../../common/lib/lib';
39+
import { addError } from '../../../common/store/app/actions';
40+
import { NotesById } from '../../../common/store/app/model';
41+
import { inputsModel } from '../../../common/store/inputs';
3842

3943
import {
4044
applyKqlFilterQuery,
@@ -72,8 +76,8 @@ import { isNotNull } from './helpers';
7276
import { dispatcherTimelinePersistQueue } from './epic_dispatcher_timeline_persistence_queue';
7377
import { myEpicTimelineId } from './my_epic_timeline_id';
7478
import { ActionTimeline, TimelineById } from './types';
75-
import { persistTimeline } from '../../containers/timeline/api';
76-
import { ALL_TIMELINE_QUERY_ID } from '../../containers/timeline/all';
79+
import { persistTimeline } from '../../containers/api';
80+
import { ALL_TIMELINE_QUERY_ID } from '../../containers/all';
7781

7882
interface TimelineEpicDependencies<State> {
7983
timelineByIdSelector: (state: State) => TimelineById;

0 commit comments

Comments
 (0)