From 75e12db4ba261b1f2984f392b00d974da5715ab7 Mon Sep 17 00:00:00 2001 From: James Gowdy Date: Fri, 8 May 2020 13:13:17 +0100 Subject: [PATCH 01/65] [ML] Show warning when the model memory limit is higher than the memory available in the ML node (#65652) * [ML] Show warning when the model memory limit is higher than the memory available in the ML node * reverting UI check * removing from UI job validator * adding cap to estimate mml * adding mml value to message * fixing translations * updating translations * fixing translation ids --- .../plugins/ml/common/types/ml_server_info.ts | 1 + .../calculate_model_memory_limit.ts | 41 +++++++++++------- .../server/models/job_validation/messages.js | 11 +++++ .../validate_model_memory_limit.test.ts | 25 +++++++++++ .../validate_model_memory_limit.ts | 43 +++++++++++++------ .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - 7 files changed, 94 insertions(+), 29 deletions(-) diff --git a/x-pack/plugins/ml/common/types/ml_server_info.ts b/x-pack/plugins/ml/common/types/ml_server_info.ts index 26dd1758827b4a..66142f53add3a8 100644 --- a/x-pack/plugins/ml/common/types/ml_server_info.ts +++ b/x-pack/plugins/ml/common/types/ml_server_info.ts @@ -18,6 +18,7 @@ export interface MlServerDefaults { export interface MlServerLimits { max_model_memory_limit?: string; + effective_max_model_memory_limit?: string; } export interface MlInfoResponse { diff --git a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts index cd61dd9eddcdd7..1cc2a07ddbc881 100644 --- a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts +++ b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts @@ -9,6 +9,7 @@ import { APICaller } from 'kibana/server'; import { MLCATEGORY } from '../../../common/constants/field_types'; import { AnalysisConfig } from '../../../common/types/anomaly_detection_jobs'; import { fieldsServiceProvider } from '../fields_service'; +import { MlInfoResponse } from '../../../common/types/ml_server_info'; interface ModelMemoryEstimationResult { /** @@ -139,15 +140,9 @@ export function calculateModelMemoryLimitProvider(callAsCurrentUser: APICaller) latestMs: number, allowMMLGreaterThanMax = false ): Promise { - let maxModelMemoryLimit; - try { - const resp = await callAsCurrentUser('ml.info'); - if (resp?.limits?.max_model_memory_limit !== undefined) { - maxModelMemoryLimit = resp.limits.max_model_memory_limit.toUpperCase(); - } - } catch (e) { - throw new Error('Unable to retrieve max model memory limit'); - } + const info = await callAsCurrentUser('ml.info'); + const maxModelMemoryLimit = info.limits.max_model_memory_limit?.toUpperCase(); + const effectiveMaxModelMemoryLimit = info.limits.effective_max_model_memory_limit?.toUpperCase(); const { overallCardinality, maxBucketCardinality } = await getCardinalities( analysisConfig, @@ -168,17 +163,32 @@ export function calculateModelMemoryLimitProvider(callAsCurrentUser: APICaller) }) ).model_memory_estimate.toUpperCase(); - let modelMemoryLimit: string = estimatedModelMemoryLimit; + let modelMemoryLimit = estimatedModelMemoryLimit; + let mmlCappedAtMax = false; // if max_model_memory_limit has been set, // make sure the estimated value is not greater than it. - if (!allowMMLGreaterThanMax && maxModelMemoryLimit !== undefined) { - // @ts-ignore - const maxBytes = numeral(maxModelMemoryLimit).value(); + if (allowMMLGreaterThanMax === false) { // @ts-ignore const mmlBytes = numeral(estimatedModelMemoryLimit).value(); - if (mmlBytes > maxBytes) { + if (maxModelMemoryLimit !== undefined) { + // @ts-ignore + const maxBytes = numeral(maxModelMemoryLimit).value(); + if (mmlBytes > maxBytes) { + // @ts-ignore + modelMemoryLimit = `${Math.floor(maxBytes / numeral('1MB').value())}MB`; + mmlCappedAtMax = true; + } + } + + // if we've not already capped the estimated mml at the hard max server setting + // ensure that the estimated mml isn't greater than the effective max mml + if (mmlCappedAtMax === false && effectiveMaxModelMemoryLimit !== undefined) { // @ts-ignore - modelMemoryLimit = `${Math.floor(maxBytes / numeral('1MB').value())}MB`; + const effectiveMaxMmlBytes = numeral(effectiveMaxModelMemoryLimit).value(); + if (mmlBytes > effectiveMaxMmlBytes) { + // @ts-ignore + modelMemoryLimit = `${Math.floor(effectiveMaxMmlBytes / numeral('1MB').value())}MB`; + } } } @@ -186,6 +196,7 @@ export function calculateModelMemoryLimitProvider(callAsCurrentUser: APICaller) estimatedModelMemoryLimit, modelMemoryLimit, ...(maxModelMemoryLimit ? { maxModelMemoryLimit } : {}), + ...(effectiveMaxModelMemoryLimit ? { effectiveMaxModelMemoryLimit } : {}), }; }; } diff --git a/x-pack/plugins/ml/server/models/job_validation/messages.js b/x-pack/plugins/ml/server/models/job_validation/messages.js index 3fd90d0a356a18..6cdbc457e6adef 100644 --- a/x-pack/plugins/ml/server/models/job_validation/messages.js +++ b/x-pack/plugins/ml/server/models/job_validation/messages.js @@ -433,6 +433,17 @@ export const getMessages = () => { } ), }, + mml_greater_than_effective_max_mml: { + status: 'WARNING', + text: i18n.translate( + 'xpack.ml.models.jobValidation.messages.mmlGreaterThanEffectiveMaxMmlMessage', + { + defaultMessage: + 'Job will not be able to run in the current cluster because model memory limit is higher than {effectiveMaxModelMemoryLimit}.', + values: { effectiveMaxModelMemoryLimit: '{{effectiveMaxModelMemoryLimit}}' }, + } + ), + }, mml_greater_than_max_mml: { status: 'ERROR', text: i18n.translate('xpack.ml.models.jobValidation.messages.mmlGreaterThanMaxMmlMessage', { diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts index 6b5d5614325bfc..bf88716181bb3d 100644 --- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts +++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts @@ -24,6 +24,7 @@ describe('ML - validateModelMemoryLimit', () => { }, limits: { max_model_memory_limit: '30mb', + effective_max_model_memory_limit: '40mb', }, }; @@ -211,6 +212,30 @@ describe('ML - validateModelMemoryLimit', () => { }); }); + it('Called with no duration or split and mml above limit, no max setting', () => { + const job = getJobConfig(); + const duration = undefined; + // @ts-ignore + job.analysis_limits.model_memory_limit = '31mb'; + + return validateModelMemoryLimit(getMockCallWithRequest(), job, duration).then(messages => { + const ids = messages.map(m => m.id); + expect(ids).toEqual([]); + }); + }); + + it('Called with no duration or split and mml above limit, no max setting, above effective max mml', () => { + const job = getJobConfig(); + const duration = undefined; + // @ts-ignore + job.analysis_limits.model_memory_limit = '41mb'; + + return validateModelMemoryLimit(getMockCallWithRequest(), job, duration).then(messages => { + const ids = messages.map(m => m.id); + expect(ids).toEqual(['mml_greater_than_effective_max_mml']); + }); + }); + it('Called with small number of detectors, so estimated mml is under specified mml, no max setting', () => { const dtrs = createDetectors(1); const job = getJobConfig(['instance'], dtrs); diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts index 16a48addfeaf4a..5c3250af6ef468 100644 --- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts +++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts @@ -10,6 +10,7 @@ import { CombinedJob } from '../../../common/types/anomaly_detection_jobs'; import { validateJobObject } from './validate_job_object'; import { calculateModelMemoryLimitProvider } from '../calculate_model_memory_limit'; import { ALLOWED_DATA_UNITS } from '../../../common/constants/validation'; +import { MlInfoResponse } from '../../../common/types/ml_server_info'; // The minimum value the backend expects is 1MByte const MODEL_MEMORY_LIMIT_MINIMUM_BYTES = 1048576; @@ -50,9 +51,9 @@ export async function validateModelMemoryLimit( // retrieve the max_model_memory_limit value from the server // this will be unset unless the user has set this on their cluster - const maxModelMemoryLimit: string | undefined = ( - await callWithRequest('ml.info') - )?.limits?.max_model_memory_limit?.toUpperCase(); + const info = await callWithRequest('ml.info'); + const maxModelMemoryLimit = info.limits.max_model_memory_limit?.toUpperCase(); + const effectiveMaxModelMemoryLimit = info.limits.effective_max_model_memory_limit?.toUpperCase(); if (runCalcModelMemoryTest) { const { modelMemoryLimit } = await calculateModelMemoryLimitProvider(callWithRequest)( @@ -113,17 +114,35 @@ export async function validateModelMemoryLimit( // if max_model_memory_limit has been set, // make sure the user defined MML is not greater than it - if (maxModelMemoryLimit !== undefined && mml !== null) { - // @ts-ignore - const maxMmlBytes = numeral(maxModelMemoryLimit).value(); + if (mml !== null) { + let maxMmlExceeded = false; // @ts-ignore const mmlBytes = numeral(mml).value(); - if (mmlBytes > maxMmlBytes) { - messages.push({ - id: 'mml_greater_than_max_mml', - maxModelMemoryLimit, - mml, - }); + + if (maxModelMemoryLimit !== undefined) { + // @ts-ignore + const maxMmlBytes = numeral(maxModelMemoryLimit).value(); + if (mmlBytes > maxMmlBytes) { + maxMmlExceeded = true; + messages.push({ + id: 'mml_greater_than_max_mml', + maxModelMemoryLimit, + mml, + }); + } + } + + if (effectiveMaxModelMemoryLimit !== undefined && maxMmlExceeded === false) { + // @ts-ignore + const effectiveMaxMmlBytes = numeral(effectiveMaxModelMemoryLimit).value(); + if (mmlBytes > effectiveMaxMmlBytes) { + messages.push({ + id: 'mml_greater_than_effective_max_mml', + maxModelMemoryLimit, + mml, + effectiveMaxModelMemoryLimit, + }); + } } } diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index a2b4bd224e6370..956dcb08e5fc11 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -10053,7 +10053,6 @@ "xpack.ml.models.jobValidation.messages.jobIdInvalidMessage": "ジョブ ID が無効です。アルファベットの小文字 (a-z と 0-9)、ハイフンまたはアンダーラインが使用でき、最初と最後を英数字にする必要があります。", "xpack.ml.models.jobValidation.messages.jobIdValidHeading": "ジョブ ID のフォーマットは有効です。", "xpack.ml.models.jobValidation.messages.jobIdValidMessage": "アルファベットの小文字 (a-z と 0-9)、ハイフンまたはアンダーライン、最初と最後を英数字にし、{maxLength, plural, one {# 文字} other {# 文字}}以内にする必要があります。", - "xpack.ml.models.jobValidation.messages.mmlGreaterThanMaxMmlMessage": "モデルメモリー制限が、このクラスターに構成された最大モデルメモリー制限を超えています。", "xpack.ml.models.jobValidation.messages.mmlValueInvalidMessage": "{mml} はモデルメモリー制限の有効な値ではありません。この値は最低 1MB で、バイト (例: 10MB) で指定する必要があります。", "xpack.ml.models.jobValidation.messages.skippedExtendedTestsMessage": "ジョブの構成の基本要件が満たされていないため、他のチェックをスキップしました。", "xpack.ml.models.jobValidation.messages.successBucketSpanHeading": "バケットスパン", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index f7caf1619f5fb0..cc42647f356bfb 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -10059,7 +10059,6 @@ "xpack.ml.models.jobValidation.messages.jobIdInvalidMessage": "作业 ID 无效.其可以包含小写字母数字（a-z 和 0-9）字符、连字符或下划线，且必须以字母数字字符开头和结尾。", "xpack.ml.models.jobValidation.messages.jobIdValidHeading": "作业 ID 格式有效", "xpack.ml.models.jobValidation.messages.jobIdValidMessage": "小写字母数字（a-z 和 0-9）字符、连字符或下划线，以字母数字字符开头和结尾，且长度不超过 {maxLength, plural, one {# 个字符} other {# 个字符}}。", - "xpack.ml.models.jobValidation.messages.mmlGreaterThanMaxMmlMessage": "模型内存限制大于为此集群配置的最大模型内存限制。", "xpack.ml.models.jobValidation.messages.mmlValueInvalidMessage": "{mml} 不是有效的模型内存限制值。该值需要至少 1MB，且应以字节为单位（例如 10MB）指定。", "xpack.ml.models.jobValidation.messages.skippedExtendedTestsMessage": "已跳过其他检查，因为未满足作业配置的基本要求。", "xpack.ml.models.jobValidation.messages.successBucketSpanHeading": "存储桶跨度", From 8f05cf0ecfd91e1ba4470512e9d1f26b3459cfd8 Mon Sep 17 00:00:00 2001 From: Shahzad Date: Fri, 8 May 2020 14:43:02 +0200 Subject: [PATCH 02/65] [Uptime] Enable loading on monitor list (#65670) --- .../__snapshots__/fingerprint_col.test.tsx.snap | 2 ++ .../public/components/certificates/certificates_list.tsx | 3 ++- .../public/components/certificates/fingerprint_col.tsx | 9 ++++++++- .../components/overview/monitor_list/monitor_list.tsx | 5 +---- x-pack/plugins/uptime/public/pages/certificates.tsx | 2 +- .../uptime/public/state/certificates/certificates.ts | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap index c9b17db5532f4a..b4e5a344122123 100644 --- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap +++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap @@ -36,6 +36,7 @@ Array [ class="euiToolTipAnchor" > -
- {{(hits || 0) | number:0}} - - -
+ +
; + + beforeAll(() => { + props = { + onResetQuery: jest.fn(), + showResetButton: true, + hits: 2, + }; + }); + + it('HitsCounter renders a button by providing the showResetButton property', () => { + component = mountWithIntl(); + expect(findTestSubject(component, 'resetSavedSearch').length).toBe(1); + }); + + it('HitsCounter not renders a button when the showResetButton property is false', () => { + component = mountWithIntl( + + ); + expect(findTestSubject(component, 'resetSavedSearch').length).toBe(0); + }); + + it('expect to render the number of hits', function() { + component = mountWithIntl(); + const hits = findTestSubject(component, 'discoverQueryHits'); + expect(hits.text()).toBe('2'); + }); + + it('expect to render 1,899 hits if 1899 hits given', function() { + component = mountWithIntl( + + ); + const hits = findTestSubject(component, 'discoverQueryHits'); + expect(hits.text()).toBe('1,899'); + }); + + it('should reset query', function() { + component = mountWithIntl(); + findTestSubject(component, 'resetSavedSearch').simulate('click'); + expect(props.onResetQuery).toHaveBeenCalled(); + }); +}); diff --git a/src/plugins/discover/public/application/components/hits_counter/hits_counter.tsx b/src/plugins/discover/public/application/components/hits_counter/hits_counter.tsx new file mode 100644 index 00000000000000..1d2cd12877b1c0 --- /dev/null +++ b/src/plugins/discover/public/application/components/hits_counter/hits_counter.tsx @@ -0,0 +1,83 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import React from 'react'; +import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; +import { FormattedMessage, I18nProvider } from '@kbn/i18n/react'; +import { i18n } from '@kbn/i18n'; +import { formatNumWithCommas } from '../../helpers'; + +export interface HitsCounterProps { + /** + * the number of query hits + */ + hits: number; + /** + * displays the reset button + */ + showResetButton: boolean; + /** + * resets the query + */ + onResetQuery: () => void; +} + +export function HitsCounter({ hits, showResetButton, onResetQuery }: HitsCounterProps) { + return ( + + + + + {formatNumWithCommas(hits)}{' '} + + + + {showResetButton && ( + + + + + + )} + + + ); +} diff --git a/src/plugins/discover/public/application/components/hits_counter/hits_counter_directive.ts b/src/plugins/discover/public/application/components/hits_counter/hits_counter_directive.ts new file mode 100644 index 00000000000000..8d45e28370cade --- /dev/null +++ b/src/plugins/discover/public/application/components/hits_counter/hits_counter_directive.ts @@ -0,0 +1,27 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import { HitsCounter } from './hits_counter'; + +export function createHitsCounterDirective(reactDirective: any) { + return reactDirective(HitsCounter, [ + ['hits', { watchDepth: 'reference' }], + ['showResetButton', { watchDepth: 'reference' }], + ['onResetQuery', { watchDepth: 'reference' }], + ]); +} diff --git a/src/plugins/discover/public/application/components/hits_counter/index.ts b/src/plugins/discover/public/application/components/hits_counter/index.ts new file mode 100644 index 00000000000000..58e7a9eda7f51a --- /dev/null +++ b/src/plugins/discover/public/application/components/hits_counter/index.ts @@ -0,0 +1,21 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { HitsCounter } from './hits_counter'; +export { createHitsCounterDirective } from './hits_counter_directive'; diff --git a/src/plugins/discover/public/application/helpers/format_number_with_commas.ts b/src/plugins/discover/public/application/helpers/format_number_with_commas.ts new file mode 100644 index 00000000000000..01a010d823d5f3 --- /dev/null +++ b/src/plugins/discover/public/application/helpers/format_number_with_commas.ts @@ -0,0 +1,27 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +const COMMA_SEPARATOR_RE = /(\d)(?=(\d{3})+(?!\d))/g; + +/** + * Converts a number to a string and adds commas + * as thousands separators + */ +export const formatNumWithCommas = (input: number) => + String(input).replace(COMMA_SEPARATOR_RE, '$1,'); diff --git a/src/plugins/discover/public/application/helpers/index.ts b/src/plugins/discover/public/application/helpers/index.ts index 7196c96989e97d..3555d24924e806 100644 --- a/src/plugins/discover/public/application/helpers/index.ts +++ b/src/plugins/discover/public/application/helpers/index.ts @@ -18,3 +18,4 @@ */ export { shortenDottedString } from './shorten_dotted_string'; +export { formatNumWithCommas } from './format_number_with_commas'; diff --git a/src/plugins/discover/public/get_inner_angular.ts b/src/plugins/discover/public/get_inner_angular.ts index e7813c43383f93..8c3f4f030688ce 100644 --- a/src/plugins/discover/public/get_inner_angular.ts +++ b/src/plugins/discover/public/get_inner_angular.ts @@ -57,6 +57,7 @@ import { createTopNavHelper, } from '../../kibana_legacy/public'; import { createDiscoverSidebarDirective } from './application/components/sidebar'; +import { createHitsCounterDirective } from '././application/components/hits_counter'; import { DiscoverStartPlugins } from './plugin'; /** @@ -151,6 +152,7 @@ export function initializeInnerAngularModule( .directive('fixedScroll', FixedScrollProvider) .directive('renderComplete', createRenderCompleteDirective) .directive('discoverSidebar', createDiscoverSidebarDirective) + .directive('hitsCounter', createHitsCounterDirective) .service('debounce', ['$timeout', DebounceProviderTimeout]); } From d40387161e16aa9cf8396d669c1f8478ec674442 Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Fri, 8 May 2020 11:35:17 -0400 Subject: [PATCH 07/65] Skipping failing tests. #65867 #65866 #65865 --- .../server/models/job_validation/job_validation.test.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts index 9851f80a42d5bb..ca127f43d08afe 100644 --- a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts +++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts @@ -290,7 +290,8 @@ describe('ML - validateJob', () => { }); }); - it('basic validation passes, extended checks return some messages', () => { + // Failing https://github.com/elastic/kibana/issues/65865 + it.skip('basic validation passes, extended checks return some messages', () => { const payload = getBasicPayload(); return validateJob(callWithRequest, payload).then(messages => { const ids = messages.map(m => m.id); @@ -303,7 +304,8 @@ describe('ML - validateJob', () => { }); }); - it('categorization job using mlcategory passes aggregatable field check', () => { + // Failing https://github.com/elastic/kibana/issues/65866 + it.skip('categorization job using mlcategory passes aggregatable field check', () => { const payload: any = { job: { job_id: 'categorization_test', @@ -369,7 +371,8 @@ describe('ML - validateJob', () => { }); }); - it('script field not reported as non aggregatable', () => { + // Failing https://github.com/elastic/kibana/issues/65867 + it.skip('script field not reported as non aggregatable', () => { const payload: any = { job: { job_id: 'categorization_test', From e79f331fb460c954dcb2d8fcf5704681f26d9f5a Mon Sep 17 00:00:00 2001 From: Andrew Goldstein Date: Fri, 8 May 2020 09:38:38 -0600 Subject: [PATCH 08/65] [SIEM] Fixes a CSS issue with Timeline field truncation (#65789) ## Summary Fixes [a CSS issue where Timeline field truncation](https://github.com/elastic/kibana/issues/65170) wasn't working, per the following screenshots: ### Before before ### After after ## Desk testing * The timeline in the _Before_ and _After_ screenshots above includes columns that typically contain large values (e.g. `process.hash.sha256`). It also contains the `event.module` column, which has special formatting, as detailed below. * You may re-create the timeline shown in the _Before_ and _After_ screenshots, or download the exported timeline from the following link [truncation.ndjson.txt](https://github.com/elastic/kibana/files/4596036/truncation.ndjson.txt) and import it. (Remove the `.txt` extension after downloading it.) * The `event.module` field has special formatting that displays an icon link to the endpoint if it's been configured. To desk test this without configuring an endpoint, edit `x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field_helpers.tsx`, and change the following line: ``` {endpointRefUrl != null && canYouAddEndpointLogo(moduleName, endpointRefUrl) && ( ``` to ``` {true && ( ``` The above change forces the icon to always appear, even if you don't have an endpoint configured. ### Desk tested in: - Chrome `81.0.4044.138` - Firefox `76.0` - Safari `13.1` --- .../body/renderers/formatted_field_helpers.tsx | 9 +++++++-- .../public/components/with_hover_actions/index.tsx | 13 +++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field_helpers.tsx b/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field_helpers.tsx index b48cc546fe78cf..7c9accd4cef49e 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field_helpers.tsx +++ b/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field_helpers.tsx @@ -7,6 +7,7 @@ import { EuiLink, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiToolTip } from '@elastic/eui'; import { isString, isEmpty } from 'lodash/fp'; import React from 'react'; +import styled from 'styled-components'; import { DefaultDraggable } from '../../../draggables'; import { getEmptyTagValue } from '../../../empty_value'; @@ -18,6 +19,10 @@ import endPointSvg from '../../../../utils/logo_endpoint/64_color.svg'; import * as i18n from './translations'; +const EventModuleFlexItem = styled(EuiFlexItem)` + width: 100%; +`; + export const renderRuleName = ({ contextId, eventId, @@ -87,7 +92,7 @@ export const renderEventModule = ({ endpointRefUrl != null && !isEmpty(endpointRefUrl) ? 'flexStart' : 'spaceBetween' } > - + {content} - + {endpointRefUrl != null && canYouAddEndpointLogo(moduleName, endpointRefUrl) && ( ( const popover = useMemo(() => { return ( - ( panelPaddingSize={!alwaysShow ? 's' : 'none'} > {isOpen ? hoverContent : null} - + ); }, [content, onMouseLeave, isOpen, alwaysShow, hoverContent]); From 3a6c1ceeddfb51efed5cff163599ab17bcf78701 Mon Sep 17 00:00:00 2001 From: Matthias Wilhelm Date: Fri, 8 May 2020 17:56:28 +0200 Subject: [PATCH 09/65] [Discover] Prevent whitespace wrapping of doc table header (#52861) Co-authored-by: Dave Snider --- .../angular/doc_table/components/_table_header.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/discover/public/application/angular/doc_table/components/_table_header.scss b/src/plugins/discover/public/application/angular/doc_table/components/_table_header.scss index 099286f8c875c6..9ea4e21632ace9 100644 --- a/src/plugins/discover/public/application/angular/doc_table/components/_table_header.scss +++ b/src/plugins/discover/public/application/angular/doc_table/components/_table_header.scss @@ -1,3 +1,6 @@ +.kbnDocTableHeader { + white-space: nowrap; +} .kbnDocTableHeader button { margin-left: $euiSizeXS; } From 97561d6751a6f864d06697800a8fbf0d39d05966 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Fri, 8 May 2020 11:53:42 -0500 Subject: [PATCH 10/65] restore index pattern management data-test-subj's (#64697) * restore index pattern management data-test-subj's --- .../edit_index_pattern/tabs/utils.ts | 3 +++ test/functional/page_objects/settings_page.ts | 16 +++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts index bdb1436c37efb3..83335a6fabfeb6 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts @@ -96,18 +96,21 @@ export function getTabs( tabs.push({ name: getTitle('indexed', filteredCount, totalCount), id: TAB_INDEXED_FIELDS, + 'data-test-subj': 'tab-indexedFields', }); if (indexPatternListProvider.areScriptedFieldsEnabled(indexPattern)) { tabs.push({ name: getTitle('scripted', filteredCount, totalCount), id: TAB_SCRIPTED_FIELDS, + 'data-test-subj': 'tab-scriptedFields', }); } tabs.push({ name: getTitle('sourceFilters', filteredCount, totalCount), id: TAB_SOURCE_FILTERS, + 'data-test-subj': 'tab-sourceFilters', }); return tabs; diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts index 8175361ffc8420..b8069b31257d30 100644 --- a/test/functional/page_objects/settings_page.ts +++ b/test/functional/page_objects/settings_page.ts @@ -206,17 +206,15 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider async getFieldsTabCount() { return retry.try(async () => { - const indexedFieldsTab = await find.byCssSelector('#indexedFields .euiTab__content'); - const text = await indexedFieldsTab.getVisibleText(); - return text.split(/[()]/)[1]; + const text = await testSubjects.getVisibleText('tab-indexedFields'); + return text.split(' ')[1].replace(/\((.*)\)/, '$1'); }); } async getScriptedFieldsTabCount() { return await retry.try(async () => { - const scriptedFieldsTab = await find.byCssSelector('#scriptedFields .euiTab__content'); - const text = await scriptedFieldsTab.getVisibleText(); - return text.split(/[()]/)[1]; + const text = await testSubjects.getVisibleText('tab-scriptedFields'); + return text.split(' ')[2].replace(/\((.*)\)/, '$1'); }); } @@ -431,17 +429,17 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider async clickFieldsTab() { log.debug('click Fields tab'); - await find.clickByCssSelector('#indexedFields'); + await testSubjects.click('tab-indexedFields'); } async clickScriptedFieldsTab() { log.debug('click Scripted Fields tab'); - await find.clickByCssSelector('#scriptedFields'); + await testSubjects.click('tab-scriptedFields'); } async clickSourceFiltersTab() { log.debug('click Source Filters tab'); - await find.clickByCssSelector('#sourceFilters'); + await testSubjects.click('tab-sourceFilters'); } async editScriptedField(name: string) { From d3b155f8437f1cf2dbe09ba30f667231dce386e0 Mon Sep 17 00:00:00 2001 From: Quynh Nguyen <43350163+qn895@users.noreply.github.com> Date: Fri, 8 May 2020 12:06:59 -0500 Subject: [PATCH 11/65] [ML] Add job timing stats to anomaly jobs (#65696) * [ML] Add anomaly job timing stats to Counts & JSON * [ML] Remove roundTo3DecimalPlace and clean up * [ML] Fix format_values to round decimals for time values * [ML] Remove timing_stats and forecast_stats from cloneJob * [ML] Remove timing_stats & forecasts in job_service instead of utils --- .../components/job_details/extract_job_details.js | 10 ++++++++++ .../jobs_list/components/job_details/format_values.js | 6 ++++++ .../jobs_list/components/job_details/job_details.js | 3 ++- .../ml/public/application/services/job_service.js | 2 ++ x-pack/plugins/ml/server/models/job_service/jobs.ts | 6 ++---- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/extract_job_details.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/extract_job_details.js index f7b0e726ecc53d..fa36a0626d632e 100644 --- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/extract_job_details.js +++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/extract_job_details.js @@ -165,6 +165,15 @@ export function extractJobDetails(job) { items: filterObjects(job.model_size_stats).map(formatValues), }; + const jobTimingStats = { + id: 'jobTimingStats', + title: i18n.translate('xpack.ml.jobsList.jobDetails.jobTimingStatsTitle', { + defaultMessage: 'Job timing stats', + }), + position: 'left', + items: filterObjects(job.timing_stats).map(formatValues), + }; + const datafeedTimingStats = { id: 'datafeedTimingStats', title: i18n.translate('xpack.ml.jobsList.jobDetails.datafeedTimingStatsTitle', { @@ -192,6 +201,7 @@ export function extractJobDetails(job) { datafeed, counts, modelSizeStats, + jobTimingStats, datafeedTimingStats, }; } diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/format_values.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/format_values.js index 9984f3be299ae8..246a476517acea 100644 --- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/format_values.js +++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/format_values.js @@ -63,6 +63,12 @@ export function formatValues([key, value]) { // numbers rounded to 3 decimal places case 'average_search_time_per_bucket_ms': case 'exponential_average_search_time_per_hour_ms': + case 'total_bucket_processing_time_ms': + case 'minimum_bucket_processing_time_ms': + case 'maximum_bucket_processing_time_ms': + case 'average_bucket_processing_time_ms': + case 'exponential_average_bucket_processing_time_ms': + case 'exponential_average_bucket_processing_time_per_hour_ms': value = typeof value === 'number' ? roundToDecimalPlace(value, 3).toLocaleString() : value; break; diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js index e3f348ad32b0c1..0375997b86bb89 100644 --- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js +++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_details/job_details.js @@ -60,6 +60,7 @@ export class JobDetails extends Component { datafeed, counts, modelSizeStats, + jobTimingStats, datafeedTimingStats, } = extractJobDetails(job); @@ -102,7 +103,7 @@ export class JobDetails extends Component { content: ( ), }, diff --git a/x-pack/plugins/ml/public/application/services/job_service.js b/x-pack/plugins/ml/public/application/services/job_service.js index bbfec49ac1388f..fb75476c48fa3d 100644 --- a/x-pack/plugins/ml/public/application/services/job_service.js +++ b/x-pack/plugins/ml/public/application/services/job_service.js @@ -369,6 +369,8 @@ class JobService { delete tempJob.open_time; delete tempJob.established_model_memory; delete tempJob.calendars; + delete tempJob.timing_stats; + delete tempJob.forecasts_stats; delete tempJob.analysis_config.use_per_partition_normalization; diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts index 6024ecf4925e61..225cd43e411a4f 100644 --- a/x-pack/plugins/ml/server/models/job_service/jobs.ts +++ b/x-pack/plugins/ml/server/models/job_service/jobs.ts @@ -328,7 +328,7 @@ export function jobsProvider(callAsCurrentUser: APICaller) { // create jobs objects containing job stats, datafeeds, datafeed stats and calendars if (jobResults && jobResults.jobs) { jobResults.jobs.forEach(job => { - const tempJob = job as CombinedJobWithStats; + let tempJob = job as CombinedJobWithStats; const calendars: string[] = [ ...(calendarsByJobId[tempJob.job_id] || []), @@ -341,9 +341,7 @@ export function jobsProvider(callAsCurrentUser: APICaller) { if (jobStatsResults && jobStatsResults.jobs) { const jobStats = jobStatsResults.jobs.find(js => js.job_id === tempJob.job_id); if (jobStats !== undefined) { - tempJob.state = jobStats.state; - tempJob.data_counts = jobStats.data_counts; - tempJob.model_size_stats = jobStats.model_size_stats; + tempJob = { ...tempJob, ...jobStats }; if (jobStats.node) { tempJob.node = jobStats.node; } From 1c6e6cb7b7a3ac7522691989881cd74fd3b17992 Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Fri, 8 May 2020 10:55:43 -0700 Subject: [PATCH 12/65] [Metrics UI] Fix p95/p99 charts and alerting error (#65579) * [Metrics UI] Fix p95/p99 charts and alerting error - Fixes #65561 * Fixing open in visualize for percentiles * Adding test for P95; refactoring to use first consitently --- .../components/expression_chart.tsx | 5 +- .../components/expression_row.tsx | 16 ++++++ .../public/alerting/metric_threshold/types.ts | 2 + .../components/helpers/create_tsvb_link.ts | 18 +++++++ .../components/series_chart.tsx | 19 ++++--- .../create_percentile_aggregation.ts | 22 ++++++++ .../metric_threshold_executor.test.ts | 52 +++++++++++++++++++ .../metric_threshold_executor.ts | 18 +++++-- .../alerting/metric_threshold/test_mocks.ts | 8 +-- .../lib/alerting/metric_threshold/types.ts | 2 + 10 files changed, 144 insertions(+), 18 deletions(-) create mode 100644 x-pack/plugins/infra/server/lib/alerting/metric_threshold/create_percentile_aggregation.ts diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx index 82e751627a05bd..77147d1b3b2b78 100644 --- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx +++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx @@ -118,10 +118,7 @@ export const ExpressionChart: React.FC = ({ const series = { ...firstSeries, rows: firstSeries.rows.map(row => { - const newRow: MetricsExplorerRow = { - timestamp: row.timestamp, - metric_0: row.metric_0 || null, - }; + const newRow: MetricsExplorerRow = { ...row }; thresholds.forEach((thresholdValue, index) => { newRow[`metric_threshold_${index}`] = thresholdValue; }); diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx index 8801df380b48d4..be0f5f88a2b55b 100644 --- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx +++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_row.tsx @@ -234,4 +234,20 @@ export const aggregationType: { [key: string]: any } = { value: AGGREGATION_TYPES.SUM, validNormalizedTypes: ['number'], }, + p95: { + text: i18n.translate('xpack.infra.metrics.alertFlyout.aggregationText.p95', { + defaultMessage: '95th Percentile', + }), + fieldRequired: false, + value: AGGREGATION_TYPES.P95, + validNormalizedTypes: ['number'], + }, + p99: { + text: i18n.translate('xpack.infra.metrics.alertFlyout.aggregationText.p99', { + defaultMessage: '99th Percentile', + }), + fieldRequired: false, + value: AGGREGATION_TYPES.P99, + validNormalizedTypes: ['number'], + }, }; diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts b/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts index af3baf191bed21..e421455cf6efdd 100644 --- a/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts +++ b/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts @@ -29,6 +29,8 @@ export enum AGGREGATION_TYPES { MAX = 'max', RATE = 'rate', CARDINALITY = 'cardinality', + P95 = 'p95', + P99 = 'p99', } export interface MetricThresholdAlertParams { diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts index 559422584f579a..f773c843d12fdd 100644 --- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts +++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts @@ -46,6 +46,24 @@ export const metricsExplorerMetricToTSVBMetric = (metric: MetricsExplorerOptions field: derivativeId, }, ]; + } else if (metric.aggregation === 'p95' || metric.aggregation === 'p99') { + const percentileValue = metric.aggregation === 'p95' ? '95' : '99'; + return [ + { + id: uuid.v1(), + type: 'percentile', + field: metric.field, + percentiles: [ + { + id: uuid.v1(), + value: percentileValue, + mode: 'line', + percentile: '', + shade: 0.2, + }, + ], + }, + ]; } else { return [ { diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/series_chart.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/series_chart.tsx index 3b84fcbc34836b..223318da8cf46a 100644 --- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/series_chart.tsx +++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/series_chart.tsx @@ -20,6 +20,7 @@ import { MetricsExplorerOptionsMetric, MetricsExplorerChartType, } from '../hooks/use_metrics_explorer_options'; +import { getMetricId } from './helpers/get_metric_id'; type NumberOrString = string | number; @@ -45,10 +46,12 @@ export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack, opac colorTransformer(MetricsExplorerColor.color0); const yAccessors = Array.isArray(id) - ? id.map(i => `metric_${i}`).slice(id.length - 1, id.length) - : [`metric_${id}`]; + ? id.map(i => getMetricId(metric, i)).slice(id.length - 1, id.length) + : [getMetricId(metric, id)]; const y0Accessors = - Array.isArray(id) && id.length > 1 ? id.map(i => `metric_${i}`).slice(0, 1) : undefined; + Array.isArray(id) && id.length > 1 + ? id.map(i => getMetricId(metric, i)).slice(0, 1) + : undefined; const chartId = `series-${series.id}-${yAccessors.join('-')}`; const seriesAreaStyle: RecursivePartial = { @@ -85,8 +88,10 @@ export const MetricsExplorerBarChart = ({ metric, id, series, stack }: Props) => (metric.color && colorTransformer(metric.color)) || colorTransformer(MetricsExplorerColor.color0); - const yAccessor = `metric_${id}`; - const chartId = `series-${series.id}-${yAccessor}`; + const yAccessors = Array.isArray(id) + ? id.map(i => getMetricId(metric, i)).slice(id.length - 1, id.length) + : [getMetricId(metric, id)]; + const chartId = `series-${series.id}-${yAccessors.join('-')}`; const seriesBarStyle: RecursivePartial = { rectBorder: { @@ -100,13 +105,13 @@ export const MetricsExplorerBarChart = ({ metric, id, series, stack }: Props) => }; return ( { + const value = type === Aggregators.P95 ? 95 : 99; + return { + aggregatedValue: { + percentiles: { + field, + percents: [value], + keyed: false, + }, + }, + }; +}; diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts index 2531e939792af2..ed5efc1473953f 100644 --- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts +++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts @@ -233,6 +233,58 @@ describe('The metric threshold alert type', () => { expect(getState(instanceID).alertState).toBe(AlertStates.OK); }); }); + describe('querying with the p99 aggregator', () => { + const instanceID = 'test-*'; + const execute = (comparator: Comparator, threshold: number[]) => + executor({ + services, + params: { + criteria: [ + { + ...baseCriterion, + comparator, + threshold, + aggType: 'p99', + metric: 'test.metric.2', + }, + ], + }, + }); + test('alerts based on the p99 values', async () => { + await execute(Comparator.GT, [1]); + expect(mostRecentAction(instanceID).id).toBe(FIRED_ACTIONS.id); + expect(getState(instanceID).alertState).toBe(AlertStates.ALERT); + await execute(Comparator.LT, [1]); + expect(mostRecentAction(instanceID)).toBe(undefined); + expect(getState(instanceID).alertState).toBe(AlertStates.OK); + }); + }); + describe('querying with the p95 aggregator', () => { + const instanceID = 'test-*'; + const execute = (comparator: Comparator, threshold: number[]) => + executor({ + services, + params: { + criteria: [ + { + ...baseCriterion, + comparator, + threshold, + aggType: 'p95', + metric: 'test.metric.1', + }, + ], + }, + }); + test('alerts based on the p95 values', async () => { + await execute(Comparator.GT, [0.25]); + expect(mostRecentAction(instanceID).id).toBe(FIRED_ACTIONS.id); + expect(getState(instanceID).alertState).toBe(AlertStates.ALERT); + await execute(Comparator.LT, [0.95]); + expect(mostRecentAction(instanceID)).toBe(undefined); + expect(getState(instanceID).alertState).toBe(AlertStates.OK); + }); + }); describe("querying a metric that hasn't reported data", () => { const instanceID = 'test-*'; const execute = (alertOnNoData: boolean) => diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts index ec9389537835bb..71bee3209bf532 100644 --- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts +++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { mapValues } from 'lodash'; +import { mapValues, first } from 'lodash'; import { i18n } from '@kbn/i18n'; import { InfraDatabaseSearchResponse } from '../../adapters/framework/adapter_types'; import { createAfterKeyHandler } from '../../../utils/create_afterkey_handler'; @@ -21,12 +21,16 @@ import { AlertServices, AlertExecutorOptions } from '../../../../../alerting/ser import { getIntervalInSeconds } from '../../../utils/get_interval_in_seconds'; import { getDateHistogramOffset } from '../../snapshot/query_helpers'; import { InfraBackendLibs } from '../../infra_types'; +import { createPercentileAggregation } from './create_percentile_aggregation'; const TOTAL_BUCKETS = 5; interface Aggregation { aggregatedIntervals: { - buckets: Array<{ aggregatedValue: { value: number }; doc_count: number }>; + buckets: Array<{ + aggregatedValue: { value: number; values?: Array<{ key: number; value: number }> }; + doc_count: number; + }>; }; } @@ -47,6 +51,12 @@ const getCurrentValueFromAggregations = ( if (aggType === Aggregators.COUNT) { return mostRecentBucket.doc_count; } + if (aggType === Aggregators.P95 || aggType === Aggregators.P99) { + const values = mostRecentBucket.aggregatedValue?.values || []; + const firstValue = first(values); + if (!firstValue) return null; + return firstValue.value; + } const { value } = mostRecentBucket.aggregatedValue; return value; } catch (e) { @@ -86,6 +96,8 @@ export const getElasticsearchMetricQuery = ( ? {} : aggType === Aggregators.RATE ? networkTraffic('aggregatedValue', metric) + : aggType === Aggregators.P95 || aggType === Aggregators.P99 + ? createPercentileAggregation(aggType, metric) : { aggregatedValue: { [aggType]: { @@ -275,7 +287,7 @@ export const createMetricThresholdExecutor = (libs: InfraBackendLibs, alertId: s ); // Because each alert result has the same group definitions, just grap the groups from the first one. - const groups = Object.keys(alertResults[0]); + const groups = Object.keys(first(alertResults)); for (const group of groups) { const alertInstance = services.alertInstanceFactory(`${alertId}-${group}`); diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts index fa55f80e472de3..25b709d6afc51b 100644 --- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts +++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/test_mocks.ts @@ -7,22 +7,22 @@ const bucketsA = [ { doc_count: 2, - aggregatedValue: { value: 0.5 }, + aggregatedValue: { value: 0.5, values: [{ key: 95.0, value: 0.5 }] }, }, { doc_count: 3, - aggregatedValue: { value: 1.0 }, + aggregatedValue: { value: 1.0, values: [{ key: 95.0, value: 1.0 }] }, }, ]; const bucketsB = [ { doc_count: 4, - aggregatedValue: { value: 2.5 }, + aggregatedValue: { value: 2.5, values: [{ key: 99.0, value: 2.5 }] }, }, { doc_count: 5, - aggregatedValue: { value: 3.5 }, + aggregatedValue: { value: 3.5, values: [{ key: 99.0, value: 3.5 }] }, }, ]; diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts index 18f5503fe2c9e3..76ddd107bd728e 100644 --- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts +++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/types.ts @@ -23,6 +23,8 @@ export enum Aggregators { MAX = 'max', RATE = 'rate', CARDINALITY = 'cardinality', + P95 = 'p95', + P99 = 'p99', } export enum AlertStates { From 808e02564b67a89b9098c098eb57af841afd7152 Mon Sep 17 00:00:00 2001 From: Christos Nasikas Date: Fri, 8 May 2020 21:24:44 +0300 Subject: [PATCH 13/65] [SIEM][CASE] Moves functional tests from "legacyEs" to "Es" (#65851) --- .../basic/tests/configure/get_configure.ts | 2 +- .../basic/tests/configure/patch_configure.ts | 2 +- .../basic/tests/configure/post_configure.ts | 2 +- x-pack/test/case_api_integration/common/lib/utils.ts | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/x-pack/test/case_api_integration/basic/tests/configure/get_configure.ts b/x-pack/test/case_api_integration/basic/tests/configure/get_configure.ts index a9fc2706a6ba20..930cf42b9efc5c 100644 --- a/x-pack/test/case_api_integration/basic/tests/configure/get_configure.ts +++ b/x-pack/test/case_api_integration/basic/tests/configure/get_configure.ts @@ -18,7 +18,7 @@ import { // eslint-disable-next-line import/no-default-export export default ({ getService }: FtrProviderContext): void => { const supertest = getService('supertest'); - const es = getService('legacyEs'); + const es = getService('es'); describe('get_configure', () => { afterEach(async () => { diff --git a/x-pack/test/case_api_integration/basic/tests/configure/patch_configure.ts b/x-pack/test/case_api_integration/basic/tests/configure/patch_configure.ts index d66baa2a2eee2b..5f7d7c4c5c346b 100644 --- a/x-pack/test/case_api_integration/basic/tests/configure/patch_configure.ts +++ b/x-pack/test/case_api_integration/basic/tests/configure/patch_configure.ts @@ -18,7 +18,7 @@ import { // eslint-disable-next-line import/no-default-export export default ({ getService }: FtrProviderContext): void => { const supertest = getService('supertest'); - const es = getService('legacyEs'); + const es = getService('es'); describe('post_configure', () => { afterEach(async () => { diff --git a/x-pack/test/case_api_integration/basic/tests/configure/post_configure.ts b/x-pack/test/case_api_integration/basic/tests/configure/post_configure.ts index c2284492e5b771..86214a2bd3187f 100644 --- a/x-pack/test/case_api_integration/basic/tests/configure/post_configure.ts +++ b/x-pack/test/case_api_integration/basic/tests/configure/post_configure.ts @@ -18,7 +18,7 @@ import { // eslint-disable-next-line import/no-default-export export default ({ getService }: FtrProviderContext): void => { const supertest = getService('supertest'); - const es = getService('legacyEs'); + const es = getService('es'); describe('post_configure', () => { afterEach(async () => { diff --git a/x-pack/test/case_api_integration/common/lib/utils.ts b/x-pack/test/case_api_integration/common/lib/utils.ts index 6d0db69309b908..df768ff09b3689 100644 --- a/x-pack/test/case_api_integration/common/lib/utils.ts +++ b/x-pack/test/case_api_integration/common/lib/utils.ts @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import { Client } from '@elastic/elasticsearch'; import { CasesConfigureRequest, CasesConfigureResponse } from '../../../../plugins/case/common/api'; export const getConfiguration = (connector_id: string = 'connector-1'): CasesConfigureRequest => { @@ -29,12 +30,12 @@ export const removeServerGeneratedPropertiesFromConfigure = ( return rest; }; -export const deleteConfiguration = async (es: any): Promise => { +export const deleteConfiguration = async (es: Client): Promise => { await es.deleteByQuery({ index: '.kibana', q: 'type:cases-configure', - waitForCompletion: true, - refresh: 'wait_for', + wait_for_completion: true, + refresh: true, body: {}, }); }; From 4d3261083b30567ff81b3fa132259872c27eaab9 Mon Sep 17 00:00:00 2001 From: Frank Hassanabad Date: Fri, 8 May 2020 13:26:31 -0600 Subject: [PATCH 14/65] [SIEM][Detection Engine] Increases the template limit for ECS mappings ## Summary Increases the template limit for ECS mappings from default of 1k to 10k. This mirrors auditbeat, winlogbeat, filebeat, etc.. - [x] [Unit or functional tests](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios ### For maintainers --- .../routes/index/get_signals_template.test.ts | 17 +++++++++++++++-- .../routes/index/get_signals_template.ts | 5 +++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/index/get_signals_template.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/index/get_signals_template.test.ts index 80594ca74a3535..30362392898d13 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/index/get_signals_template.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/index/get_signals_template.test.ts @@ -7,10 +7,18 @@ import { getSignalsTemplate } from './get_signals_template'; describe('get_signals_template', () => { - test('it should set the lifecycle name and the rollover alias to be the name of the index passed in', () => { + test('it should set the lifecycle "name" and "rollover_alias" to be the name of the index passed in', () => { const template = getSignalsTemplate('test-index'); expect(template.settings).toEqual({ - index: { lifecycle: { name: 'test-index', rollover_alias: 'test-index' } }, + index: { + lifecycle: { + name: 'test-index', + rollover_alias: 'test-index', + }, + }, + mapping: { + total_fields: { limit: 10000 }, + }, }); }); @@ -28,4 +36,9 @@ describe('get_signals_template', () => { const template = getSignalsTemplate('test-index'); expect(typeof template.mappings.properties.signal).toEqual('object'); }); + + test('it should have a "total_fields" section that is at least 10k in size', () => { + const template = getSignalsTemplate('test-index'); + expect(template.settings.mapping.total_fields.limit).toBeGreaterThanOrEqual(10000); + }); }); diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/index/get_signals_template.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/index/get_signals_template.ts index c6580f0bdda427..01d7182e253cec 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/index/get_signals_template.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/index/get_signals_template.ts @@ -17,6 +17,11 @@ export const getSignalsTemplate = (index: string) => { rollover_alias: index, }, }, + mapping: { + total_fields: { + limit: 10000, + }, + }, }, index_patterns: [`${index}-*`], mappings: ecsMapping.mappings, From 04f37364fd228ab429bede7eb13768e4ed7f264b Mon Sep 17 00:00:00 2001 From: Nathan L Smith Date: Fri, 8 May 2020 16:16:15 -0500 Subject: [PATCH 15/65] Fix anomalies display on focused APM service map (#65882) The map anomlies rings display was working on the global map and on the focused service of a focused map, but not on the other services on a focused map. This is because we were adding the anomlies to the list of services from the initial query, but not to the list of services derived from the connections data. Make the transformation that add anomalies happen after the derived services nodes are added. This is done in the function that was called `dedupeConnections`, but since it does much more than dedupe connections has been renamed to `transformServiceMapResponses`. Also make the node types extend `cytoscape.NodeDataDefinition` in order to simplify the types in the transformation (we were adding `& { id: string }` in some places which this replaces.) Fixes #65403. --- x-pack/plugins/apm/common/service_map.ts | 9 +-- .../server/lib/service_map/get_service_map.ts | 17 ++--- .../server/lib/service_map/ml_helpers.test.ts | 12 ++-- .../apm/server/lib/service_map/ml_helpers.ts | 9 +-- ...> transform_service_map_responses.test.ts} | 37 +++++++---- ....ts => transform_service_map_responses.ts} | 66 +++++++++++-------- 6 files changed, 85 insertions(+), 65 deletions(-) rename x-pack/plugins/apm/server/lib/service_map/{dedupe_connections/index.test.ts => transform_service_map_responses.test.ts} (83%) rename x-pack/plugins/apm/server/lib/service_map/{dedupe_connections/index.ts => transform_service_map_responses.ts} (76%) diff --git a/x-pack/plugins/apm/common/service_map.ts b/x-pack/plugins/apm/common/service_map.ts index dc457c38a52af4..87db0005fb6566 100644 --- a/x-pack/plugins/apm/common/service_map.ts +++ b/x-pack/plugins/apm/common/service_map.ts @@ -5,22 +5,23 @@ */ import { i18n } from '@kbn/i18n'; +import cytoscape from 'cytoscape'; import { ILicense } from '../../licensing/public'; import { AGENT_NAME, SERVICE_ENVIRONMENT, SERVICE_NAME, + SPAN_DESTINATION_SERVICE_RESOURCE, SPAN_SUBTYPE, - SPAN_TYPE, - SPAN_DESTINATION_SERVICE_RESOURCE + SPAN_TYPE } from './elasticsearch_fieldnames'; -export interface ServiceConnectionNode { +export interface ServiceConnectionNode extends cytoscape.NodeDataDefinition { [SERVICE_NAME]: string; [SERVICE_ENVIRONMENT]: string | null; [AGENT_NAME]: string; } -export interface ExternalConnectionNode { +export interface ExternalConnectionNode extends cytoscape.NodeDataDefinition { [SPAN_DESTINATION_SERVICE_RESOURCE]: string; [SPAN_TYPE]: string; [SPAN_SUBTYPE]: string; diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts index 7d5f0a75d2208c..8fb44b70bc0812 100644 --- a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts +++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts @@ -9,16 +9,15 @@ import { SERVICE_ENVIRONMENT, SERVICE_NAME } from '../../../common/elasticsearch_fieldnames'; +import { getMlIndex } from '../../../common/ml_job_constants'; import { getServicesProjection } from '../../../common/projections/services'; import { mergeProjection } from '../../../common/projections/util/merge_projection'; import { PromiseReturnType } from '../../../typings/common'; +import { rangeFilter } from '../helpers/range_filter'; import { Setup, SetupTimeRange } from '../helpers/setup_request'; -import { dedupeConnections } from './dedupe_connections'; +import { transformServiceMapResponses } from './transform_service_map_responses'; import { getServiceMapFromTraceIds } from './get_service_map_from_trace_ids'; import { getTraceSampleIds } from './get_trace_sample_ids'; -import { addAnomaliesToServicesData } from './ml_helpers'; -import { getMlIndex } from '../../../common/ml_job_constants'; -import { rangeFilter } from '../helpers/range_filter'; export interface IEnvOptions { setup: Setup & SetupTimeRange; @@ -179,13 +178,9 @@ export async function getServiceMap(options: IEnvOptions) { getAnomaliesData(options) ]); - const servicesDataWithAnomalies = addAnomaliesToServicesData( - servicesData, - anomaliesData - ); - - return dedupeConnections({ + return transformServiceMapResponses({ ...connectionData, - services: servicesDataWithAnomalies + anomalies: anomaliesData, + services: servicesData }); } diff --git a/x-pack/plugins/apm/server/lib/service_map/ml_helpers.test.ts b/x-pack/plugins/apm/server/lib/service_map/ml_helpers.test.ts index c80ba8dba01eaa..908dbe6df4636b 100644 --- a/x-pack/plugins/apm/server/lib/service_map/ml_helpers.test.ts +++ b/x-pack/plugins/apm/server/lib/service_map/ml_helpers.test.ts @@ -5,11 +5,11 @@ */ import { AnomaliesResponse } from './get_service_map'; -import { addAnomaliesToServicesData } from './ml_helpers'; +import { addAnomaliesDataToNodes } from './ml_helpers'; -describe('addAnomaliesToServicesData', () => { - it('adds anomalies to services data', () => { - const servicesData = [ +describe('addAnomaliesDataToNodes', () => { + it('adds anomalies to nodes', () => { + const nodes = [ { 'service.name': 'opbeans-ruby', 'agent.name': 'ruby', @@ -89,8 +89,8 @@ describe('addAnomaliesToServicesData', () => { ]; expect( - addAnomaliesToServicesData( - servicesData, + addAnomaliesDataToNodes( + nodes, (anomaliesResponse as unknown) as AnomaliesResponse ) ).toEqual(result); diff --git a/x-pack/plugins/apm/server/lib/service_map/ml_helpers.ts b/x-pack/plugins/apm/server/lib/service_map/ml_helpers.ts index 9789911660bd03..fae9e7d4cb1c61 100644 --- a/x-pack/plugins/apm/server/lib/service_map/ml_helpers.ts +++ b/x-pack/plugins/apm/server/lib/service_map/ml_helpers.ts @@ -9,10 +9,11 @@ import { getMlJobServiceName, getSeverity } from '../../../common/ml_job_constants'; -import { AnomaliesResponse, ServicesResponse } from './get_service_map'; +import { ConnectionNode } from '../../../common/service_map'; +import { AnomaliesResponse } from './get_service_map'; -export function addAnomaliesToServicesData( - servicesData: ServicesResponse, +export function addAnomaliesDataToNodes( + nodes: ConnectionNode[], anomaliesResponse: AnomaliesResponse ) { const anomaliesMap = ( @@ -52,7 +53,7 @@ export function addAnomaliesToServicesData( }; }, {}); - const servicesDataWithAnomalies = servicesData.map(service => { + const servicesDataWithAnomalies = nodes.map(service => { const serviceAnomalies = anomaliesMap[service[SERVICE_NAME]]; if (serviceAnomalies) { const maxScore = serviceAnomalies.max_score; diff --git a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.test.ts b/x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.test.ts similarity index 83% rename from x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.test.ts rename to x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.test.ts index 4af8a541392042..45b64c1ad03a42 100644 --- a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.test.ts +++ b/x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.test.ts @@ -4,16 +4,19 @@ * you may not use this file except in compliance with the Elastic License. */ -import { ServiceMapResponse } from './'; import { - SPAN_DESTINATION_SERVICE_RESOURCE, - SERVICE_NAME, - SERVICE_ENVIRONMENT, AGENT_NAME, - SPAN_TYPE, - SPAN_SUBTYPE -} from '../../../../common/elasticsearch_fieldnames'; -import { dedupeConnections } from './'; + SERVICE_ENVIRONMENT, + SERVICE_NAME, + SPAN_DESTINATION_SERVICE_RESOURCE, + SPAN_SUBTYPE, + SPAN_TYPE +} from '../../../common/elasticsearch_fieldnames'; +import { AnomaliesResponse } from './get_service_map'; +import { + transformServiceMapResponses, + ServiceMapResponse +} from './transform_service_map_responses'; const nodejsService = { [SERVICE_NAME]: 'opbeans-node', @@ -33,9 +36,14 @@ const javaService = { [AGENT_NAME]: 'java' }; -describe('dedupeConnections', () => { +const anomalies = ({ + aggregations: { jobs: { buckets: [] } } +} as unknown) as AnomaliesResponse; + +describe('transformServiceMapResponses', () => { it('maps external destinations to internal services', () => { const response: ServiceMapResponse = { + anomalies, services: [nodejsService, javaService], discoveredServices: [ { @@ -51,7 +59,7 @@ describe('dedupeConnections', () => { ] }; - const { elements } = dedupeConnections(response); + const { elements } = transformServiceMapResponses(response); const connection = elements.find( element => 'source' in element.data && 'target' in element.data @@ -67,6 +75,7 @@ describe('dedupeConnections', () => { it('collapses external destinations based on span.destination.resource.name', () => { const response: ServiceMapResponse = { + anomalies, services: [nodejsService, javaService], discoveredServices: [ { @@ -89,7 +98,7 @@ describe('dedupeConnections', () => { ] }; - const { elements } = dedupeConnections(response); + const { elements } = transformServiceMapResponses(response); const connections = elements.filter(element => 'source' in element.data); @@ -102,6 +111,7 @@ describe('dedupeConnections', () => { it('picks the first span.type/subtype in an alphabetically sorted list', () => { const response: ServiceMapResponse = { + anomalies, services: [javaService], discoveredServices: [], connections: [ @@ -126,7 +136,7 @@ describe('dedupeConnections', () => { ] }; - const { elements } = dedupeConnections(response); + const { elements } = transformServiceMapResponses(response); const nodes = elements.filter(element => !('source' in element.data)); @@ -140,6 +150,7 @@ describe('dedupeConnections', () => { it('processes connections without a matching "service" aggregation', () => { const response: ServiceMapResponse = { + anomalies, services: [javaService], discoveredServices: [], connections: [ @@ -150,7 +161,7 @@ describe('dedupeConnections', () => { ] }; - const { elements } = dedupeConnections(response); + const { elements } = transformServiceMapResponses(response); expect(elements.length).toBe(3); }); diff --git a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.ts b/x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.ts similarity index 76% rename from x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.ts rename to x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.ts index e5d7c0b2de10cb..8b91bb98b5200d 100644 --- a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections/index.ts +++ b/x-pack/plugins/apm/server/lib/service_map/transform_service_map_responses.ts @@ -10,14 +10,19 @@ import { SPAN_DESTINATION_SERVICE_RESOURCE, SPAN_TYPE, SPAN_SUBTYPE -} from '../../../../common/elasticsearch_fieldnames'; +} from '../../../common/elasticsearch_fieldnames'; import { Connection, ConnectionNode, ServiceConnectionNode, ExternalConnectionNode -} from '../../../../common/service_map'; -import { ConnectionsResponse, ServicesResponse } from '../get_service_map'; +} from '../../../common/service_map'; +import { + ConnectionsResponse, + ServicesResponse, + AnomaliesResponse +} from './get_service_map'; +import { addAnomaliesDataToNodes } from './ml_helpers'; function getConnectionNodeId(node: ConnectionNode): string { if ('span.destination.service.resource' in node) { @@ -34,13 +39,16 @@ function getConnectionId(connection: Connection) { } export type ServiceMapResponse = ConnectionsResponse & { + anomalies: AnomaliesResponse; services: ServicesResponse; }; -export function dedupeConnections(response: ServiceMapResponse) { - const { discoveredServices, services, connections } = response; +export function transformServiceMapResponses(response: ServiceMapResponse) { + const { anomalies, discoveredServices, services, connections } = response; - const allNodes = connections + // Derive the rest of the map nodes from the connections and add the services + // from the services data query + const allNodes: ConnectionNode[] = connections .flatMap(connection => [connection.source, connection.destination]) .map(node => ({ ...node, id: getConnectionNodeId(node) })) .concat( @@ -50,25 +58,21 @@ export function dedupeConnections(response: ServiceMapResponse) { })) ); - const serviceNodes = allNodes.filter(node => SERVICE_NAME in node) as Array< - ServiceConnectionNode & { - id: string; - } - >; + // List of nodes that are services + const serviceNodes = allNodes.filter( + node => SERVICE_NAME in node + ) as ServiceConnectionNode[]; + // List of nodes that are externals const externalNodes = allNodes.filter( node => SPAN_DESTINATION_SERVICE_RESOURCE in node - ) as Array< - ExternalConnectionNode & { - id: string; - } - >; + ) as ExternalConnectionNode[]; - // 1. maps external nodes to internal services - // 2. collapses external nodes into one node based on span.destination.service.resource - // 3. picks the first available span.type/span.subtype in an alphabetically sorted list + // 1. Map external nodes to internal services + // 2. Collapse external nodes into one node based on span.destination.service.resource + // 3. Pick the first available span.type/span.subtype in an alphabetically sorted list const nodeMap = allNodes.reduce((map, node) => { - if (map[node.id]) { + if (!node.id || map[node.id]) { return map; } @@ -119,14 +123,14 @@ export function dedupeConnections(response: ServiceMapResponse) { .sort()[0] } }; - }, {} as Record); + }, {} as Record); - // maps destination.address to service.name if possible + // Map destination.address to service.name if possible function getConnectionNode(node: ConnectionNode) { return nodeMap[getConnectionNodeId(node)]; } - // build connections with mapped nodes + // Build connections with mapped nodes const mappedConnections = connections .map(connection => { const sourceData = getConnectionNode(connection.source); @@ -166,7 +170,7 @@ export function dedupeConnections(response: ServiceMapResponse) { {} as Record ); - // instead of adding connections in two directions, + // Instead of adding connections in two directions, // we add a `bidirectional` flag to use in styling const dedupedConnections = (sortBy( Object.values(connectionsById), @@ -192,10 +196,18 @@ export function dedupeConnections(response: ServiceMapResponse) { return prev.concat(connection); }, []); + // Add anomlies data + const dedupedNodesWithAnomliesData = addAnomaliesDataToNodes( + dedupedNodes, + anomalies + ); + // Put everything together in elements, with everything in the "data" property - const elements = [...dedupedConnections, ...dedupedNodes].map(element => ({ - data: element - })); + const elements = [...dedupedConnections, ...dedupedNodesWithAnomliesData].map( + element => ({ + data: element + }) + ); return { elements }; } From 5e5ad194f6358ca32d3fa5728eabf8320ea6901a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20C=C3=B4t=C3=A9?= Date: Sat, 9 May 2020 12:32:26 -0400 Subject: [PATCH 16/65] Fix edit alert flyout to update initialAlert after edit (#65359) --- .../components/alert_details.tsx | 41 ++++++++++--------- .../sections/alert_form/alert_edit.test.tsx | 6 +-- .../sections/alert_form/alert_edit.tsx | 17 ++------ 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx index 3440bb28b24684..8511ab468ca802 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.tsx @@ -127,26 +127,27 @@ export const AlertDetails: React.FunctionComponent = ({ defaultMessage="Edit" /> - - - + {editFlyoutVisible && ( + + setEditFlyoutVisibility(false)} + /> + + )} ) : null} diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx index 722db146a54cee..4d8801d8b7484d 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx @@ -131,11 +131,7 @@ describe('alert_edit', () => { capabilities: deps!.capabilities, }} > - {}} - initialAlert={alert} - /> + {}} initialAlert={alert} /> ); diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx index 00bc9874face19..747464d2212f40 100644 --- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx +++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx @@ -31,15 +31,10 @@ import { PLUGIN } from '../../constants/plugin'; interface AlertEditProps { initialAlert: Alert; - editFlyoutVisible: boolean; - setEditFlyoutVisibility: React.Dispatch>; + onClose(): void; } -export const AlertEdit = ({ - initialAlert, - editFlyoutVisible, - setEditFlyoutVisibility, -}: AlertEditProps) => { +export const AlertEdit = ({ initialAlert, onClose }: AlertEditProps) => { const [{ alert }, dispatch] = useReducer(alertReducer, { alert: initialAlert }); const [isSaving, setIsSaving] = useState(false); const [hasActionsDisabled, setHasActionsDisabled] = useState(false); @@ -57,14 +52,10 @@ export const AlertEdit = ({ } = useAlertsContext(); const closeFlyout = useCallback(() => { - setEditFlyoutVisibility(false); + onClose(); setAlert('alert', initialAlert); // eslint-disable-next-line react-hooks/exhaustive-deps - }, [setEditFlyoutVisibility]); - - if (!editFlyoutVisible) { - return null; - } + }, [onClose]); const alertType = alertTypeRegistry.get(alert.alertTypeId); From ef1800be7693ce1e72a8fb9afd89928b071213fe Mon Sep 17 00:00:00 2001 From: Shahzad Date: Sun, 10 May 2020 16:39:17 +0200 Subject: [PATCH 17/65] [Uptime] Settings threshold validation (#65454) --- x-pack/plugins/uptime/common/translations.ts | 14 +++++++ .../components/settings/certificate_form.tsx | 14 ++++--- .../plugins/uptime/public/pages/settings.tsx | 39 +++++++++++-------- .../uptime/public/pages/translations.ts | 4 ++ .../server/rest_api/dynamic_settings.ts | 29 +++++++++++--- 5 files changed, 71 insertions(+), 29 deletions(-) create mode 100644 x-pack/plugins/uptime/common/translations.ts diff --git a/x-pack/plugins/uptime/common/translations.ts b/x-pack/plugins/uptime/common/translations.ts new file mode 100644 index 00000000000000..678fe7cb1f984b --- /dev/null +++ b/x-pack/plugins/uptime/common/translations.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { i18n } from '@kbn/i18n'; + +export const VALUE_MUST_BE_GREATER_THEN_ZEO = i18n.translate( + 'xpack.uptime.settings.invalid.error', + { + defaultMessage: 'Value must be greater than 0.', + } +); diff --git a/x-pack/plugins/uptime/public/components/settings/certificate_form.tsx b/x-pack/plugins/uptime/public/components/settings/certificate_form.tsx index 5bfd26f7c6401b..8200e8292cd987 100644 --- a/x-pack/plugins/uptime/public/components/settings/certificate_form.tsx +++ b/x-pack/plugins/uptime/public/components/settings/certificate_form.tsx @@ -59,7 +59,7 @@ export const CertificateExpirationForm: React.FC = ({ > = ({ }} /> } - isInvalid={!!fieldErrors?.certificatesThresholds?.expirationThresholdError} + isInvalid={!!fieldErrors?.expirationThresholdError} label={ = ({ = ({ = ({ }} /> } - isInvalid={!!fieldErrors?.certificatesThresholds?.ageThresholdError} + isInvalid={!!fieldErrors?.ageThresholdError} label={ = ({ + onChange={({ currentTarget: { value } }) => onChange({ - certAgeThreshold: Number(e.currentTarget.value), + certAgeThreshold: Number(value), }) } /> diff --git a/x-pack/plugins/uptime/public/pages/settings.tsx b/x-pack/plugins/uptime/public/pages/settings.tsx index 7ed9cf44443435..d018567ae11043 100644 --- a/x-pack/plugins/uptime/public/pages/settings.tsx +++ b/x-pack/plugins/uptime/public/pages/settings.tsx @@ -32,13 +32,12 @@ import { OnFieldChangeType, } from '../components/settings/certificate_form'; import * as Translations from './translations'; +import { VALUE_MUST_BE_GREATER_THEN_ZEO } from '../../common/translations'; interface SettingsPageFieldErrors { - heartbeatIndices: 'May not be blank' | ''; - certificatesThresholds: { - expirationThresholdError: string | null; - ageThresholdError: string | null; - } | null; + heartbeatIndices: string | ''; + expirationThresholdError?: string; + ageThresholdError?: string; } export interface SettingsFormProps { @@ -49,22 +48,28 @@ export interface SettingsFormProps { isDisabled: boolean; } +const isValidCertVal = (val: string | number) => { + if (val === '') { + return Translations.BLANK_STR; + } + if (val === 0) { + return VALUE_MUST_BE_GREATER_THEN_ZEO; + } +}; + const getFieldErrors = (formFields: DynamicSettings | null): SettingsPageFieldErrors | null => { if (formFields) { - const blankStr = 'May not be blank'; const { certAgeThreshold, certExpirationThreshold, heartbeatIndices } = formFields; - const heartbeatIndErr = heartbeatIndices.match(/^\S+$/) ? '' : blankStr; - const expirationThresholdError = certExpirationThreshold ? null : blankStr; - const ageThresholdError = certAgeThreshold ? null : blankStr; + + const indError = heartbeatIndices.match(/^\S+$/) ? '' : Translations.BLANK_STR; + + const expError = isValidCertVal(certExpirationThreshold); + const ageError = isValidCertVal(certAgeThreshold); + return { - heartbeatIndices: heartbeatIndErr, - certificatesThresholds: - expirationThresholdError || ageThresholdError - ? { - expirationThresholdError, - ageThresholdError, - } - : null, + heartbeatIndices: indError, + expirationThresholdError: expError, + ageThresholdError: ageError, }; } return null; diff --git a/x-pack/plugins/uptime/public/pages/translations.ts b/x-pack/plugins/uptime/public/pages/translations.ts index 74fb2eeb1416bd..8ed5503235884c 100644 --- a/x-pack/plugins/uptime/public/pages/translations.ts +++ b/x-pack/plugins/uptime/public/pages/translations.ts @@ -36,3 +36,7 @@ export const settings = { defaultMessage: 'Return to overview', }), }; + +export const BLANK_STR = i18n.translate('xpack.uptime.settings.blank.error', { + defaultMessage: 'May not be blank.', +}); diff --git a/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts b/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts index 31833a25ee8acf..c7d532d932aa64 100644 --- a/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts +++ b/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts @@ -11,6 +11,7 @@ import { UMServerLibs } from '../lib/lib'; import { DynamicSettings, DynamicSettingsType } from '../../common/runtime_types'; import { UMRestApiRouteFactory } from '.'; import { savedObjectsAdapter } from '../lib/saved_objects'; +import { VALUE_MUST_BE_GREATER_THEN_ZEO } from '../../common/translations'; export const createGetDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({ method: 'GET', @@ -23,19 +24,35 @@ export const createGetDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMSer }, }); +const validateCertsValues = (settings: DynamicSettings) => { + const errors: any = {}; + if (settings.certAgeThreshold <= 0) { + errors.certAgeThreshold = VALUE_MUST_BE_GREATER_THEN_ZEO; + } + if (settings.certExpirationThreshold <= 0) { + errors.certExpirationThreshold = VALUE_MUST_BE_GREATER_THEN_ZEO; + } + if (errors.certAgeThreshold || errors.certExpirationThreshold) { + return errors; + } +}; + export const createPostDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({ method: 'POST', path: '/api/uptime/dynamic_settings', validate: { - body: schema.object({}, { unknowns: 'allow' }), + body: schema.object({ + heartbeatIndices: schema.string(), + certAgeThreshold: schema.number(), + certExpirationThreshold: schema.number(), + }), }, writeAccess: true, - options: { - tags: ['access:uptime-write'], - }, handler: async ({ savedObjectsClient }, _context, request, response): Promise => { const decoded = DynamicSettingsType.decode(request.body); - if (isRight(decoded)) { + const certThresholdErrors = validateCertsValues(request.body as DynamicSettings); + + if (isRight(decoded) && !certThresholdErrors) { const newSettings: DynamicSettings = decoded.right; await savedObjectsAdapter.setUptimeDynamicSettings(savedObjectsClient, newSettings); @@ -47,7 +64,7 @@ export const createPostDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMSe } else { const error = PathReporter.report(decoded).join(', '); return response.badRequest({ - body: error, + body: JSON.stringify(certThresholdErrors) || error, }); } }, From 1c554d9964516c9b590e5c84c0a71cf522f9a9bc Mon Sep 17 00:00:00 2001 From: Josh Dover Date: Sun, 10 May 2020 14:00:49 -0600 Subject: [PATCH 18/65] Mount ui/new_platform applications in same div structure as Core (#63930) --- .../public/new_platform/new_platform.test.ts | 19 ++++++++++++++++--- .../ui/public/new_platform/new_platform.ts | 3 ++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/legacy/ui/public/new_platform/new_platform.test.ts b/src/legacy/ui/public/new_platform/new_platform.test.ts index 1629aac588a617..21e7b559f71f5f 100644 --- a/src/legacy/ui/public/new_platform/new_platform.test.ts +++ b/src/legacy/ui/public/new_platform/new_platform.test.ts @@ -22,6 +22,7 @@ jest.mock('history'); import { setRootControllerMock, historyMock } from './new_platform.test.mocks'; import { legacyAppRegister, __reset__, __setup__, __start__ } from './new_platform'; import { coreMock } from '../../../../core/public/mocks'; +import { AppMount } from '../../../../core/public'; describe('ui/new_platform', () => { describe('legacyAppRegister', () => { @@ -33,7 +34,7 @@ describe('ui/new_platform', () => { const registerApp = () => { const unmountMock = jest.fn(); - const mountMock = jest.fn(() => unmountMock); + const mountMock = jest.fn, Parameters>(() => unmountMock); legacyAppRegister({ id: 'test', title: 'Test', @@ -62,13 +63,25 @@ describe('ui/new_platform', () => { controller(scopeMock, elementMock); expect(mountMock).toHaveBeenCalledWith({ - element: elementMock[0], + element: expect.any(HTMLElement), appBasePath: '/test/base/path/app/test', onAppLeave: expect.any(Function), history: historyMock, }); }); + test('app is mounted in new div inside containing element', () => { + const { mountMock } = registerApp(); + const controller = setRootControllerMock.mock.calls[0][1]; + const scopeMock = { $on: jest.fn() }; + const elementMock = [document.createElement('div')]; + + controller(scopeMock, elementMock); + + const { element } = mountMock.mock.calls[0][0]; + expect(element.parentElement).toEqual(elementMock[0]); + }); + test('controller calls deprecated context app.mount when invoked', () => { const unmountMock = jest.fn(); // Two arguments changes how this is called. @@ -84,7 +97,7 @@ describe('ui/new_platform', () => { controller(scopeMock, elementMock); expect(mountMock).toHaveBeenCalledWith(expect.any(Object), { - element: elementMock[0], + element: expect.any(HTMLElement), appBasePath: '/test/base/path/app/test', onAppLeave: expect.any(Function), history: historyMock, diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts index a15c7cce5511d9..1eb46e1a438955 100644 --- a/src/legacy/ui/public/new_platform/new_platform.ts +++ b/src/legacy/ui/public/new_platform/new_platform.ts @@ -176,7 +176,8 @@ export const legacyAppRegister = (app: App) => { legacyAppRegistered = true; require('ui/chrome').setRootController(app.id, ($scope: IScope, $element: JQLite) => { - const element = $element[0]; + const element = document.createElement('div'); + $element[0].appendChild(element); // Root controller cannot return a Promise so use an internal async function and call it immediately (async () => { From faaa12729e3d1d6752f4b40c1dd973db2705031c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= Date: Sun, 10 May 2020 22:50:43 +0200 Subject: [PATCH 19/65] Point 7.x to 7.9.0 in .backportrc.json --- .backportrc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.backportrc.json b/.backportrc.json index 0894909d2aac40..87bc3a1be583ba 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -25,7 +25,7 @@ ], "targetPRLabels": ["backport"], "branchLabelMapping": { - "^v7.8.0$": "7.x", + "^v7.9.0$": "7.x", "^v(\\d+).(\\d+).\\d+$": "$1.$2" } } From e5b4054a8e8899d9e4353d077464bb840d4b067e Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Mon, 11 May 2020 09:36:45 +0200 Subject: [PATCH 20/65] fix double flyouts in add panel flow (#65861) Co-authored-by: Elastic Machine --- .../add_panel/add_panel_flyout.test.tsx | 4 ++++ .../panel_actions/add_panel/add_panel_flyout.tsx | 12 +++--------- .../add_panel/open_add_panel_flyout.tsx | 3 ++- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx index 282b0f05891e02..3894d6fbed382c 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx @@ -18,6 +18,7 @@ */ import * as React from 'react'; +import { EuiFlyout } from '@elastic/eui'; import { AddPanelFlyout } from './add_panel_flyout'; import { ContactCardEmbeddableFactory, @@ -75,6 +76,9 @@ test('createNewEmbeddable() add embeddable to container', async () => { /> ) as ReactWrapper; + // https://github.com/elastic/kibana/issues/64789 + expect(component.exists(EuiFlyout)).toBe(false); + expect(Object.values(container.getInput().panels).length).toBe(0); component.instance().createNewEmbeddable(CONTACT_CARD_EMBEDDABLE); await new Promise(r => setTimeout(r, 1)); diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx index 5bf3f69a95c303..4c23916675e8ff 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx @@ -21,13 +21,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React, { ReactElement } from 'react'; import { CoreSetup } from 'src/core/public'; -import { - EuiContextMenuItem, - EuiFlyout, - EuiFlyoutBody, - EuiFlyoutHeader, - EuiTitle, -} from '@elastic/eui'; +import { EuiContextMenuItem, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui'; import { EmbeddableStart } from 'src/plugins/embeddable/public'; import { IContainer } from '../../../../containers'; @@ -152,7 +146,7 @@ export class AddPanelFlyout extends React.Component { ); return ( - + <>

@@ -161,7 +155,7 @@ export class AddPanelFlyout extends React.Component { {savedObjectsFinder} - + ); } } diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx index a452e07b515771..867092b78ef7a8 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/open_add_panel_flyout.tsx @@ -55,7 +55,8 @@ export async function openAddPanelFlyout(options: { /> ), { - 'data-test-subj': 'addPanelFlyout', + 'data-test-subj': 'dashboardAddPanel', + ownFocus: true, } ); } From 387e28a6a419eab942fd4b6088a2523719242d00 Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Mon, 11 May 2020 10:12:59 +0200 Subject: [PATCH 21/65] [Drilldowns][chore] import dashboard url generator from plugin contract (#64628) Co-authored-by: Elastic Machine --- src/plugins/dashboard/public/index.ts | 2 +- src/plugins/dashboard/public/plugin.tsx | 19 ++++++++--- .../dashboard/public/url_generator.test.ts | 24 ++++++------- src/plugins/dashboard/public/url_generator.ts | 2 +- .../url_generator_service.test.ts | 18 ++++++++-- .../url_generators/url_generator_service.ts | 11 +++--- .../dashboard_enhanced/public/plugin.ts | 2 ++ .../dashboard_drilldowns_services.ts | 11 +++++- .../drilldown.test.tsx | 34 ++++++++----------- .../drilldown.tsx | 9 +++-- 10 files changed, 82 insertions(+), 50 deletions(-) diff --git a/src/plugins/dashboard/public/index.ts b/src/plugins/dashboard/public/index.ts index 44733499cdcba4..e093342f957358 100644 --- a/src/plugins/dashboard/public/index.ts +++ b/src/plugins/dashboard/public/index.ts @@ -31,7 +31,7 @@ export { } from './application'; export { DashboardConstants, createDashboardEditUrl } from './dashboard_constants'; -export { DashboardStart } from './plugin'; +export { DashboardStart, DashboardUrlGenerator } from './plugin'; export { DASHBOARD_APP_URL_GENERATOR } from './url_generator'; export function plugin(initializerContext: PluginInitializerContext) { diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx index b28822120b31e6..894440cfa9cbbf 100644 --- a/src/plugins/dashboard/public/plugin.tsx +++ b/src/plugins/dashboard/public/plugin.tsx @@ -42,7 +42,11 @@ import { DataPublicPluginSetup, esFilters, } from '../../../plugins/data/public'; -import { SharePluginSetup, SharePluginStart } from '../../../plugins/share/public'; +import { + SharePluginSetup, + SharePluginStart, + UrlGeneratorContract, +} from '../../../plugins/share/public'; import { UiActionsSetup, UiActionsStart } from '../../../plugins/ui_actions/public'; import { Start as InspectorStartContract } from '../../../plugins/inspector/public'; @@ -77,7 +81,7 @@ import { import { DashboardAppLinkGeneratorState, DASHBOARD_APP_URL_GENERATOR, - createDirectAccessDashboardLinkGenerator, + createDashboardUrlGenerator, } from './url_generator'; import { createSavedDashboardLoader } from './saved_dashboards'; import { DashboardConstants } from './dashboard_constants'; @@ -89,6 +93,8 @@ declare module '../../share/public' { } } +export type DashboardUrlGenerator = UrlGeneratorContract; + interface SetupDependencies { data: DataPublicPluginSetup; embeddable: EmbeddableSetup; @@ -111,8 +117,10 @@ interface StartDependencies { } export type Setup = void; + export interface DashboardStart { getSavedDashboardLoader: () => SavedObjectLoader; + dashboardUrlGenerator?: DashboardUrlGenerator; } declare module '../../../plugins/ui_actions/public' { @@ -130,6 +138,8 @@ export class DashboardPlugin private appStateUpdater = new BehaviorSubject(() => ({})); private stopUrlTracking: (() => void) | undefined = undefined; + private dashboardUrlGenerator?: DashboardUrlGenerator; + public setup( core: CoreSetup, { share, uiActions, embeddable, home, kibanaLegacy, data, usageCollection }: SetupDependencies @@ -140,8 +150,8 @@ export class DashboardPlugin const startServices = core.getStartServices(); if (share) { - share.urlGenerators.registerUrlGenerator( - createDirectAccessDashboardLinkGenerator(async () => { + this.dashboardUrlGenerator = share.urlGenerators.registerUrlGenerator( + createDashboardUrlGenerator(async () => { const [coreStart, , selfStart] = await startServices; return { appBasePath: coreStart.application.getUrlForApp('dashboard'), @@ -325,6 +335,7 @@ export class DashboardPlugin }); return { getSavedDashboardLoader: () => savedDashboardLoader, + dashboardUrlGenerator: this.dashboardUrlGenerator, }; } diff --git a/src/plugins/dashboard/public/url_generator.test.ts b/src/plugins/dashboard/public/url_generator.test.ts index 248a3f991d6cbf..68d447c4a13361 100644 --- a/src/plugins/dashboard/public/url_generator.test.ts +++ b/src/plugins/dashboard/public/url_generator.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { createDirectAccessDashboardLinkGenerator } from './url_generator'; +import { createDashboardUrlGenerator } from './url_generator'; import { hashedItemStore } from '../../kibana_utils/public'; // eslint-disable-next-line import { mockStorage } from '../../kibana_utils/public/storage/hashed_item_store/mock'; @@ -55,7 +55,7 @@ describe('dashboard url generator', () => { }); test('creates a link to a saved dashboard', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: false, @@ -67,7 +67,7 @@ describe('dashboard url generator', () => { }); test('creates a link with global time range set up', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: false, @@ -83,7 +83,7 @@ describe('dashboard url generator', () => { }); test('creates a link with filters, time range, refresh interval and query to a saved object', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: false, @@ -123,7 +123,7 @@ describe('dashboard url generator', () => { }); test('if no useHash setting is given, uses the one was start services', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: true, @@ -137,7 +137,7 @@ describe('dashboard url generator', () => { }); test('can override a false useHash ui setting', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: false, @@ -152,7 +152,7 @@ describe('dashboard url generator', () => { }); test('can override a true useHash ui setting', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: true, @@ -195,7 +195,7 @@ describe('dashboard url generator', () => { }; test('attaches filters from destination dashboard', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: false, @@ -224,7 +224,7 @@ describe('dashboard url generator', () => { }); test("doesn't fail if can't retrieve filters from destination dashboard", async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: false, @@ -246,7 +246,7 @@ describe('dashboard url generator', () => { }); test('can enforce empty filters', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: false, @@ -270,7 +270,7 @@ describe('dashboard url generator', () => { }); test('no filters in result url if no filters applied', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: false, @@ -288,7 +288,7 @@ describe('dashboard url generator', () => { }); test('can turn off preserving filters', async () => { - const generator = createDirectAccessDashboardLinkGenerator(() => + const generator = createDashboardUrlGenerator(() => Promise.resolve({ appBasePath: APP_BASE_PATH, useHashedUrl: false, diff --git a/src/plugins/dashboard/public/url_generator.ts b/src/plugins/dashboard/public/url_generator.ts index 6f121ceb2d3731..9d66f2df65777b 100644 --- a/src/plugins/dashboard/public/url_generator.ts +++ b/src/plugins/dashboard/public/url_generator.ts @@ -75,7 +75,7 @@ export type DashboardAppLinkGeneratorState = UrlGeneratorState<{ preserveSavedFilters?: boolean; }>; -export const createDirectAccessDashboardLinkGenerator = ( +export const createDashboardUrlGenerator = ( getStartServices: () => Promise<{ appBasePath: string; useHashedUrl: boolean; diff --git a/src/plugins/share/public/url_generators/url_generator_service.test.ts b/src/plugins/share/public/url_generators/url_generator_service.test.ts index 4a377db033762f..d256dcf5f7aa0a 100644 --- a/src/plugins/share/public/url_generators/url_generator_service.test.ts +++ b/src/plugins/share/public/url_generators/url_generator_service.test.ts @@ -30,11 +30,11 @@ test('Asking for a generator that does not exist throws an error', () => { }); test('Registering and retrieving a generator', async () => { - setup.registerUrlGenerator({ + const generator = setup.registerUrlGenerator({ id: 'TEST_GENERATOR', createUrl: () => Promise.resolve('myurl'), }); - const generator = start.getUrlGenerator('TEST_GENERATOR'); + expect(generator).toMatchInlineSnapshot(` Object { "createUrl": [Function], @@ -47,6 +47,20 @@ test('Registering and retrieving a generator', async () => { new Error('You cannot call migrate on a non-deprecated generator.') ); expect(await generator.createUrl({})).toBe('myurl'); + + const retrievedGenerator = start.getUrlGenerator('TEST_GENERATOR'); + expect(retrievedGenerator).toMatchInlineSnapshot(` + Object { + "createUrl": [Function], + "id": "TEST_GENERATOR", + "isDeprecated": false, + "migrate": [Function], + } + `); + await expect(generator.migrate({})).rejects.toEqual( + new Error('You cannot call migrate on a non-deprecated generator.') + ); + expect(await generator.createUrl({})).toBe('myurl'); }); test('Registering a generator with a createUrl function that is deprecated throws an error', () => { diff --git a/src/plugins/share/public/url_generators/url_generator_service.ts b/src/plugins/share/public/url_generators/url_generator_service.ts index 332750671cee39..13c1b94acdd07e 100644 --- a/src/plugins/share/public/url_generators/url_generator_service.ts +++ b/src/plugins/share/public/url_generators/url_generator_service.ts @@ -28,7 +28,9 @@ export interface UrlGeneratorsStart { } export interface UrlGeneratorsSetup { - registerUrlGenerator: (generator: UrlGeneratorsDefinition) => void; + registerUrlGenerator: ( + generator: UrlGeneratorsDefinition + ) => UrlGeneratorContract; } export class UrlGeneratorsService implements Plugin { @@ -43,10 +45,9 @@ export class UrlGeneratorsService implements Plugin( generatorOptions: UrlGeneratorsDefinition ) => { - this.urlGenerators.set( - generatorOptions.id, - new UrlGeneratorInternal(generatorOptions, this.getUrlGenerator) - ); + const generator = new UrlGeneratorInternal(generatorOptions, this.getUrlGenerator); + this.urlGenerators.set(generatorOptions.id, generator); + return generator.getPublicContract(); }, }; return setup; diff --git a/x-pack/plugins/dashboard_enhanced/public/plugin.ts b/x-pack/plugins/dashboard_enhanced/public/plugin.ts index 772e032289bcee..c258a4148f84a0 100644 --- a/x-pack/plugins/dashboard_enhanced/public/plugin.ts +++ b/x-pack/plugins/dashboard_enhanced/public/plugin.ts @@ -11,6 +11,7 @@ import { DashboardDrilldownsService } from './services'; import { DataPublicPluginStart } from '../../../../src/plugins/data/public'; import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '../../advanced_ui_actions/public'; import { DrilldownsSetup, DrilldownsStart } from '../../drilldowns/public'; +import { DashboardStart } from '../../../../src/plugins/dashboard/public'; export interface SetupDependencies { advancedUiActions: AdvancedUiActionsSetup; @@ -25,6 +26,7 @@ export interface StartDependencies { drilldowns: DrilldownsStart; embeddable: EmbeddableStart; share: SharePluginStart; + dashboard: DashboardStart; } // eslint-disable-next-line diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts index 0161836b2c5b97..f5926cd6961c2d 100644 --- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts +++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_drilldowns_services.ts @@ -44,6 +44,12 @@ export class DashboardDrilldownsService { { advancedUiActions: uiActions }: SetupDependencies ) { const start = createStartServicesGetter(core.getStartServices); + const getDashboardUrlGenerator = () => { + const urlGenerator = start().plugins.dashboard.dashboardUrlGenerator; + if (!urlGenerator) + throw new Error('dashboardUrlGenerator is required for dashboard to dashboard drilldown'); + return urlGenerator; + }; const actionFlyoutCreateDrilldown = new FlyoutCreateDrilldownAction({ start }); uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, actionFlyoutCreateDrilldown); @@ -51,7 +57,10 @@ export class DashboardDrilldownsService { const actionFlyoutEditDrilldown = new FlyoutEditDrilldownAction({ start }); uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, actionFlyoutEditDrilldown); - const dashboardToDashboardDrilldown = new DashboardToDashboardDrilldown({ start }); + const dashboardToDashboardDrilldown = new DashboardToDashboardDrilldown({ + start, + getDashboardUrlGenerator, + }); uiActions.registerDrilldown(dashboardToDashboardDrilldown); } } diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx index 18ee95cb57b3bc..d8465562f9302f 100644 --- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx +++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.test.tsx @@ -5,8 +5,7 @@ */ import { DashboardToDashboardDrilldown } from './drilldown'; -import { UrlGeneratorContract } from '../../../../../../../src/plugins/share/public'; -import { savedObjectsServiceMock } from '../../../../../../../src/core/public/mocks'; +import { savedObjectsServiceMock, coreMock } from '../../../../../../../src/core/public/mocks'; import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks'; import { ActionContext, Config } from './types'; import { @@ -19,15 +18,16 @@ import { import { esFilters } from '../../../../../../../src/plugins/data/public'; // convenient to use real implementation here. -import { createDirectAccessDashboardLinkGenerator } from '../../../../../../../src/plugins/dashboard/public/url_generator'; +import { createDashboardUrlGenerator } from '../../../../../../../src/plugins/dashboard/public/url_generator'; +import { UrlGeneratorsService } from '../../../../../../../src/plugins/share/public/url_generators'; import { VisualizeEmbeddableContract } from '../../../../../../../src/plugins/visualizations/public'; import { RangeSelectTriggerContext, ValueClickTriggerContext, } from '../../../../../../../src/plugins/embeddable/public'; +import { StartDependencies } from '../../../plugin'; import { SavedObjectLoader } from '../../../../../../../src/plugins/saved_objects/public'; import { StartServicesGetter } from '../../../../../../../src/plugins/kibana_utils/public/core'; -import { StartDependencies } from '../../../plugin'; describe('.isConfigValid()', () => { const drilldown = new DashboardToDashboardDrilldown({} as any); @@ -105,23 +105,19 @@ describe('.execute() & getHref', () => { data: { actions: dataPluginActions, }, - share: { - urlGenerators: { - getUrlGenerator: () => - createDirectAccessDashboardLinkGenerator(() => - Promise.resolve({ - appBasePath: 'test', - useHashedUrl: false, - savedDashboardLoader: ({} as unknown) as SavedObjectLoader, - }) - ) as UrlGeneratorContract, - }, - }, }, self: {}, - })) as unknown) as StartServicesGetter< - Pick - >, + })) as unknown) as StartServicesGetter>, + getDashboardUrlGenerator: () => + new UrlGeneratorsService().setup(coreMock.createSetup()).registerUrlGenerator( + createDashboardUrlGenerator(() => + Promise.resolve({ + appBasePath: 'test', + useHashedUrl: false, + savedDashboardLoader: ({} as unknown) as SavedObjectLoader, + }) + ) + ), }); const selectRangeFiltersSpy = jest .spyOn(dataPluginActions, 'createFiltersFromRangeSelectAction') diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx index 848e77384f7f04..6d83b8443a828c 100644 --- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx +++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { reactToUiComponent } from '../../../../../../../src/plugins/kibana_react/public'; -import { DASHBOARD_APP_URL_GENERATOR } from '../../../../../../../src/plugins/dashboard/public'; +import { DashboardUrlGenerator } from '../../../../../../../src/plugins/dashboard/public'; import { ActionContext, Config } from './types'; import { CollectConfigContainer } from './components'; import { DASHBOARD_TO_DASHBOARD_DRILLDOWN } from './constants'; @@ -22,7 +22,8 @@ import { StartServicesGetter } from '../../../../../../../src/plugins/kibana_uti import { StartDependencies } from '../../../plugin'; export interface Params { - start: StartServicesGetter>; + start: StartServicesGetter>; + getDashboardUrlGenerator: () => DashboardUrlGenerator; } export class DashboardToDashboardDrilldown @@ -142,9 +143,7 @@ export class DashboardToDashboardDrilldown } } - const { plugins } = this.params.start(); - - return plugins.share.urlGenerators.getUrlGenerator(DASHBOARD_APP_URL_GENERATOR).createUrl({ + return this.params.getDashboardUrlGenerator().createUrl({ dashboardId: config.dashboardId, query: config.useCurrentFilters ? query : undefined, timeRange, From af102afb7a524531fc97a5be96e8a7b3afa9908f Mon Sep 17 00:00:00 2001 From: James Gowdy Date: Mon, 11 May 2020 10:00:44 +0100 Subject: [PATCH 22/65] [ML] Fixing watch creation (#65956) --- .../components/create_watch_flyout/create_watch_service.js | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/create_watch_flyout/create_watch_service.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/create_watch_flyout/create_watch_service.js index 29e89022a55025..2a65ee06f2c2c1 100644 --- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/create_watch_flyout/create_watch_service.js +++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/create_watch_flyout/create_watch_service.js @@ -157,6 +157,7 @@ class CreateWatchService { id, type: 'json', isNew: false, // Set to false, as we want to allow watches to be overwritten. + isActive: true, watch, }, }; From e148eb4437cb890c93ee328ea424d2d67584de50 Mon Sep 17 00:00:00 2001 From: Walter Rafelsberger Date: Mon, 11 May 2020 11:41:01 +0200 Subject: [PATCH 23/65] [ML] Anomaly Detection: Fix test to reflect model memory limit change. (#65967) Adapt jest test mocks to consider update introduced in #65652. --- .../models/job_validation/job_validation.test.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts index ca127f43d08afe..d907677855c125 100644 --- a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts +++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts @@ -14,6 +14,13 @@ const callWithRequest: APICaller = (method: string) => { if (method === 'fieldCaps') { resolve({ fields: [] }); return; + } else if (method === 'ml.info') { + resolve({ + limits: { + effective_max_model_memory_limit: '100MB', + max_model_memory_limit: '1GB', + }, + }); } resolve({}); }) as Promise; @@ -291,7 +298,7 @@ describe('ML - validateJob', () => { }); // Failing https://github.com/elastic/kibana/issues/65865 - it.skip('basic validation passes, extended checks return some messages', () => { + it('basic validation passes, extended checks return some messages', () => { const payload = getBasicPayload(); return validateJob(callWithRequest, payload).then(messages => { const ids = messages.map(m => m.id); @@ -305,7 +312,7 @@ describe('ML - validateJob', () => { }); // Failing https://github.com/elastic/kibana/issues/65866 - it.skip('categorization job using mlcategory passes aggregatable field check', () => { + it('categorization job using mlcategory passes aggregatable field check', () => { const payload: any = { job: { job_id: 'categorization_test', @@ -372,7 +379,7 @@ describe('ML - validateJob', () => { }); // Failing https://github.com/elastic/kibana/issues/65867 - it.skip('script field not reported as non aggregatable', () => { + it('script field not reported as non aggregatable', () => { const payload: any = { job: { job_id: 'categorization_test', From ae38c6ba4c3fed23be12085a9032073d3cfe79c9 Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Mon, 11 May 2020 12:38:39 +0200 Subject: [PATCH 24/65] [Drilldowns] Copy improvements (#65838) * update toast messages * update HelloBar text Co-authored-by: Elastic Machine --- .../connected_flyout_manage_drilldowns.tsx | 12 +-- .../i18n.ts | 75 +++++++++---------- .../components/drilldown_hello_bar/i18n.ts | 2 +- 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx index 0d4a67e325e4dd..5ebda079a15bf1 100644 --- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx +++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx @@ -289,8 +289,8 @@ function useDrilldownsStateManager( await run(async () => { await actionManager.createEvent(action, selectedTriggers); notifications.toasts.addSuccess({ - title: toastDrilldownCreated.title, - text: toastDrilldownCreated.text(action.name), + title: toastDrilldownCreated.title(action.name), + text: toastDrilldownCreated.text, }); }); } @@ -303,8 +303,8 @@ function useDrilldownsStateManager( await run(async () => { await actionManager.updateEvent(drilldownId, action, selectedTriggers); notifications.toasts.addSuccess({ - title: toastDrilldownEdited.title, - text: toastDrilldownEdited.text(action.name), + title: toastDrilldownEdited.title(action.name), + text: toastDrilldownEdited.text, }); }); } @@ -320,8 +320,8 @@ function useDrilldownsStateManager( text: toastDrilldownDeleted.text, } : { - title: toastDrilldownsDeleted.title, - text: toastDrilldownsDeleted.text(drilldownIds.length), + title: toastDrilldownsDeleted.title(drilldownIds.length), + text: toastDrilldownsDeleted.text, } ); }); diff --git a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts index 31384860786efe..851439eccbe7ea 100644 --- a/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts +++ b/x-pack/plugins/drilldowns/public/components/connected_flyout_manage_drilldowns/i18n.ts @@ -7,35 +7,41 @@ import { i18n } from '@kbn/i18n'; export const toastDrilldownCreated = { - title: i18n.translate( - 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownCreatedTitle', + title: (drilldownName: string) => + i18n.translate( + 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownCreatedTitle', + { + defaultMessage: 'Drilldown "{drilldownName}" created', + values: { + drilldownName, + }, + } + ), + text: i18n.translate( + 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownCreatedText', { - defaultMessage: 'Drilldown created', + // TODO: remove `Save your dashboard before testing.` part + // when drilldowns are used not only in dashboard + // or after https://github.com/elastic/kibana/issues/65179 implemented + defaultMessage: 'Save your dashboard before testing.', } ), - text: (drilldownName: string) => - i18n.translate('xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownCreatedText', { - defaultMessage: 'You created "{drilldownName}". Save dashboard before testing.', - values: { - drilldownName, - }, - }), }; export const toastDrilldownEdited = { - title: i18n.translate( - 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownEditedTitle', - { - defaultMessage: 'Drilldown edited', - } - ), - text: (drilldownName: string) => - i18n.translate('xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownEditedText', { - defaultMessage: 'You edited "{drilldownName}". Save dashboard before testing.', + title: (drilldownName: string) => + i18n.translate('xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownEditedTitle', { + defaultMessage: 'Drilldown "{drilldownName}" updated', values: { drilldownName, }, }), + text: i18n.translate( + 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownEditedText', + { + defaultMessage: 'Save your dashboard before testing.', + } + ), }; export const toastDrilldownDeleted = { @@ -48,28 +54,26 @@ export const toastDrilldownDeleted = { text: i18n.translate( 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownDeletedText', { - defaultMessage: 'You deleted a drilldown.', + defaultMessage: 'Save your dashboard before testing.', } ), }; export const toastDrilldownsDeleted = { - title: i18n.translate( - 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsDeletedTitle', - { - defaultMessage: 'Drilldowns deleted', - } - ), - text: (n: number) => + title: (n: number) => i18n.translate( - 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsDeletedText', + 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsDeletedTitle', { - defaultMessage: 'You deleted {n} drilldowns', - values: { - n, - }, + defaultMessage: '{n} drilldowns deleted', + values: { n }, } ), + text: i18n.translate( + 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsDeletedText', + { + defaultMessage: 'Save your dashboard before testing.', + } + ), }; export const toastDrilldownsCRUDError = i18n.translate( @@ -79,10 +83,3 @@ export const toastDrilldownsCRUDError = i18n.translate( description: 'Title for generic error toast when persisting drilldown updates failed', } ); - -export const toastDrilldownsFetchError = i18n.translate( - 'xpack.drilldowns.components.flyoutDrilldownWizard.toast.drilldownsFetchErrorTitle', - { - defaultMessage: 'Error fetching drilldowns', - } -); diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts index 63dc95dabc0fbf..622376c5b40ad1 100644 --- a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts +++ b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/i18n.ts @@ -10,7 +10,7 @@ export const txtHelpText = i18n.translate( 'xpack.drilldowns.components.DrilldownHelloBar.helpText', { defaultMessage: - 'Drilldowns provide the ability to define a new behavior when interacting with a panel. You can add multiple options or simply override the default filtering behavior.', + 'Drilldowns enable you to define new behaviors for interacting with panels. You can add multiple actions and override the default filter.', } ); From f4ba630da0e1ad4cea94820770263a9a3806b026 Mon Sep 17 00:00:00 2001 From: Sonja Krause-Harder Date: Mon, 11 May 2020 13:29:13 +0200 Subject: [PATCH 25/65] [EPM] Don't crash on invalid characters in integration search bar (#65872) * Catch and hide EuiSearchBar parse errors in package search. * Fix typo. * Remove unnecesary type cast. Co-authored-by: Elastic Machine --- .../epm/components/package_list_grid.tsx | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/package_list_grid.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/package_list_grid.tsx index 818b365d5be12c..2f06d1d8703c25 100644 --- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/package_list_grid.tsx +++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/package_list_grid.tsx @@ -13,6 +13,7 @@ import { // @ts-ignore EuiSearchBar, EuiText, + Query, } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; @@ -35,9 +36,28 @@ export function PackageListGrid({ list, showInstalledBadge, }: ListProps) { + const initialQuery = EuiSearchBar.Query.MATCH_ALL; + + const [query, setQuery] = useState(initialQuery); const [searchTerm, setSearchTerm] = useState(''); const localSearchRef = useLocalSearch(list); + const onQueryChange = ({ + // eslint-disable-next-line no-shadow + query, + queryText: userInput, + error, + }: { + query: Query | null; + queryText: string; + error: { message: string } | null; + }) => { + if (!error) { + setQuery(query); + setSearchTerm(userInput); + } + }; + const controlsContent = ; let gridContent: JSX.Element; @@ -59,16 +79,14 @@ export function PackageListGrid({ {controlsContent} { - setSearchTerm(userInput); - }} + onChange={onQueryChange} /> {gridContent} From c3a1b24ea09b2ed4238110b37b895083f1042bdd Mon Sep 17 00:00:00 2001 From: Dima Arnautov Date: Mon, 11 May 2020 14:06:10 +0200 Subject: [PATCH 26/65] [ML] api integration tests for get anomaly detectors (#65828) --- .../apis/ml/anomaly_detectors/get.ts | 222 ++++++++++++++++++ .../apis/ml/anomaly_detectors/index.ts | 1 + 2 files changed, 223 insertions(+) create mode 100644 x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts new file mode 100644 index 00000000000000..255afecde74cb0 --- /dev/null +++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts @@ -0,0 +1,222 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../ftr_provider_context'; +import { USER } from '../../../../functional/services/machine_learning/security_common'; + +const COMMON_HEADERS = { + 'kbn-xsrf': 'some-xsrf-token', +}; + +export default ({ getService }: FtrProviderContext) => { + const esArchiver = getService('esArchiver'); + const supertest = getService('supertestWithoutAuth'); + const ml = getService('ml'); + + const jobId = `fq_single_${Date.now()}`; + + async function createJobs() { + const mockJobConfigs = [ + { + job_id: `${jobId}_1`, + description: + 'Single metric job based on the farequote dataset with 30m bucketspan and mean(responsetime)', + groups: ['automated', 'farequote', 'single-metric'], + analysis_config: { + bucket_span: '30m', + detectors: [{ function: 'mean', field_name: 'responsetime' }], + influencers: [], + summary_count_field_name: 'doc_count', + }, + data_description: { time_field: '@timestamp' }, + analysis_limits: { model_memory_limit: '11MB' }, + model_plot_config: { enabled: true }, + }, + { + job_id: `${jobId}_2`, + description: + 'Another single metric job based on the farequote dataset with 30m bucketspan and mean(responsetime)', + groups: ['automated', 'farequote', 'single-metric'], + analysis_config: { + bucket_span: '30m', + detectors: [{ function: 'mean', field_name: 'responsetime' }], + influencers: [], + summary_count_field_name: 'doc_count', + }, + data_description: { time_field: '@timestamp' }, + analysis_limits: { model_memory_limit: '11MB' }, + model_plot_config: { enabled: false }, + }, + ]; + + for (const jobConfig of mockJobConfigs) { + await ml.api.createAnomalyDetectionJob(jobConfig); + } + } + + describe('GET anomaly_detectors', () => { + before(async () => { + await esArchiver.loadIfNeeded('ml/farequote'); + await ml.testResources.setKibanaTimeZoneToUTC(); + + await createJobs(); + }); + + after(async () => { + await ml.api.cleanMlIndices(); + }); + + describe('GetAnomalyDetectors', () => { + it('should fetch all anomaly detector jobs', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors`) + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_HEADERS) + .expect(200); + + expect(body.count).to.eql(2); + expect(body.jobs.length).to.eql(2); + expect(body.jobs[0].job_id).to.eql(`${jobId}_1`); + expect(body.jobs[1].job_id).to.eql(`${jobId}_2`); + }); + + it('should not allow to retrieve jobs for the user without required permissions', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors`) + .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED)) + .set(COMMON_HEADERS) + .expect(404); + + expect(body.error).to.eql('Not Found'); + expect(body.message).to.eql('Not Found'); + }); + }); + + describe('GetAnomalyDetectorsById', () => { + it('should fetch single anomaly detector job by id', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors/${jobId}_1`) + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_HEADERS) + .expect(200); + + expect(body.count).to.eql(1); + expect(body.jobs.length).to.eql(1); + expect(body.jobs[0].job_id).to.eql(`${jobId}_1`); + }); + + it('should fetch anomaly detector jobs based on provided ids', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors/${jobId}_1,${jobId}_2`) + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_HEADERS) + .expect(200); + + expect(body.count).to.eql(2); + expect(body.jobs.length).to.eql(2); + expect(body.jobs[0].job_id).to.eql(`${jobId}_1`); + expect(body.jobs[1].job_id).to.eql(`${jobId}_2`); + }); + + it('should not allow to retrieve a job for the user without required permissions', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors/${jobId}_1`) + .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED)) + .set(COMMON_HEADERS) + .expect(404); + + expect(body.error).to.eql('Not Found'); + expect(body.message).to.eql('Not Found'); + }); + }); + + describe('GetAnomalyDetectorsStats', () => { + it('should fetch jobs stats', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors/_stats`) + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_HEADERS) + .expect(200); + + expect(body.count).to.eql(2); + expect(body.jobs.length).to.eql(2); + expect(body.jobs[0].job_id).to.eql(`${jobId}_1`); + expect(body.jobs[0]).to.keys( + 'timing_stats', + 'state', + 'forecasts_stats', + 'model_size_stats', + 'data_counts' + ); + expect(body.jobs[1].job_id).to.eql(`${jobId}_2`); + }); + + it('should not allow to retrieve jobs stats for the user without required permissions', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors/_stats`) + .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED)) + .set(COMMON_HEADERS) + .expect(404); + + expect(body.error).to.eql('Not Found'); + expect(body.message).to.eql('Not Found'); + }); + }); + + describe('GetAnomalyDetectorsStatsById', () => { + it('should fetch single job stats', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors/${jobId}_1/_stats`) + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_HEADERS) + .expect(200); + + expect(body.count).to.eql(1); + expect(body.jobs.length).to.eql(1); + expect(body.jobs[0].job_id).to.eql(`${jobId}_1`); + expect(body.jobs[0]).to.keys( + 'timing_stats', + 'state', + 'forecasts_stats', + 'model_size_stats', + 'data_counts' + ); + }); + + it('should fetch multiple jobs stats based on provided ids', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors/${jobId}_1,${jobId}_2/_stats`) + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_HEADERS) + .expect(200); + + expect(body.count).to.eql(2); + expect(body.jobs.length).to.eql(2); + expect(body.jobs[0].job_id).to.eql(`${jobId}_1`); + expect(body.jobs[0]).to.keys( + 'timing_stats', + 'state', + 'forecasts_stats', + 'model_size_stats', + 'data_counts' + ); + expect(body.jobs[1].job_id).to.eql(`${jobId}_2`); + }); + + it('should not allow to retrieve a job stats for the user without required permissions', async () => { + const { body } = await supertest + .get(`/api/ml/anomaly_detectors/${jobId}_1/_stats`) + .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED)) + .set(COMMON_HEADERS) + .expect(404); + + expect(body.error).to.eql('Not Found'); + expect(body.message).to.eql('Not Found'); + }); + }); + }); +}; diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/index.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/index.ts index fb8acaf5c3ae98..3985cd39e4d1c5 100644 --- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/index.ts +++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/index.ts @@ -8,5 +8,6 @@ import { FtrProviderContext } from '../../../ftr_provider_context'; export default function({ loadTestFile }: FtrProviderContext) { describe('anomaly detectors', function() { loadTestFile(require.resolve('./create')); + loadTestFile(require.resolve('./get')); }); } From d005a55d163bbb550af4b8ba6eac75572b11cd20 Mon Sep 17 00:00:00 2001 From: Dima Arnautov Date: Mon, 11 May 2020 14:06:54 +0200 Subject: [PATCH 27/65] [ML] API integration tests for fetching anomalies table data (#65844) --- x-pack/test/api_integration/apis/ml/index.ts | 1 + .../ml/results/get_anomalies_table_data.ts | 136 ++++++++++++++++++ .../api_integration/apis/ml/results/index.ts | 12 ++ 3 files changed, 149 insertions(+) create mode 100644 x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts create mode 100644 x-pack/test/api_integration/apis/ml/results/index.ts diff --git a/x-pack/test/api_integration/apis/ml/index.ts b/x-pack/test/api_integration/apis/ml/index.ts index 58356637c63ac5..df99b125e6adb7 100644 --- a/x-pack/test/api_integration/apis/ml/index.ts +++ b/x-pack/test/api_integration/apis/ml/index.ts @@ -37,5 +37,6 @@ export default function({ getService, loadTestFile }: FtrProviderContext) { loadTestFile(require.resolve('./fields_service')); loadTestFile(require.resolve('./job_validation')); loadTestFile(require.resolve('./jobs')); + loadTestFile(require.resolve('./results')); }); } diff --git a/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts b/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts new file mode 100644 index 00000000000000..9f34a3c639562e --- /dev/null +++ b/x-pack/test/api_integration/apis/ml/results/get_anomalies_table_data.ts @@ -0,0 +1,136 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import expect from '@kbn/expect'; +import { USER } from '../../../../functional/services/machine_learning/security_common'; +import { FtrProviderContext } from '../../../ftr_provider_context'; +import { Datafeed, Job } from '../../../../../plugins/ml/common/types/anomaly_detection_jobs'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext) => { + const esArchiver = getService('esArchiver'); + const supertest = getService('supertestWithoutAuth'); + const ml = getService('ml'); + + const COMMON_HEADERS = { + 'kbn-xsrf': 'some-xsrf-token', + }; + + const JOB_CONFIG: Job = { + job_id: `fq_multi_1_ae`, + description: + 'mean/min/max(responsetime) partition=airline on farequote dataset with 1h bucket span', + groups: ['farequote', 'automated', 'multi-metric'], + analysis_config: { + bucket_span: '1h', + influencers: ['airline'], + detectors: [ + { function: 'mean', field_name: 'responsetime', partition_field_name: 'airline' }, + { function: 'min', field_name: 'responsetime', partition_field_name: 'airline' }, + { function: 'max', field_name: 'responsetime', partition_field_name: 'airline' }, + ], + }, + data_description: { time_field: '@timestamp' }, + analysis_limits: { model_memory_limit: '20mb' }, + model_plot_config: { enabled: true }, + }; + + const DATAFEED_CONFIG: Datafeed = { + datafeed_id: 'datafeed-fq_multi_1_se', + indices: ['ft_farequote'], + job_id: 'fq_multi_1_ae', + query: { bool: { must: [{ match_all: {} }] } }, + }; + + async function createMockJobs() { + await ml.api.createAndRunAnomalyDetectionLookbackJob(JOB_CONFIG, DATAFEED_CONFIG); + } + + describe('GetAnomaliesTableData', () => { + before(async () => { + await esArchiver.loadIfNeeded('ml/farequote'); + await ml.testResources.setKibanaTimeZoneToUTC(); + await createMockJobs(); + }); + + after(async () => { + await ml.api.cleanMlIndices(); + }); + + it('should fetch anomalies table data', async () => { + const requestBody = { + jobIds: [JOB_CONFIG.job_id], + criteriaFields: [{ fieldName: 'detector_index', fieldValue: 0 }], + influencers: [], + aggregationInterval: 'auto', + threshold: 0, + earliestMs: 1454889600000, // February 8, 2016 12:00:00 AM GMT + latestMs: 1454976000000, // February 9, 2016 12:00:00 AM GMT + dateFormatTz: 'UTC', + maxRecords: 500, + }; + + const { body } = await supertest + .post(`/api/ml/results/anomalies_table_data`) + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_HEADERS) + .send(requestBody) + .expect(200); + + expect(body.interval).to.eql('hour'); + expect(body.anomalies.length).to.eql(12); + }); + + it('should validate request body', async () => { + const requestBody = { + // missing jobIds + criteriaFields: [{ fieldName: 'detector_index', fieldValue: 0 }], + influencers: [], + aggregationInterval: 'auto', + threshold: 0, + // invalid earliest and latest instead of earliestMs and latestMs + earliest: 1454889600000, // February 8, 2016 12:00:00 AM GMT + latest: 1454976000000, // February 9, 2016 12:00:00 AM GMT + dateFormatTz: 'UTC', + maxRecords: 500, + }; + + const { body } = await supertest + .post(`/api/ml/results/anomalies_table_data`) + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_HEADERS) + .send(requestBody) + .expect(400); + + expect(body.error).to.eql('Bad Request'); + expect(body.message).to.eql( + '[request body.jobIds]: expected value of type [array] but got [undefined]' + ); + }); + + it('should not allow fetching of anomalies table data without required permissions', async () => { + const requestBody = { + jobIds: [JOB_CONFIG.job_id], + criteriaFields: [{ fieldName: 'detector_index', fieldValue: 0 }], + influencers: [], + aggregationInterval: 'auto', + threshold: 0, + earliestMs: 1454889600000, // February 8, 2016 12:00:00 AM GMT + latestMs: 1454976000000, // February 9, 2016 12:00:00 AM GMT + dateFormatTz: 'UTC', + maxRecords: 500, + }; + const { body } = await supertest + .post(`/api/ml/results/anomalies_table_data`) + .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED)) + .set(COMMON_HEADERS) + .send(requestBody) + .expect(404); + + expect(body.error).to.eql('Not Found'); + expect(body.message).to.eql('Not Found'); + }); + }); +}; diff --git a/x-pack/test/api_integration/apis/ml/results/index.ts b/x-pack/test/api_integration/apis/ml/results/index.ts new file mode 100644 index 00000000000000..80197e6a32ad99 --- /dev/null +++ b/x-pack/test/api_integration/apis/ml/results/index.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { FtrProviderContext } from '../../../ftr_provider_context'; + +export default function({ loadTestFile }: FtrProviderContext) { + describe('ResultsService', () => { + loadTestFile(require.resolve('./get_anomalies_table_data')); + }); +} From 0830a8bd4c67c63ee08a10bce81ec8d6f766904b Mon Sep 17 00:00:00 2001 From: Nicolas Chaulet Date: Mon, 11 May 2020 08:11:17 -0400 Subject: [PATCH 28/65] [Ingest] Validate config_id when creating an enrollment API key (#65765) --- .../routes/enrollment_api_key/handler.ts | 6 + .../services/api_keys/enrollment_api_key.ts | 15 + .../apis/fleet/enrollment_api_keys/crud.ts | 19 +- .../es_archives/fleet/agents/data.json | 27 + .../es_archives/fleet/agents/mappings.json | 678 ++++++++++-------- 5 files changed, 458 insertions(+), 287 deletions(-) diff --git a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts index 9d3eb5360dbe35..94fc6de6096139 100644 --- a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts +++ b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts @@ -58,6 +58,12 @@ export const postEnrollmentApiKeyHandler: RequestHandler< return response.ok({ body }); } catch (e) { + if (e.isBoom) { + return response.customError({ + statusCode: e.output.statusCode, + body: { message: e.message }, + }); + } return response.customError({ statusCode: 500, body: { message: e.message }, diff --git a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts index 1ac812c3380cd9..3b003f47eb6f92 100644 --- a/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts +++ b/x-pack/plugins/ingest_manager/server/services/api_keys/enrollment_api_key.ts @@ -5,6 +5,7 @@ */ import uuid from 'uuid'; +import Boom from 'boom'; import { SavedObjectsClientContract, SavedObject } from 'src/core/server'; import { EnrollmentAPIKey, EnrollmentAPIKeySOAttributes } from '../../types'; import { ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE } from '../../constants'; @@ -106,6 +107,9 @@ export async function generateEnrollmentAPIKey( ) { const id = uuid.v4(); const { name: providedKeyName } = data; + if (data.configId) { + await validateConfigId(soClient, data.configId); + } const configId = data.configId ?? (await agentConfigService.getDefaultAgentConfigId(soClient)); const name = providedKeyName ? `${providedKeyName} (${id})` : id; const key = await createAPIKey(soClient, name, { @@ -143,6 +147,17 @@ export async function generateEnrollmentAPIKey( return getEnrollmentAPIKey(soClient, so.id); } +async function validateConfigId(soClient: SavedObjectsClientContract, configId: string) { + try { + await agentConfigService.get(soClient, configId); + } catch (e) { + if (e.isBoom && e.output.statusCode === 404) { + throw Boom.badRequest(`Agent config ${configId} does not exist`); + } + throw e; + } +} + function savedObjectToEnrollmentApiKey({ error, attributes, diff --git a/x-pack/test/api_integration/apis/fleet/enrollment_api_keys/crud.ts b/x-pack/test/api_integration/apis/fleet/enrollment_api_keys/crud.ts index 602ec6ca9d9e40..9d0629a7b32e2f 100644 --- a/x-pack/test/api_integration/apis/fleet/enrollment_api_keys/crud.ts +++ b/x-pack/test/api_integration/apis/fleet/enrollment_api_keys/crud.ts @@ -25,6 +25,7 @@ export default function(providerContext: FtrProviderContext) { after(async () => { await esArchiver.unload('fleet/agents'); }); + describe('GET /fleet/enrollment-api-keys', async () => { it('should list existing api keys', async () => { const { body: apiResponse } = await supertest @@ -54,7 +55,7 @@ export default function(providerContext: FtrProviderContext) { .post(`/api/ingest_manager/fleet/enrollment-api-keys`) .set('kbn-xsrf', 'xxx') .send({ - config_id: 'policy1', + config_id: 'config1', }) .expect(200); keyId = apiResponse.item.id; @@ -89,12 +90,22 @@ export default function(providerContext: FtrProviderContext) { .expect(400); }); - it('should allow to create an enrollment api key with a policy', async () => { + it('should not allow to create an enrollment api key for a non existing agent config', async () => { + await supertest + .post(`/api/ingest_manager/fleet/enrollment-api-keys`) + .set('kbn-xsrf', 'xxx') + .send({ + config_id: 'idonotexistsconfig', + }) + .expect(400); + }); + + it('should allow to create an enrollment api key with an agent config', async () => { const { body: apiResponse } = await supertest .post(`/api/ingest_manager/fleet/enrollment-api-keys`) .set('kbn-xsrf', 'xxx') .send({ - config_id: 'policy1', + config_id: 'config1', }) .expect(200); @@ -107,7 +118,7 @@ export default function(providerContext: FtrProviderContext) { .post(`/api/ingest_manager/fleet/enrollment-api-keys`) .set('kbn-xsrf', 'xxx') .send({ - config_id: 'policy1', + config_id: 'config1', }) .expect(200); expect(apiResponse.success).to.eql(true); diff --git a/x-pack/test/functional/es_archives/fleet/agents/data.json b/x-pack/test/functional/es_archives/fleet/agents/data.json index d22e3cd3fecdda..1739f583b2e870 100644 --- a/x-pack/test/functional/es_archives/fleet/agents/data.json +++ b/x-pack/test/functional/es_archives/fleet/agents/data.json @@ -199,3 +199,30 @@ } } } + +{ + "type": "doc", + "value": { + "id": "ingest-agent-configs:config1", + "index": ".kibana", + "source": { + "type": "ingest-agent-configs", + "ingest-agent-configs": { + "name": "Test config", + "namespace": "default", + "description": "Config 1", + "status": "active", + "datasources": [], + "is_default": true, + "monitoring_enabled": [ + "logs", + "metrics" + ], + "revision": 2, + "updated_on": "2020-05-07T19:34:42.533Z", + "updated_by": "system", + "id": "config1" + } + } + } +} diff --git a/x-pack/test/functional/es_archives/fleet/agents/mappings.json b/x-pack/test/functional/es_archives/fleet/agents/mappings.json index 409cc3c689eafc..15e5a5524107bc 100644 --- a/x-pack/test/functional/es_archives/fleet/agents/mappings.json +++ b/x-pack/test/functional/es_archives/fleet/agents/mappings.json @@ -9,39 +9,42 @@ "dynamic": "strict", "_meta": { "migrationMappingPropertyHashes": { - "ingest-outputs": "aee9782e0d500b867859650a36280165", "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9", "visualization": "52d7a13ad68a150c4525b292d23e12cc", "references": "7997cf5a56cc02bdc9c93361bde732b0", "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1", + "epm-packages": "92b4b1899b887b090d01c033f3118a85", "type": "2f4316de49999235636386fe51dc06c1", - "infrastructure-ui-source": "ddc0ecb18383f6b26101a2fadb2dab0c", "space": "c5ca8acafa0beaa4d08d014a97b6bc6b", + "infrastructure-ui-source": "ddc0ecb18383f6b26101a2fadb2dab0c", + "ingest_manager_settings": "c5b0749b4ab03c582efd4c14cb8f132c", "application_usage_totals": "c897e4310c5f24b07caaff3db53ae2c1", "action": "6e96ac5e648f57523879661ea72525b7", - "agent_configs": "38abaf89513877745c359e7700c0c66a", "dashboard": "d00f614b29a80360e1190193fd333bab", - "metrics-explorer-view": "53c5365793677328df0ccb6138bf3cdd", - "siem-detection-engine-rule-actions": "90eee2e4635260f4be0a1da8f5bc0aa0", - "fleet-agent-events": "3231653fafe4ef3196fe3b32ab774bf2", + "metrics-explorer-view": "428e319af3e822c80a84cf87123ca35c", + "siem-detection-engine-rule-actions": "6569b288c169539db10cb262bf79de18", "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9", "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e", "application_usage_transactional": "965839e75f809fefe04f92dc4d99722a", "action_task_params": "a9d49f184ee89641044be0ca2950fa3a", + "fleet-agent-events": "3231653fafe4ef3196fe3b32ab774bf2", + "ingest-datasources": "2346514df03316001d56ed4c8d46fa94", "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd", - "inventory-view": "9ecce5b58867403613d82fe496470b34", - "fleet-enrollment-api-keys": "28b91e20b105b6f928e2012600085d8f", - "upgrade-assistant-reindex-operation": "a53a20fe086b72c9a86da3cc12dad8a6", + "inventory-view": "5299b67717e96502c77babf1c16fd4d3", + "upgrade-assistant-reindex-operation": "296a89039fc4260292be36b1b005d8f2", "cases-comments": "c2061fb929f585df57425102fa928b4b", + "fleet-enrollment-api-keys": "28b91e20b105b6f928e2012600085d8f", "canvas-element": "7390014e1091044523666d97247392fc", - "datasources": "d4bc0c252b2b5683ff21ea32d00acffc", + "ingest-outputs": "0e57221778a7153c8292edf154099036", "telemetry": "36a616f7026dfa617d6655df850fe16d", "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b", "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327", + "namespaces": "2f4316de49999235636386fe51dc06c1", "server": "ec97f1c5da1a19609a60874e5af1100c", "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084", "lens": "21c3ea0763beb1ecb0162529706b88c5", "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4", + "fleet-agent-actions": "e520c855577170c24481be05c3ae14ec", "search": "181661168bbadd1eff5902361e2a0d5c", "updated_at": "00da57df13e94e9d98437d13ace4bfe0", "cases-configure": "42711cbb311976c0687853f4c1354572", @@ -49,23 +52,22 @@ "alert": "7b44fba6773e37c806ce290ea9b7024e", "siem-detection-engine-rule-status": "ae783f41c6937db6b7a2ef5c93a9e9b0", "map": "23d7aa4a720d4938ccde3983f87bd58d", - "uptime-dynamic-settings": "b6289473c8985c79b6c47eebc19a0ca5", - "epm-packages": "75d12cd13c867fd713d7dfb27366bc20", + "uptime-dynamic-settings": "fcdb453a30092f022f2642db29523d80", + "cases": "32aa96a6d3855ddda53010ae2048ac22", "apm-telemetry": "3525d7c22c42bc80f5e6e9cb3f2b26a2", - "cases": "08b8b110dbca273d37e8aef131ecab61", - "siem-ui-timeline": "ac8020190f5950dd3250b6499144e7fb", + "siem-ui-timeline": "f2d929253ecd06ffbac78b4047f45a86", "kql-telemetry": "d12a98a6f19a2d273696597547e064ee", "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3", - "url": "c7f66a0df8b1b52f17c28c4adb111105", - "fleet-agents": "c3eeb7b9d97176f15f6d126370ab23c7", + "ingest-agent-configs": "f4bdc17427437537ca1754d5d5057ad5", + "url": "b675c3be8d76ecf029294d51dc7ec65d", "migrationVersion": "4a1746014a75ade3a714e1db5763276f", "index-pattern": "66eccb05066c5a89924f48a9e9736499", - "maps-telemetry": "268da3a48066123fc5baf35abaa55014", + "fleet-agents": "864760267df6c970f629bd4458506c53", + "maps-telemetry": "bfd39d88aadadb4be597ea984d433dbe", "namespace": "2f4316de49999235636386fe51dc06c1", "cases-user-actions": "32277330ec6b721abe3b846cfd939a71", - "fleet-agent-actions": "ed270b46812f0fa1439366c428a2cf17", - "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29", "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf", + "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29", "config": "ae24d22d5986d04124cc6568f771066f", "tsvb-validation-telemetry": "3a37ef6c8700ae6fc97d5c7da00e9215" } @@ -107,145 +109,6 @@ } } }, - "fleet-agent-actions": { - "properties": { - "agent_id": { - "type": "keyword" - }, - "created_at": { - "type": "date" - }, - "data": { - "type": "flattened" - }, - "sent_at": { - "type": "date" - }, - "type": { - "type": "keyword" - } - } - }, - "agent_configs": { - "properties": { - "datasources": { - "type": "keyword" - }, - "description": { - "type": "text" - }, - "id": { - "type": "keyword" - }, - "is_default": { - "type": "boolean" - }, - "name": { - "type": "text" - }, - "namespace": { - "type": "keyword" - }, - "revision": { - "type": "integer" - }, - "status": { - "type": "keyword" - }, - "updated_by": { - "type": "keyword" - }, - "updated_on": { - "type": "keyword" - } - } - }, - "fleet-agent-events": { - "properties": { - "action_id": { - "type": "keyword" - }, - "agent_id": { - "type": "keyword" - }, - "config_id": { - "type": "keyword" - }, - "data": { - "type": "text" - }, - "message": { - "type": "text" - }, - "payload": { - "type": "text" - }, - "stream_id": { - "type": "keyword" - }, - "subtype": { - "type": "keyword" - }, - "timestamp": { - "type": "date" - }, - "type": { - "type": "keyword" - } - } - }, - "fleet-agents": { - "properties": { - "access_api_key_id": { - "type": "keyword" - }, - "active": { - "type": "boolean" - }, - "config_id": { - "type": "keyword" - }, - "config_newest_revision": { - "type": "integer" - }, - "config_revision": { - "type": "integer" - }, - "current_error_events": { - "type": "text" - }, - "default_api_key": { - "type": "keyword" - }, - "enrolled_at": { - "type": "date" - }, - "last_checkin": { - "type": "date" - }, - "last_updated": { - "type": "date" - }, - "local_metadata": { - "type": "flattened" - }, - "shared_id": { - "type": "keyword" - }, - "type": { - "type": "keyword" - }, - "updated_at": { - "type": "date" - }, - "user_provided_metadata": { - "type": "flattened" - }, - "version": { - "type": "keyword" - } - } - }, "alert": { "properties": { "actions": { @@ -1355,6 +1218,9 @@ } } }, + "connector_id": { + "type": "keyword" + }, "created_at": { "type": "date" }, @@ -1630,137 +1496,180 @@ } } }, - "datasources": { + "epm-packages": { "properties": { - "config_id": { - "type": "keyword" - }, - "description": { - "type": "text" - }, - "enabled": { - "type": "boolean" + "es_index_patterns": { + "type": "object", + "dynamic": "false" }, - "inputs": { + "installed": { "type": "nested", "properties": { - "config": { - "type": "flattened" - }, - "enabled": { - "type": "boolean" - }, - "processors": { + "id": { "type": "keyword" }, - "streams": { - "type": "nested", - "properties": { - "config": { - "type": "flattened" - }, - "dataset": { - "type": "keyword" - }, - "enabled": { - "type": "boolean" - }, - "id": { - "type": "keyword" - }, - "processors": { - "type": "keyword" - } - } - }, "type": { "type": "keyword" } } }, + "internal": { + "type": "boolean" + }, "name": { "type": "keyword" }, - "namespace": { - "type": "keyword" + "removable": { + "type": "boolean" }, - "output_id": { + "version": { "type": "keyword" - }, - "package": { - "properties": { - "name": { - "type": "keyword" - }, - "title": { - "type": "keyword" - }, - "version": { - "type": "keyword" - } - } - }, - "revision": { - "type": "integer" } } }, - "fleet-enrollment-api-keys": { + "file-upload-telemetry": { "properties": { - "active": { - "type": "boolean" - }, - "api_key": { - "type": "binary" - }, - "api_key_id": { - "type": "keyword" - }, - "config_id": { + "filesUploadedTotalCount": { + "type": "long" + } + } + }, + "fleet-agent-actions": { + "properties": { + "agent_id": { "type": "keyword" }, "created_at": { "type": "date" }, - "expire_at": { - "type": "date" + "data": { + "type": "binary" }, - "name": { - "type": "keyword" + "sent_at": { + "type": "date" }, "type": { "type": "keyword" - }, - "updated_at": { - "type": "date" } } }, - "epm-packages": { + "fleet-agent-events": { "properties": { - "installed": { - "type": "nested", - "properties": { - "id": { - "type": "keyword" - }, - "type": { - "type": "keyword" - } - } - }, - "name": { + "action_id": { + "type": "keyword" + }, + "agent_id": { + "type": "keyword" + }, + "config_id": { + "type": "keyword" + }, + "data": { + "type": "text" + }, + "message": { + "type": "text" + }, + "payload": { + "type": "text" + }, + "stream_id": { + "type": "keyword" + }, + "subtype": { + "type": "keyword" + }, + "timestamp": { + "type": "date" + }, + "type": { + "type": "keyword" + } + } + }, + "fleet-agents": { + "properties": { + "access_api_key_id": { + "type": "keyword" + }, + "active": { + "type": "boolean" + }, + "config_id": { + "type": "keyword" + }, + "config_newest_revision": { + "type": "integer" + }, + "config_revision": { + "type": "integer" + }, + "current_error_events": { + "type": "text" + }, + "default_api_key": { + "type": "keyword" + }, + "default_api_key_id": { + "type": "keyword" + }, + "enrolled_at": { + "type": "date" + }, + "last_checkin": { + "type": "date" + }, + "last_updated": { + "type": "date" + }, + "local_metadata": { + "type": "flattened" + }, + "shared_id": { "type": "keyword" }, + "type": { + "type": "keyword" + }, + "updated_at": { + "type": "date" + }, + "user_provided_metadata": { + "type": "flattened" + }, "version": { "type": "keyword" } } }, - "file-upload-telemetry": { + "fleet-enrollment-api-keys": { "properties": { - "filesUploadedTotalCount": { - "type": "long" + "active": { + "type": "boolean" + }, + "api_key": { + "type": "binary" + }, + "api_key_id": { + "type": "keyword" + }, + "config_id": { + "type": "keyword" + }, + "created_at": { + "type": "date" + }, + "expire_at": { + "type": "date" + }, + "name": { + "type": "keyword" + }, + "type": { + "type": "keyword" + }, + "updated_at": { + "type": "date" } } }, @@ -1888,8 +1797,176 @@ } } }, + "ingest-agent-configs": { + "properties": { + "datasources": { + "type": "keyword" + }, + "description": { + "type": "text" + }, + "id": { + "type": "keyword" + }, + "is_default": { + "type": "boolean" + }, + "monitoring_enabled": { + "type": "keyword" + }, + "name": { + "type": "text" + }, + "namespace": { + "type": "keyword" + }, + "revision": { + "type": "integer" + }, + "status": { + "type": "keyword" + }, + "updated_by": { + "type": "keyword" + }, + "updated_on": { + "type": "keyword" + } + } + }, + "ingest-datasources": { + "properties": { + "config_id": { + "type": "keyword" + }, + "description": { + "type": "text" + }, + "enabled": { + "type": "boolean" + }, + "inputs": { + "type": "nested", + "properties": { + "config": { + "type": "flattened" + }, + "enabled": { + "type": "boolean" + }, + "processors": { + "type": "keyword" + }, + "streams": { + "type": "nested", + "properties": { + "agent_stream": { + "type": "flattened" + }, + "config": { + "type": "flattened" + }, + "dataset": { + "type": "keyword" + }, + "enabled": { + "type": "boolean" + }, + "id": { + "type": "keyword" + }, + "processors": { + "type": "keyword" + }, + "vars": { + "type": "flattened" + } + } + }, + "type": { + "type": "keyword" + }, + "vars": { + "type": "flattened" + } + } + }, + "name": { + "type": "keyword" + }, + "namespace": { + "type": "keyword" + }, + "output_id": { + "type": "keyword" + }, + "package": { + "properties": { + "name": { + "type": "keyword" + }, + "title": { + "type": "keyword" + }, + "version": { + "type": "keyword" + } + } + }, + "revision": { + "type": "integer" + } + } + }, + "ingest-outputs": { + "properties": { + "ca_sha256": { + "type": "keyword" + }, + "config": { + "type": "flattened" + }, + "fleet_enroll_password": { + "type": "binary" + }, + "fleet_enroll_username": { + "type": "binary" + }, + "hosts": { + "type": "keyword" + }, + "is_default": { + "type": "boolean" + }, + "name": { + "type": "keyword" + }, + "type": { + "type": "keyword" + } + } + }, + "ingest_manager_settings": { + "properties": { + "agent_auto_upgrade": { + "type": "keyword" + }, + "kibana_ca_sha256": { + "type": "keyword" + }, + "kibana_url": { + "type": "keyword" + }, + "package_auto_upgrade": { + "type": "keyword" + } + } + }, "inventory-view": { "properties": { + "accountId": { + "type": "keyword" + }, "autoBounds": { "type": "boolean" }, @@ -1983,8 +2060,11 @@ "nodeType": { "type": "keyword" }, + "region": { + "type": "keyword" + }, "time": { - "type": "integer" + "type": "long" }, "view": { "type": "keyword" @@ -2102,6 +2182,12 @@ "indexPatternsWithGeoFieldCount": { "type": "long" }, + "indexPatternsWithGeoPointFieldCount": { + "type": "long" + }, + "indexPatternsWithGeoShapeFieldCount": { + "type": "long" + }, "mapsTotalCount": { "type": "long" }, @@ -2156,6 +2242,9 @@ "filterQuery": { "type": "keyword" }, + "forceInterval": { + "type": "boolean" + }, "groupBy": { "type": "keyword" }, @@ -2211,36 +2300,8 @@ "namespace": { "type": "keyword" }, - "ingest-outputs": { - "properties": { - "api_key": { - "type": "keyword" - }, - "ca_sha256": { - "type": "keyword" - }, - "config": { - "type": "flattened" - }, - "fleet_enroll_password": { - "type": "binary" - }, - "fleet_enroll_username": { - "type": "binary" - }, - "hosts": { - "type": "keyword" - }, - "is_default": { - "type": "boolean" - }, - "name": { - "type": "keyword" - }, - "type": { - "type": "keyword" - } - } + "namespaces": { + "type": "keyword" }, "query": { "properties": { @@ -2346,7 +2407,7 @@ }, "params": { "type": "object", - "dynamic": "true" + "enabled": false } } }, @@ -2647,6 +2708,15 @@ } } }, + "templateTimelineId": { + "type": "text" + }, + "templateTimelineVersion": { + "type": "integer" + }, + "timelineType": { + "type": "keyword" + }, "title": { "type": "text" }, @@ -2827,11 +2897,48 @@ "type": "date" }, "upgrade-assistant-reindex-operation": { - "dynamic": "true", "properties": { + "errorMessage": { + "type": "keyword" + }, "indexName": { "type": "keyword" }, + "lastCompletedStep": { + "type": "integer" + }, + "locked": { + "type": "date" + }, + "newIndexName": { + "type": "keyword" + }, + "reindexOptions": { + "properties": { + "openAndClose": { + "type": "boolean" + }, + "queueSettings": { + "properties": { + "queuedAt": { + "type": "long" + }, + "startedAt": { + "type": "long" + } + } + } + } + }, + "reindexTaskId": { + "type": "keyword" + }, + "reindexTaskPercComplete": { + "type": "float" + }, + "runningReindexCount": { + "type": "integer" + }, "status": { "type": "integer" } @@ -2891,6 +2998,12 @@ }, "uptime-dynamic-settings": { "properties": { + "certAgeThreshold": { + "type": "long" + }, + "certExpirationThreshold": { + "type": "long" + }, "heartbeatIndices": { "type": "keyword" } @@ -2911,8 +3024,7 @@ "type": "text", "fields": { "keyword": { - "type": "keyword", - "ignore_above": 2048 + "type": "keyword" } } } From d4ae987dd40abec422d3d8a74c9c3d5a011b4f5c Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Mon, 11 May 2020 14:21:39 +0200 Subject: [PATCH 29/65] specify last known SO version (#65987) --- .../saved_objects/migrations/core/document_migrator.test.ts | 4 ++-- .../server/saved_objects/migrations/core/document_migrator.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.test.ts b/src/core/server/saved_objects/migrations/core/document_migrator.test.ts index 3ec478e3ca28db..bd10520ca1c571 100644 --- a/src/core/server/saved_objects/migrations/core/document_migrator.test.ts +++ b/src/core/server/saved_objects/migrations/core/document_migrator.test.ts @@ -293,7 +293,7 @@ describe('DocumentMigrator', () => { migrationVersion: { dog: '10.2.0' }, }) ).toThrow( - /Document "smelly" has property "dog" which belongs to a more recent version of Kibana \(10\.2\.0\)/i + /Document "smelly" has property "dog" which belongs to a more recent version of Kibana \[10\.2\.0\]\. The last known version is \[undefined\]/i ); }); @@ -315,7 +315,7 @@ describe('DocumentMigrator', () => { migrationVersion: { dawg: '1.2.4' }, }) ).toThrow( - /Document "fleabag" has property "dawg" which belongs to a more recent version of Kibana \(1\.2\.4\)/i + /Document "fleabag" has property "dawg" which belongs to a more recent version of Kibana \[1\.2\.4\]\. The last known version is \[1\.2\.3\]/i ); }); diff --git a/src/core/server/saved_objects/migrations/core/document_migrator.ts b/src/core/server/saved_objects/migrations/core/document_migrator.ts index 4ddb2b070d3ac3..07c1da55861076 100644 --- a/src/core/server/saved_objects/migrations/core/document_migrator.ts +++ b/src/core/server/saved_objects/migrations/core/document_migrator.ts @@ -350,7 +350,7 @@ function nextUnmigratedProp(doc: SavedObjectUnsanitizedDoc, migrations: ActiveMi if (docVersion && (!latestVersion || Semver.gt(docVersion, latestVersion))) { throw Boom.badData( `Document "${doc.id}" has property "${p}" which belongs to a more recent` + - ` version of Kibana (${docVersion}).`, + ` version of Kibana [${docVersion}]. The last known version is [${latestVersion}]`, doc ); } From d29370207126fc8537aa7072de5cc599e47ae7f1 Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Mon, 11 May 2020 14:21:55 +0200 Subject: [PATCH 30/65] load VizOptions component lazily (#64778) Co-authored-by: Elastic Machine --- .../public/components/table_vis_options.tsx | 5 ++-- .../components/table_vis_options_lazy.tsx | 30 +++++++++++++++++++ .../vis_type_table/public/table_vis_type.ts | 2 +- 3 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 src/plugins/vis_type_table/public/components/table_vis_options_lazy.tsx diff --git a/src/plugins/vis_type_table/public/components/table_vis_options.tsx b/src/plugins/vis_type_table/public/components/table_vis_options.tsx index 68348d5ef10604..837d4785359361 100644 --- a/src/plugins/vis_type_table/public/components/table_vis_options.tsx +++ b/src/plugins/vis_type_table/public/components/table_vis_options.tsx @@ -147,5 +147,6 @@ function TableOptions({ ); } - -export { TableOptions }; +// default export required for React.Lazy +// eslint-disable-next-line import/no-default-export +export { TableOptions as default }; diff --git a/src/plugins/vis_type_table/public/components/table_vis_options_lazy.tsx b/src/plugins/vis_type_table/public/components/table_vis_options_lazy.tsx new file mode 100644 index 00000000000000..ca273aa771ef17 --- /dev/null +++ b/src/plugins/vis_type_table/public/components/table_vis_options_lazy.tsx @@ -0,0 +1,30 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import React, { lazy, Suspense } from 'react'; +import { EuiLoadingSpinner } from '@elastic/eui'; +import { VisOptionsProps } from 'src/plugins/vis_default_editor/public'; +import { TableVisParams } from '../types'; + +const TableOptionsComponent = lazy(() => import('./table_vis_options')); + +export const TableOptions = (props: VisOptionsProps) => ( + }> + + +); diff --git a/src/plugins/vis_type_table/public/table_vis_type.ts b/src/plugins/vis_type_table/public/table_vis_type.ts index 26e5ac8cfd71ab..c3bc72497007ea 100644 --- a/src/plugins/vis_type_table/public/table_vis_type.ts +++ b/src/plugins/vis_type_table/public/table_vis_type.ts @@ -24,7 +24,7 @@ import { Vis } from '../../visualizations/public'; import { tableVisResponseHandler } from './table_vis_response_handler'; // @ts-ignore import tableVisTemplate from './table_vis.html'; -import { TableOptions } from './components/table_vis_options'; +import { TableOptions } from './components/table_vis_options_lazy'; import { getTableVisualizationControllerClass } from './vis_controller'; export function getTableVisTypeDefinition(core: CoreSetup, context: PluginInitializerContext) { From 92c6ffa909e26aa887b52ea2219197f94e9fdf1f Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Mon, 11 May 2020 14:22:09 +0200 Subject: [PATCH 31/65] stabilize async_dashboard test (#65976) --- x-pack/test/functional/apps/dashboard/_async_dashboard.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts index 2c8abda999ddda..82641db457aea6 100644 --- a/x-pack/test/functional/apps/dashboard/_async_dashboard.ts +++ b/x-pack/test/functional/apps/dashboard/_async_dashboard.ts @@ -9,6 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context'; export default function({ getService, getPageObjects }: FtrProviderContext) { const retry = getService('retry'); + const browser = getService('browser'); const kibanaServer = getService('kibanaServer'); const log = getService('log'); const pieChart = getService('pieChart'); @@ -93,6 +94,9 @@ export default function({ getService, getPageObjects }: FtrProviderContext) { ]`; await kibanaServer.uiSettings.update({ 'timepicker:quickRanges': SAMPLE_DATA_RANGE }); + // refresh page to make sure ui settings update is picked up + await browser.refresh(); + await PageObjects.header.waitUntilLoadingHasFinished(); await appMenu.clickLink('Discover'); await PageObjects.discover.selectIndexPattern('kibana_sample_data_flights'); await PageObjects.timePicker.setCommonlyUsedTime('sample_data range'); @@ -104,6 +108,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) { after(async () => { await PageObjects.common.navigateToUrl('home', 'tutorial_directory/sampleData'); + await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.home.removeSampleDataSet('flights'); const isInstalled = await PageObjects.home.isSampleDataSetInstalled('flights'); expect(isInstalled).to.be(false); From b180fd378dbb622d01c8fefd0712a3c27ed59f39 Mon Sep 17 00:00:00 2001 From: Rudolf Meijering Date: Mon, 11 May 2020 15:00:48 +0200 Subject: [PATCH 32/65] Log error when encountering corrupt saved object during migration (#65829) * Log error when encountering corrupt saved object during migration * Fix documentation * Fix types --- ...re-server.savedobjectsmigrationlogger.error.md | 11 +++++++++++ ...gin-core-server.savedobjectsmigrationlogger.md | 1 + ...gins-data-server.iindexpattern.gettimefield.md | 15 +++++++++++++++ .../migrations/core/index_migrator.ts | 2 +- .../migrations/core/migrate_raw_docs.test.ts | 12 +++++++++--- .../migrations/core/migrate_raw_docs.ts | 8 +++++++- .../migrations/core/migration_coordinator.test.ts | 8 ++------ .../migrations/core/migration_logger.ts | 4 +++- .../migrations/kibana/kibana_migrator.ts | 2 +- src/core/server/saved_objects/migrations/mocks.ts | 5 +++-- src/core/server/server.api.md | 3 ++- src/plugins/data/server/server.api.md | 3 +-- 12 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.error.md create mode 100644 docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.gettimefield.md diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.error.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.error.md new file mode 100644 index 00000000000000..7536cd2b07ae6c --- /dev/null +++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.error.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [kibana-plugin-core-server](./kibana-plugin-core-server.md) > [SavedObjectsMigrationLogger](./kibana-plugin-core-server.savedobjectsmigrationlogger.md) > [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md) + +## SavedObjectsMigrationLogger.error property + +Signature: + +```typescript +error: (msg: string, meta: LogMeta) => void; +``` diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.md index 066643516b213a..1b691ee8cb16dc 100644 --- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.md +++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsmigrationlogger.md @@ -16,6 +16,7 @@ export interface SavedObjectsMigrationLogger | Property | Type | Description | | --- | --- | --- | | [debug](./kibana-plugin-core-server.savedobjectsmigrationlogger.debug.md) | (msg: string) => void | | +| [error](./kibana-plugin-core-server.savedobjectsmigrationlogger.error.md) | (msg: string, meta: LogMeta) => void | | | [info](./kibana-plugin-core-server.savedobjectsmigrationlogger.info.md) | (msg: string) => void | | | [warn](./kibana-plugin-core-server.savedobjectsmigrationlogger.warn.md) | (msg: string) => void | | | [warning](./kibana-plugin-core-server.savedobjectsmigrationlogger.warning.md) | (msg: string) => void | | diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.gettimefield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.gettimefield.md new file mode 100644 index 00000000000000..a4d6abcf86a940 --- /dev/null +++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.iindexpattern.gettimefield.md @@ -0,0 +1,15 @@ + + +[Home](./index.md) > [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) > [IIndexPattern](./kibana-plugin-plugins-data-server.iindexpattern.md) > [getTimeField](./kibana-plugin-plugins-data-server.iindexpattern.gettimefield.md) + +## IIndexPattern.getTimeField() method + +Signature: + +```typescript +getTimeField?(): IFieldType | undefined; +``` +Returns: + +`IFieldType | undefined` + diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.ts b/src/core/server/saved_objects/migrations/core/index_migrator.ts index c75fa68572c710..ef2a8870d78d0f 100644 --- a/src/core/server/saved_objects/migrations/core/index_migrator.ts +++ b/src/core/server/saved_objects/migrations/core/index_migrator.ts @@ -195,7 +195,7 @@ async function migrateSourceToDest(context: Context) { await Index.write( callCluster, dest.indexName, - migrateRawDocs(serializer, documentMigrator.migrate, docs) + migrateRawDocs(serializer, documentMigrator.migrate, docs, log) ); } } diff --git a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts index 89f3fde3848488..e55b72be2436d9 100644 --- a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts +++ b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts @@ -21,6 +21,7 @@ import _ from 'lodash'; import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry'; import { SavedObjectsSerializer } from '../../serialization'; import { migrateRawDocs } from './migrate_raw_docs'; +import { createSavedObjectsMigrationLoggerMock } from '../../migrations/mocks'; describe('migrateRawDocs', () => { test('converts raw docs to saved objects', async () => { @@ -31,7 +32,8 @@ describe('migrateRawDocs', () => { [ { _id: 'a:b', _source: { type: 'a', a: { name: 'AAA' } } }, { _id: 'c:d', _source: { type: 'c', c: { name: 'DDD' } } }, - ] + ], + createSavedObjectsMigrationLoggerMock() ); expect(result).toEqual([ @@ -48,7 +50,8 @@ describe('migrateRawDocs', () => { expect(transform).toHaveBeenCalled(); }); - test('passes invalid docs through untouched', async () => { + test('passes invalid docs through untouched and logs error', async () => { + const logger = createSavedObjectsMigrationLoggerMock(); const transform = jest.fn((doc: any) => _.set(_.cloneDeep(doc), 'attributes.name', 'TADA') ); @@ -58,7 +61,8 @@ describe('migrateRawDocs', () => { [ { _id: 'foo:b', _source: { type: 'a', a: { name: 'AAA' } } }, { _id: 'c:d', _source: { type: 'c', c: { name: 'DDD' } } }, - ] + ], + logger ); expect(result).toEqual([ @@ -82,5 +86,7 @@ describe('migrateRawDocs', () => { }, ], ]); + + expect(logger.error).toBeCalledTimes(1); }); }); diff --git a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts index 5fe15f40db8ec8..49acea82e1c8af 100644 --- a/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts +++ b/src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts @@ -23,6 +23,7 @@ import { SavedObjectsRawDoc, SavedObjectsSerializer } from '../../serialization'; import { TransformFn } from './document_migrator'; +import { SavedObjectsMigrationLogger } from '.'; /** * Applies the specified migration function to every saved object document in the list @@ -35,7 +36,8 @@ import { TransformFn } from './document_migrator'; export function migrateRawDocs( serializer: SavedObjectsSerializer, migrateDoc: TransformFn, - rawDocs: SavedObjectsRawDoc[] + rawDocs: SavedObjectsRawDoc[], + log: SavedObjectsMigrationLogger ): SavedObjectsRawDoc[] { return rawDocs.map(raw => { if (serializer.isRawSavedObject(raw)) { @@ -47,6 +49,10 @@ export function migrateRawDocs( }); } + log.error( + `Error: Unable to migrate the corrupt Saved Object document ${raw._id}. To prevent Kibana from performing a migration on every restart, please delete or fix this document by ensuring that the namespace and type in the document's id matches the values in the namespace and type fields.`, + { rawDocument: raw } + ); return raw; }); } diff --git a/src/core/server/saved_objects/migrations/core/migration_coordinator.test.ts b/src/core/server/saved_objects/migrations/core/migration_coordinator.test.ts index 800edaeaa58858..3f2c31a7c0e5cf 100644 --- a/src/core/server/saved_objects/migrations/core/migration_coordinator.test.ts +++ b/src/core/server/saved_objects/migrations/core/migration_coordinator.test.ts @@ -19,14 +19,10 @@ import _ from 'lodash'; import { coordinateMigration } from './migration_coordinator'; +import { createSavedObjectsMigrationLoggerMock } from '../mocks'; describe('coordinateMigration', () => { - const log = { - debug: jest.fn(), - warning: jest.fn(), - warn: jest.fn(), - info: jest.fn(), - }; + const log = createSavedObjectsMigrationLoggerMock(); test('waits for isMigrated, if there is an index conflict', async () => { const pollInterval = 1; diff --git a/src/core/server/saved_objects/migrations/core/migration_logger.ts b/src/core/server/saved_objects/migrations/core/migration_logger.ts index 9dfb3abc8e72da..00ed8bf0b73fc5 100644 --- a/src/core/server/saved_objects/migrations/core/migration_logger.ts +++ b/src/core/server/saved_objects/migrations/core/migration_logger.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Logger } from 'src/core/server/logging'; +import { Logger, LogMeta } from '../../../logging'; /* * This file provides a helper class for ensuring that all logging @@ -35,6 +35,7 @@ export interface SavedObjectsMigrationLogger { */ warning: (msg: string) => void; warn: (msg: string) => void; + error: (msg: string, meta: LogMeta) => void; } export class MigrationLogger implements SavedObjectsMigrationLogger { @@ -48,4 +49,5 @@ export class MigrationLogger implements SavedObjectsMigrationLogger { public debug = (msg: string) => this.logger.debug(msg); public warning = (msg: string) => this.logger.warn(msg); public warn = (msg: string) => this.logger.warn(msg); + public error = (msg: string, meta: LogMeta) => this.logger.error(msg, meta); } diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts index dafd6c53411966..7d9ff9bed6d728 100644 --- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts +++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.ts @@ -22,9 +22,9 @@ * (the shape of the mappings and documents in the index). */ -import { Logger } from 'src/core/server/logging'; import { KibanaConfigType } from 'src/core/server/kibana_config'; import { BehaviorSubject } from 'rxjs'; +import { Logger } from '../../../logging'; import { IndexMapping, SavedObjectsTypeMappingDefinitions } from '../../mappings'; import { SavedObjectUnsanitizedDoc, SavedObjectsSerializer } from '../../serialization'; import { docValidator, PropertyValidators } from '../../validation'; diff --git a/src/core/server/saved_objects/migrations/mocks.ts b/src/core/server/saved_objects/migrations/mocks.ts index 76a890d26bfa0c..50a71913934720 100644 --- a/src/core/server/saved_objects/migrations/mocks.ts +++ b/src/core/server/saved_objects/migrations/mocks.ts @@ -20,12 +20,13 @@ import { SavedObjectMigrationContext } from './types'; import { SavedObjectsMigrationLogger } from './core'; -const createLoggerMock = (): jest.Mocked => { +export const createSavedObjectsMigrationLoggerMock = (): jest.Mocked => { const mock = { debug: jest.fn(), info: jest.fn(), warning: jest.fn(), warn: jest.fn(), + error: jest.fn(), }; return mock; @@ -33,7 +34,7 @@ const createLoggerMock = (): jest.Mocked => { const createContextMock = (): jest.Mocked => { const mock = { - log: createLoggerMock(), + log: createSavedObjectsMigrationLoggerMock(), }; return mock; }; diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md index bd6046b5ec2812..e4234689c25e81 100644 --- a/src/core/server/server.api.md +++ b/src/core/server/server.api.md @@ -91,7 +91,6 @@ import { IngestGetPipelineParams } from 'elasticsearch'; import { IngestPutPipelineParams } from 'elasticsearch'; import { IngestSimulateParams } from 'elasticsearch'; import { KibanaConfigType } from 'src/core/server/kibana_config'; -import { Logger as Logger_2 } from 'src/core/server/logging'; import { MGetParams } from 'elasticsearch'; import { MGetResponse } from 'elasticsearch'; import { MSearchParams } from 'elasticsearch'; @@ -2169,6 +2168,8 @@ export interface SavedObjectsMigrationLogger { // (undocumented) debug: (msg: string) => void; // (undocumented) + error: (msg: string, meta: LogMeta) => void; + // (undocumented) info: (msg: string) => void; // (undocumented) warn: (msg: string) => void; diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md index df4ba23244b4dc..1f4076aa12bded 100644 --- a/src/plugins/data/server/server.api.md +++ b/src/plugins/data/server/server.api.md @@ -93,8 +93,7 @@ import { IngestGetPipelineParams } from 'elasticsearch'; import { IngestPutPipelineParams } from 'elasticsearch'; import { IngestSimulateParams } from 'elasticsearch'; import { KibanaConfigType as KibanaConfigType_2 } from 'src/core/server/kibana_config'; -import { Logger as Logger_2 } from 'src/core/server/logging'; -import { Logger as Logger_3 } from 'kibana/server'; +import { Logger as Logger_2 } from 'kibana/server'; import { MGetParams } from 'elasticsearch'; import { MGetResponse } from 'elasticsearch'; import moment from 'moment'; From 0ae5e24d01a850357a9394afa01622ae7ffc2de4 Mon Sep 17 00:00:00 2001 From: Jason Rhodes Date: Mon, 11 May 2020 09:56:37 -0400 Subject: [PATCH 33/65] Initializes alert form with existing values (for editing) (#65926) --- .../components/alerting/logs/expression_editor/editor.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/editor.tsx b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/editor.tsx index 8bdffbeb36f3a5..06855cc7e765dc 100644 --- a/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/editor.tsx +++ b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/editor.tsx @@ -129,7 +129,7 @@ export const Editor: React.FC = props => { const { sourceStatus } = useLogSourceContext(); useMount(() => { - for (const [key, value] of Object.entries(DEFAULT_EXPRESSION)) { + for (const [key, value] of Object.entries({ ...DEFAULT_EXPRESSION, ...alertParams })) { setAlertParams(key, value); setHasSetDefaults(true); } From d1e4d37c46686423dfd24cb37b6ba227c3a8afdd Mon Sep 17 00:00:00 2001 From: Dima Arnautov Date: Mon, 11 May 2020 15:57:12 +0200 Subject: [PATCH 34/65] [ML] Cardinality validation API integration tests (#65971) * [ML] refactor validate_cardinality to TS * [ML] cardinality api integration tests * [ML] resolve PR comments, validateJobObject as TS guard --- .../models/data_visualizer/data_visualizer.ts | 4 +- .../job_validation/validate_cardinality.d.ts | 13 -- ...cardinality.js => validate_cardinality.ts} | 64 ++++--- .../job_validation/validate_job_object.ts | 3 +- .../apis/ml/job_validation/cardinality.ts | 175 ++++++++++++++++++ .../apis/ml/job_validation/index.ts | 1 + 6 files changed, 223 insertions(+), 37 deletions(-) delete mode 100644 x-pack/plugins/ml/server/models/job_validation/validate_cardinality.d.ts rename x-pack/plugins/ml/server/models/job_validation/{validate_cardinality.js => validate_cardinality.ts} (76%) create mode 100644 x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts diff --git a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts index 645625f92df295..8ccd359137b670 100644 --- a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts +++ b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts @@ -342,8 +342,8 @@ export class DataVisualizer { aggregatableFields: string[], samplerShardSize: number, timeFieldName: string, - earliestMs: number, - latestMs: number + earliestMs?: number, + latestMs?: number ) { const index = indexPatternTitle; const size = 0; diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.d.ts b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.d.ts deleted file mode 100644 index 2fad1252e64465..00000000000000 --- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { APICaller } from 'kibana/server'; -import { CombinedJob } from '../../../common/types/anomaly_detection_jobs'; - -export function validateCardinality( - callAsCurrentUser: APICaller, - job?: CombinedJob -): Promise; diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.js b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts similarity index 76% rename from x-pack/plugins/ml/server/models/job_validation/validate_cardinality.js rename to x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts index 22e0510782e115..cf3d6d004c37e2 100644 --- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.js +++ b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts @@ -4,21 +4,22 @@ * you may not use this file except in compliance with the Elastic License. */ -import _ from 'lodash'; - +import { APICaller } from 'kibana/server'; import { DataVisualizer } from '../data_visualizer'; import { validateJobObject } from './validate_job_object'; +import { CombinedJob } from '../../../common/types/anomaly_detection_jobs'; +import { Detector } from '../../../common/types/anomaly_detection_jobs'; -function isValidCategorizationConfig(job, fieldName) { +function isValidCategorizationConfig(job: CombinedJob, fieldName: string): boolean { return ( typeof job.analysis_config.categorization_field_name !== 'undefined' && fieldName === 'mlcategory' ); } -function isScriptField(job, fieldName) { - const scriptFields = Object.keys(_.get(job, 'datafeed_config.script_fields', {})); +function isScriptField(job: CombinedJob, fieldName: string): boolean { + const scriptFields = Object.keys(job.datafeed_config.script_fields ?? {}); return scriptFields.includes(fieldName); } @@ -30,10 +31,21 @@ const PARTITION_FIELD_CARDINALITY_THRESHOLD = 1000; const BY_FIELD_CARDINALITY_THRESHOLD = 1000; const MODEL_PLOT_THRESHOLD_HIGH = 100; -const validateFactory = (callWithRequest, job) => { +type Messages = Array<{ id: string; fieldName?: string }>; + +type Validator = (obj: { + type: string; + isInvalid: (cardinality: number) => boolean; + messageId?: string; +}) => Promise<{ + modelPlotCardinality: number; + messages: Messages; +}>; + +const validateFactory = (callWithRequest: APICaller, job: CombinedJob): Validator => { const dv = new DataVisualizer(callWithRequest); - const modelPlotConfigTerms = _.get(job, ['model_plot_config', 'terms'], ''); + const modelPlotConfigTerms = job?.model_plot_config?.terms ?? ''; const modelPlotConfigFieldCount = modelPlotConfigTerms.length > 0 ? modelPlotConfigTerms.split(',').length : 0; @@ -42,8 +54,11 @@ const validateFactory = (callWithRequest, job) => { // if model_plot_config.terms is used, it doesn't count the real cardinality of the field // but adds only the count of fields used in model_plot_config.terms let modelPlotCardinality = 0; - const messages = []; - const fieldName = `${type}_field_name`; + const messages: Messages = []; + const fieldName = `${type}_field_name` as keyof Pick< + Detector, + 'by_field_name' | 'over_field_name' | 'partition_field_name' + >; const detectors = job.analysis_config.detectors; const relevantDetectors = detectors.filter(detector => { @@ -52,7 +67,7 @@ const validateFactory = (callWithRequest, job) => { if (relevantDetectors.length > 0) { try { - const uniqueFieldNames = _.uniq(relevantDetectors.map(f => f[fieldName])); + const uniqueFieldNames = [...new Set(relevantDetectors.map(f => f[fieldName]))] as string[]; // use fieldCaps endpoint to get data about whether fields are aggregatable const fieldCaps = await callWithRequest('fieldCaps', { @@ -60,7 +75,7 @@ const validateFactory = (callWithRequest, job) => { fields: uniqueFieldNames, }); - let aggregatableFieldNames = []; + let aggregatableFieldNames: string[] = []; // parse fieldCaps to return an array of just the fields which are aggregatable if (typeof fieldCaps === 'object' && typeof fieldCaps.fields === 'object') { aggregatableFieldNames = uniqueFieldNames.filter(field => { @@ -81,12 +96,14 @@ const validateFactory = (callWithRequest, job) => { ); uniqueFieldNames.forEach(uniqueFieldName => { - const field = _.find(stats.aggregatableExistsFields, { fieldName: uniqueFieldName }); - if (typeof field === 'object') { + const field = stats.aggregatableExistsFields.find( + fieldData => fieldData.fieldName === uniqueFieldName + ); + if (field !== undefined && typeof field === 'object' && field.stats) { modelPlotCardinality += - modelPlotConfigFieldCount > 0 ? modelPlotConfigFieldCount : field.stats.cardinality; + modelPlotConfigFieldCount > 0 ? modelPlotConfigFieldCount : field.stats.cardinality!; - if (isInvalid(field.stats.cardinality)) { + if (isInvalid(field.stats.cardinality!)) { messages.push({ id: messageId || `cardinality_${type}_field`, fieldName: uniqueFieldName, @@ -115,7 +132,7 @@ const validateFactory = (callWithRequest, job) => { if (relevantDetectors.length === 1) { messages.push({ id: 'field_not_aggregatable', - fieldName: relevantDetectors[0][fieldName], + fieldName: relevantDetectors[0][fieldName]!, }); } else { messages.push({ id: 'fields_not_aggregatable' }); @@ -129,10 +146,16 @@ const validateFactory = (callWithRequest, job) => { }; }; -export async function validateCardinality(callWithRequest, job) { +export async function validateCardinality( + callWithRequest: APICaller, + job?: CombinedJob +): Promise> | never { const messages = []; - validateJobObject(job); + if (!validateJobObject(job)) { + // required for TS type casting, validateJobObject throws an error internally. + throw new Error(); + } // find out if there are any relevant detector field names // where cardinality checks could be run against. @@ -140,14 +163,13 @@ export async function validateCardinality(callWithRequest, job) { return d.by_field_name || d.over_field_name || d.partition_field_name; }); if (numDetectorsWithFieldNames.length === 0) { - return Promise.resolve([]); + return []; } // validate({ type, isInvalid }) asynchronously returns an array of validation messages const validate = validateFactory(callWithRequest, job); - const modelPlotEnabled = - (job.model_plot_config && job.model_plot_config.enabled === true) || false; + const modelPlotEnabled = job.model_plot_config?.enabled ?? false; // check over fields (population analysis) const validateOverFieldsLow = validate({ diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_job_object.ts b/x-pack/plugins/ml/server/models/job_validation/validate_job_object.ts index b0271fb5b4f45c..0d89656e051173 100644 --- a/x-pack/plugins/ml/server/models/job_validation/validate_job_object.ts +++ b/x-pack/plugins/ml/server/models/job_validation/validate_job_object.ts @@ -7,7 +7,7 @@ import { i18n } from '@kbn/i18n'; import { CombinedJob } from '../../../common/types/anomaly_detection_jobs'; -export function validateJobObject(job: CombinedJob | null) { +export function validateJobObject(job: CombinedJob | null | undefined): job is CombinedJob | never { if (job === null || typeof job !== 'object') { throw new Error( i18n.translate('xpack.ml.models.jobValidation.validateJobObject.jobIsNotObjectErrorMessage', { @@ -93,4 +93,5 @@ export function validateJobObject(job: CombinedJob | null) { ) ); } + return true; } diff --git a/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts b/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts new file mode 100644 index 00000000000000..e51a3b3c1772c2 --- /dev/null +++ b/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts @@ -0,0 +1,175 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../ftr_provider_context'; +import { USER } from '../../../../functional/services/machine_learning/security_common'; + +const COMMON_HEADERS = { + 'kbn-xsrf': 'some-xsrf-token', +}; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext) => { + const esArchiver = getService('esArchiver'); + const supertest = getService('supertestWithoutAuth'); + const ml = getService('ml'); + + describe('ValidateCardinality', function() { + before(async () => { + await esArchiver.loadIfNeeded('ml/ecommerce'); + await ml.testResources.setKibanaTimeZoneToUTC(); + }); + + after(async () => { + await ml.api.cleanMlIndices(); + }); + + it(`should recognize a valid cardinality`, async () => { + const requestBody = { + job_id: '', + description: '', + groups: [], + analysis_config: { + bucket_span: '10m', + detectors: [ + { + function: 'mean', + field_name: 'products.base_price', + partition_field_name: 'geoip.city_name', + }, + ], + influencers: ['geoip.city_name'], + }, + data_description: { time_field: 'order_date' }, + analysis_limits: { model_memory_limit: '12MB' }, + model_plot_config: { enabled: true }, + datafeed_config: { + datafeed_id: 'datafeed-', + job_id: '', + indices: ['ft_ecommerce'], + query: { bool: { must: [{ match_all: {} }], filter: [], must_not: [] } }, + }, + }; + + const { body } = await supertest + .post('/api/ml/validate/cardinality') + .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER)) + .set(COMMON_HEADERS) + .send(requestBody) + .expect(200); + + expect(body).to.eql([{ id: 'success_cardinality' }]); + }); + + it(`should recognize a high model plot cardinality`, async () => { + const requestBody = { + job_id: '', + description: '', + groups: [], + analysis_config: { + bucket_span: '10m', + detectors: [ + { + function: 'mean', + field_name: 'products.base_price', + // some high cardinality field + partition_field_name: 'order_id', + }, + ], + influencers: ['geoip.city_name'], + }, + data_description: { time_field: 'order_date' }, + analysis_limits: { model_memory_limit: '11MB' }, + model_plot_config: { enabled: true }, + datafeed_config: { + datafeed_id: 'datafeed-', + job_id: '', + indices: ['ft_ecommerce'], + query: { bool: { must: [{ match_all: {} }], filter: [], must_not: [] } }, + }, + }; + const { body } = await supertest + .post('/api/ml/validate/cardinality') + .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER)) + .set(COMMON_HEADERS) + .send(requestBody) + .expect(200); + + expect(body).to.eql([ + { id: 'cardinality_model_plot_high', modelPlotCardinality: 4711 }, + { id: 'cardinality_partition_field', fieldName: 'order_id' }, + ]); + }); + + it('should not validate cardinality in case request payload is invalid', async () => { + const requestBody = { + job_id: '', + description: '', + groups: [], + // missing analysis_config + data_description: { time_field: 'order_date' }, + analysis_limits: { model_memory_limit: '12MB' }, + model_plot_config: { enabled: true }, + datafeed_config: { + datafeed_id: 'datafeed-', + job_id: '', + indices: ['ft_ecommerce'], + query: { bool: { must: [{ match_all: {} }], filter: [], must_not: [] } }, + }, + }; + + const { body } = await supertest + .post('/api/ml/validate/cardinality') + .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER)) + .set(COMMON_HEADERS) + .send(requestBody) + .expect(400); + + expect(body.error).to.eql('Bad Request'); + expect(body.message).to.eql( + '[request body.analysis_config.detectors]: expected value of type [array] but got [undefined]' + ); + }); + + it('should not validate cardinality if the user does not have required permissions', async () => { + const requestBody = { + job_id: '', + description: '', + groups: [], + analysis_config: { + bucket_span: '10m', + detectors: [ + { + function: 'mean', + field_name: 'products.base_price', + partition_field_name: 'geoip.city_name', + }, + ], + influencers: ['geoip.city_name'], + }, + data_description: { time_field: 'order_date' }, + analysis_limits: { model_memory_limit: '12MB' }, + model_plot_config: { enabled: true }, + datafeed_config: { + datafeed_id: 'datafeed-', + job_id: '', + indices: ['ft_ecommerce'], + query: { bool: { must: [{ match_all: {} }], filter: [], must_not: [] } }, + }, + }; + + const { body } = await supertest + .post('/api/ml/validate/cardinality') + .auth(USER.ML_VIEWER, ml.securityCommon.getPasswordForUser(USER.ML_VIEWER)) + .set(COMMON_HEADERS) + .send(requestBody) + .expect(404); + + expect(body.error).to.eql('Not Found'); + expect(body.message).to.eql('Not Found'); + }); + }); +}; diff --git a/x-pack/test/api_integration/apis/ml/job_validation/index.ts b/x-pack/test/api_integration/apis/ml/job_validation/index.ts index 6ca9dcbbe9e5b8..fa894de839cd28 100644 --- a/x-pack/test/api_integration/apis/ml/job_validation/index.ts +++ b/x-pack/test/api_integration/apis/ml/job_validation/index.ts @@ -9,5 +9,6 @@ export default function({ loadTestFile }: FtrProviderContext) { describe('job validation', function() { loadTestFile(require.resolve('./bucket_span_estimator')); loadTestFile(require.resolve('./calculate_model_memory_limit')); + loadTestFile(require.resolve('./cardinality')); }); } From d5737a54c242cc0128f3b262ba030a11029afd23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Marcondes?= <55978943+cauemarcondes@users.noreply.github.com> Date: Mon, 11 May 2020 14:57:46 +0100 Subject: [PATCH 35/65] [APM] Don't mutating the original waterfall item while reparenting spans (#65840) * do not mutate the waterfall items * addressing pr comments Co-authored-by: Elastic Machine --- .../waterfall_helpers/waterfall_helpers.ts | 41 +++++++++++-------- .../waterfallContainer.stories.data.ts | 2 +- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts index 8ddce66f0b853d..e15cf2df38c5f5 100644 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts @@ -236,28 +236,33 @@ const getWaterfallItems = (items: TraceAPIResponse['trace']['items']) => } }); -/** - * Changes the parent_id of items based on the child.id property. - * Solves the problem of Inferred spans that are created as child of trace spans - * when it actually should be its parent. - * @param waterfallItems - */ -const reparentSpans = (waterfallItems: IWaterfallItem[]) => { +function reparentSpans(waterfallItems: IWaterfallItem[]) { + // find children that needs to be re-parented and map them to their correct parent id + const childIdToParentIdMapping = Object.fromEntries( + flatten( + waterfallItems.map(waterfallItem => { + if (waterfallItem.docType === 'span') { + const childIds = waterfallItem.doc.child?.id ?? []; + return childIds.map(id => [id, waterfallItem.id]); + } + return []; + }) + ) + ); + + // update parent id for children that needs it or return unchanged return waterfallItems.map(waterfallItem => { - if (waterfallItem.docType === 'span') { - const childId = waterfallItem.doc.child?.id; - if (childId) { - childId.forEach(id => { - const item = waterfallItems.find(_item => _item.id === id); - if (item) { - item.parentId = waterfallItem.id; - } - }); - } + const newParentId = childIdToParentIdMapping[waterfallItem.id]; + if (newParentId) { + return { + ...waterfallItem, + parentId: newParentId + }; } + return waterfallItem; }); -}; +} const getChildrenGroupedByParentId = (waterfallItems: IWaterfallItem[]) => groupBy(waterfallItems, item => (item.parentId ? item.parentId : ROOT_ID)); diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts index 2f28e37f73f624..6f4a0629c7bc51 100644 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/waterfallContainer.stories.data.ts @@ -2027,7 +2027,7 @@ export const inferredSpans = { id: '41226ae63af4f235', type: 'unknown' }, - child: { ids: ['8d80de06aa11a6fc'] } + child: { id: ['8d80de06aa11a6fc'] } }, { container: { From a3d3ae9661fcb115f65f3e5c259395bb8275f2a0 Mon Sep 17 00:00:00 2001 From: Alison Goryachev Date: Mon, 11 May 2020 10:05:27 -0400 Subject: [PATCH 36/65] [Ingest pipelines] Make description field optional (#65961) --- .../ingest_pipelines_create.test.tsx | 6 +--- .../components/pipeline_form/schema.tsx | 11 +------ .../pipelines_list/details_flyout.tsx | 18 +++++++----- .../server/routes/api/create.ts | 2 +- .../ingest_pipelines/ingest_pipelines.ts | 29 ++++++++++++++++++- 5 files changed, 41 insertions(+), 25 deletions(-) diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create.test.tsx b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create.test.tsx index e0be8d2937729c..6acb6369e2e907 100644 --- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create.test.tsx +++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_create.test.tsx @@ -107,15 +107,11 @@ describe('', () => { component.update(); }); - expect(form.getErrorsMessages()).toEqual([ - 'Name is required.', - 'A description is required.', - ]); + expect(form.getErrorsMessages()).toEqual(['Name is required.']); expect(find('submitButton').props().disabled).toEqual(true); // Add required fields and verify button is enabled again form.setInputValue('nameField.input', 'my_pipeline'); - form.setInputValue('descriptionField.input', 'pipeline description'); await act(async () => { await nextTick(); diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/schema.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/schema.tsx index f222d48c11af00..e122307ca9485d 100644 --- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/schema.tsx +++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_form/schema.tsx @@ -34,17 +34,8 @@ export const pipelineFormSchema: FormSchema = { description: { type: FIELD_TYPES.TEXTAREA, label: i18n.translate('xpack.ingestPipelines.form.descriptionFieldLabel', { - defaultMessage: 'Description', + defaultMessage: 'Description (optional)', }), - validations: [ - { - validator: emptyField( - i18n.translate('xpack.ingestPipelines.form.pipelineDescriptionRequiredError', { - defaultMessage: 'A description is required.', - }) - ), - }, - ], }, processors: { label: i18n.translate('xpack.ingestPipelines.form.processorsFieldLabel', { diff --git a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/details_flyout.tsx b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/details_flyout.tsx index a6eff63b5e725f..39789bb38ed41b 100644 --- a/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/details_flyout.tsx +++ b/x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/details_flyout.tsx @@ -117,14 +117,16 @@ export const PipelineDetailsFlyout: FunctionComponent = ({ {/* Pipeline description */} - - {i18n.translate('xpack.ingestPipelines.list.pipelineDetails.descriptionTitle', { - defaultMessage: 'Description', - })} - - - {pipeline.description ?? ''} - + {pipeline.description && ( + <> + + {i18n.translate('xpack.ingestPipelines.list.pipelineDetails.descriptionTitle', { + defaultMessage: 'Description', + })} + + {pipeline.description} + + )} {/* Pipeline version */} {pipeline.version && ( diff --git a/x-pack/plugins/ingest_pipelines/server/routes/api/create.ts b/x-pack/plugins/ingest_pipelines/server/routes/api/create.ts index 63637eaac765d8..803d34bf0042b2 100644 --- a/x-pack/plugins/ingest_pipelines/server/routes/api/create.ts +++ b/x-pack/plugins/ingest_pipelines/server/routes/api/create.ts @@ -12,7 +12,7 @@ import { RouteDependencies } from '../../types'; const bodySchema = schema.object({ name: schema.string(), - description: schema.string(), + description: schema.maybe(schema.string()), processors: schema.arrayOf(schema.recordOf(schema.string(), schema.any())), version: schema.maybe(schema.number()), on_failure: schema.maybe(schema.arrayOf(schema.recordOf(schema.string(), schema.any()))), diff --git a/x-pack/test/api_integration/apis/management/ingest_pipelines/ingest_pipelines.ts b/x-pack/test/api_integration/apis/management/ingest_pipelines/ingest_pipelines.ts index 88a78d048a3b60..f2f749a58dac3c 100644 --- a/x-pack/test/api_integration/apis/management/ingest_pipelines/ingest_pipelines.ts +++ b/x-pack/test/api_integration/apis/management/ingest_pipelines/ingest_pipelines.ts @@ -19,7 +19,12 @@ export default function({ getService }: FtrProviderContext) { describe('Pipelines', function() { describe('Create', () => { const PIPELINE_ID = 'test_create_pipeline'; - after(() => deletePipeline(PIPELINE_ID)); + const REQUIRED_FIELDS_PIPELINE_ID = 'test_create_required_fields_pipeline'; + + after(() => { + deletePipeline(PIPELINE_ID); + deletePipeline(REQUIRED_FIELDS_PIPELINE_ID); + }); it('should create a pipeline', async () => { const { body } = await supertest @@ -52,6 +57,28 @@ export default function({ getService }: FtrProviderContext) { }); }); + it('should create a pipeline with only required fields', async () => { + const { body } = await supertest + .post(API_BASE_PATH) + .set('kbn-xsrf', 'xxx') + // Excludes description, version and on_failure processors + .send({ + name: REQUIRED_FIELDS_PIPELINE_ID, + processors: [ + { + script: { + source: 'ctx._type = null', + }, + }, + ], + }) + .expect(200); + + expect(body).to.eql({ + acknowledged: true, + }); + }); + it('should not allow creation of an existing pipeline', async () => { const { body } = await supertest .post(API_BASE_PATH) From 7526db98e8f67f7c01758b7a8000b47a90c8e9ea Mon Sep 17 00:00:00 2001 From: Bhavya RM Date: Mon, 11 May 2020 10:30:50 -0400 Subject: [PATCH 37/65] Addressing test failures with a11y tests on management (#65758) fixing test failure #60470 --- .../edit_index_pattern/tabs/tabs.tsx | 11 +++++--- test/accessibility/apps/management.ts | 25 ++++++------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/tabs.tsx b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/tabs.tsx index bfd507876a9d6b..247af7e20d5815 100644 --- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/tabs.tsx +++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/tabs.tsx @@ -49,14 +49,18 @@ interface TabsProps extends Pick { }; } +const searchAriaLabel = i18n.translate('kbn.management.editIndexPattern.fields.searchAria', { + defaultMessage: 'Search fields', +}); + const filterAriaLabel = i18n.translate('kbn.management.editIndexPattern.fields.filterAria', { - defaultMessage: 'Filter', + defaultMessage: 'Filter field types', }); const filterPlaceholder = i18n.translate( 'kbn.management.editIndexPattern.fields.filterPlaceholder', { - defaultMessage: 'Filter', + defaultMessage: 'Search', } ); @@ -108,7 +112,7 @@ export function Tabs({ config, indexPattern, fields, services, history, location value={fieldFilter} onChange={e => setFieldFilter(e.target.value)} data-test-subj="indexPatternFieldFilter" - aria-label={filterAriaLabel} + aria-label={searchAriaLabel} /> {type === TAB_INDEXED_FIELDS && indexedFieldTypes.length > 0 && ( @@ -118,6 +122,7 @@ export function Tabs({ config, indexPattern, fields, services, history, location value={indexedFieldTypeFilter} onChange={e => setIndexedFieldTypeFilter(e.target.value)} data-test-subj="indexedFieldTypeFilterDropdown" + aria-label={filterAriaLabel} /> )} diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts index 9e75250403d6b1..cc60e672fe880c 100644 --- a/test/accessibility/apps/management.ts +++ b/test/accessibility/apps/management.ts @@ -20,23 +20,12 @@ import { FtrProviderContext } from '../ftr_provider_context'; export default function({ getService, getPageObjects }: FtrProviderContext) { - const PageObjects = getPageObjects(['common', 'settings']); + const PageObjects = getPageObjects(['common', 'settings', 'header']); const esArchiver = getService('esArchiver'); const kibanaServer = getService('kibanaServer'); - const testSubjects = getService('testSubjects'); const a11y = getService('a11y'); - // describe('Management', () => { - // before(async () => { - // await esArchiver.loadIfNeeded('logstash_functional'); - // await kibanaServer.uiSettings.update({ - // defaultIndex: 'logstash-*', - // }); - // await PageObjects.common.navigateToApp('settings'); - // }); - - // FLAKY: https://github.com/elastic/kibana/issues/60470 - describe.skip('Management', () => { + describe('Management', () => { before(async () => { await esArchiver.load('discover'); await esArchiver.loadIfNeeded('logstash_functional'); @@ -57,23 +46,25 @@ export default function({ getService, getPageObjects }: FtrProviderContext) { it('Single indexpattern view', async () => { await PageObjects.settings.clickIndexPatternLogstash(); + await PageObjects.header.waitUntilLoadingHasFinished(); await a11y.testAppSnapshot(); }); - it('Create Index pattern wizard', async () => { + it('Open create index pattern wizard', async () => { await PageObjects.settings.clickKibanaIndexPatterns(); - await (await testSubjects.find('createIndexPatternButton')).click(); + await PageObjects.settings.clickAddNewIndexPatternButton(); + await PageObjects.header.waitUntilLoadingHasFinished(); await a11y.testAppSnapshot(); }); - // index patterns page + // We are navigating back to index pattern page to test field formatters it('Navigate back to logstash index page', async () => { await PageObjects.settings.clickKibanaIndexPatterns(); await PageObjects.settings.clickIndexPatternLogstash(); await a11y.testAppSnapshot(); }); - // Issue: https://github.com/elastic/kibana/issues/60030 + // Will be enabling this and field formatters after this issue is addressed: https://github.com/elastic/kibana/issues/60030 it.skip('Edit field type', async () => { await PageObjects.settings.clickEditFieldFormat(); await a11y.testAppSnapshot(); From 431a7eb07a8ee95018ae0f77481f3ac983a56642 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Mon, 11 May 2020 08:50:20 -0600 Subject: [PATCH 38/65] [Maps] remove dateline check for geo_shape queries, split geo_bounding_box queries that cross dateline into 2 boxes (#64598) * remove dateline check for geo_shape queries * fix jest test * split bounding box * replace convertMapExtentToPolygon with formatEnvelopeAsPolygon * clamp latitudes * use clampToLatBounds * use single box where left lon is greater then right lon when crossing 180 meridian Co-authored-by: Elastic Machine --- .../public/angular/services/saved_gis_map.js | 4 +- .../maps/public/elasticsearch_geo_utils.js | 96 +++--- .../public/elasticsearch_geo_utils.test.js | 280 ++++++++---------- 3 files changed, 162 insertions(+), 218 deletions(-) diff --git a/x-pack/plugins/maps/public/angular/services/saved_gis_map.js b/x-pack/plugins/maps/public/angular/services/saved_gis_map.js index 1a58b0cefaed97..2de4432871347c 100644 --- a/x-pack/plugins/maps/public/angular/services/saved_gis_map.js +++ b/x-pack/plugins/maps/public/angular/services/saved_gis_map.js @@ -19,7 +19,7 @@ import { } from '../../selectors/map_selectors'; import { getIsLayerTOCOpen, getOpenTOCDetails } from '../../selectors/ui_selectors'; -import { convertMapExtentToPolygon } from '../../elasticsearch_geo_utils'; +import { formatEnvelopeAsPolygon } from '../../elasticsearch_geo_utils'; import { copyPersistentState } from '../../reducers/util'; import { extractReferences, injectReferences } from '../../../common/migrations/references'; @@ -107,7 +107,7 @@ export function createSavedGisMapClass(services) { openTOCDetails: getOpenTOCDetails(state), }); - this.bounds = convertMapExtentToPolygon(getMapExtent(state)); + this.bounds = formatEnvelopeAsPolygon(getMapExtent(state)); } } return SavedGisMap; diff --git a/x-pack/plugins/maps/public/elasticsearch_geo_utils.js b/x-pack/plugins/maps/public/elasticsearch_geo_utils.js index 888fce7e7afe00..419b169138ef12 100644 --- a/x-pack/plugins/maps/public/elasticsearch_geo_utils.js +++ b/x-pack/plugins/maps/public/elasticsearch_geo_utils.js @@ -225,41 +225,62 @@ export function geoShapeToGeometry(value, accumulator) { accumulator.push(geoJson); } -function createGeoBoundBoxFilter(geometry, geoFieldName, filterProps = {}) { - ensureGeometryType(geometry.type, [GEO_JSON_TYPE.POLYGON]); +function createGeoBoundBoxFilter({ maxLat, maxLon, minLat, minLon }, geoFieldName) { + const top = clampToLatBounds(maxLat); + const bottom = clampToLatBounds(minLat); + + // geo_bounding_box does not support ranges outside of -180 and 180 + // When the area crosses the 180° meridian, + // the value of the lower left longitude will be greater than the value of the upper right longitude. + // http://docs.opengeospatial.org/is/12-063r5/12-063r5.html#30 + let boundingBox; + if (maxLon - minLon >= 360) { + boundingBox = { + top_left: [-180, top], + bottom_right: [180, bottom], + }; + } else if (maxLon > 180) { + const overflow = maxLon - 180; + boundingBox = { + top_left: [minLon, top], + bottom_right: [-180 + overflow, bottom], + }; + } else if (minLon < -180) { + const overflow = Math.abs(minLon) - 180; + boundingBox = { + top_left: [180 - overflow, top], + bottom_right: [maxLon, bottom], + }; + } else { + boundingBox = { + top_left: [minLon, top], + bottom_right: [maxLon, bottom], + }; + } - const TOP_LEFT_INDEX = 0; - const BOTTOM_RIGHT_INDEX = 2; - const verticies = geometry.coordinates[POLYGON_COORDINATES_EXTERIOR_INDEX]; return { geo_bounding_box: { - [geoFieldName]: { - top_left: verticies[TOP_LEFT_INDEX], - bottom_right: verticies[BOTTOM_RIGHT_INDEX], - }, + [geoFieldName]: boundingBox, }, - ...filterProps, }; } export function createExtentFilter(mapExtent, geoFieldName, geoFieldType) { ensureGeoField(geoFieldType); - const safePolygon = convertMapExtentToPolygon(mapExtent); - // Extent filters are used to dynamically filter data for the current map view port. // Continue to use geo_bounding_box queries for extent filters // 1) geo_bounding_box queries are faster than polygon queries // 2) geo_shape benefits of pre-indexed shapes and // compatability across multi-indices with geo_point and geo_shape do not apply to this use case. if (geoFieldType === ES_GEO_FIELD_TYPE.GEO_POINT) { - return createGeoBoundBoxFilter(safePolygon, geoFieldName); + return createGeoBoundBoxFilter(mapExtent, geoFieldName); } return { geo_shape: { [geoFieldName]: { - shape: safePolygon, + shape: formatEnvelopeAsPolygon(mapExtent), relation: ES_SPATIAL_RELATIONS.INTERSECTS, }, }, @@ -376,16 +397,16 @@ export function getBoundingBoxGeometry(geometry) { extent.maxLat = Math.max(exterior[i][LAT_INDEX], extent.maxLat); } - return convertMapExtentToPolygon(extent); + return formatEnvelopeAsPolygon(extent); } -function formatEnvelopeAsPolygon({ maxLat, maxLon, minLat, minLon }) { +export function formatEnvelopeAsPolygon({ maxLat, maxLon, minLat, minLon }) { // GeoJSON mandates that the outer polygon must be counterclockwise to avoid ambiguous polygons // when the shape crosses the dateline const left = minLon; const right = maxLon; - const top = maxLat > 90 ? 90 : maxLat; - const bottom = minLat < -90 ? -90 : minLat; + const top = clampToLatBounds(maxLat); + const bottom = clampToLatBounds(minLat); const topLeft = [left, top]; const bottomLeft = [left, bottom]; const bottomRight = [right, bottom]; @@ -396,45 +417,6 @@ function formatEnvelopeAsPolygon({ maxLat, maxLon, minLat, minLon }) { }; } -/* - * Convert map bounds to polygon - */ -export function convertMapExtentToPolygon({ maxLat, maxLon, minLat, minLon }) { - const lonDelta = maxLon - minLon; - if (lonDelta >= 360) { - return formatEnvelopeAsPolygon({ - maxLat, - maxLon: 180, - minLat, - minLon: -180, - }); - } - - if (maxLon > 180) { - // bounds cross dateline east to west - const overlapWestOfDateLine = maxLon - 180; - return formatEnvelopeAsPolygon({ - maxLat, - maxLon: -180 + overlapWestOfDateLine, - minLat, - minLon, - }); - } - - if (minLon < -180) { - // bounds cross dateline west to east - const overlapEastOfDateLine = Math.abs(minLon) - 180; - return formatEnvelopeAsPolygon({ - maxLat, - maxLon, - minLat, - minLon: 180 - overlapEastOfDateLine, - }); - } - - return formatEnvelopeAsPolygon({ maxLat, maxLon, minLat, minLon }); -} - export function clampToLatBounds(lat) { return clamp(lat, -89, 89); } diff --git a/x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js b/x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js index d13291a8e2ba59..c0baf5e4bcb6e8 100644 --- a/x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js +++ b/x-pack/plugins/maps/public/elasticsearch_geo_utils.test.js @@ -17,19 +17,12 @@ import { geoPointToGeometry, geoShapeToGeometry, createExtentFilter, - convertMapExtentToPolygon, roundCoordinates, extractFeaturesFromFilters, } from './elasticsearch_geo_utils'; import { indexPatterns } from '../../../../src/plugins/data/public'; const geoFieldName = 'location'; -const mapExtent = { - maxLat: 39, - maxLon: -83, - minLat: 35, - minLon: -89, -}; const flattenHitMock = hit => { const properties = {}; @@ -317,174 +310,143 @@ describe('geoShapeToGeometry', () => { }); describe('createExtentFilter', () => { - it('should return elasticsearch geo_bounding_box filter for geo_point field', () => { - const filter = createExtentFilter(mapExtent, geoFieldName, 'geo_point'); - expect(filter).toEqual({ - geo_bounding_box: { - location: { - bottom_right: [-83, 35], - top_left: [-89, 39], + describe('geo_point field', () => { + it('should return elasticsearch geo_bounding_box filter for geo_point field', () => { + const mapExtent = { + maxLat: 39, + maxLon: -83, + minLat: 35, + minLon: -89, + }; + const filter = createExtentFilter(mapExtent, geoFieldName, 'geo_point'); + expect(filter).toEqual({ + geo_bounding_box: { + location: { + top_left: [-89, 39], + bottom_right: [-83, 35], + }, }, - }, + }); }); - }); - it('should return elasticsearch geo_shape filter for geo_shape field', () => { - const filter = createExtentFilter(mapExtent, geoFieldName, 'geo_shape'); - expect(filter).toEqual({ - geo_shape: { - location: { - relation: 'INTERSECTS', - shape: { - coordinates: [ - [ - [-89, 39], - [-89, 35], - [-83, 35], - [-83, 39], - [-89, 39], - ], - ], - type: 'Polygon', + it('should clamp longitudes to -180 to 180 and latitudes to -90 to 90', () => { + const mapExtent = { + maxLat: 120, + maxLon: 200, + minLat: -100, + minLon: -190, + }; + const filter = createExtentFilter(mapExtent, geoFieldName, 'geo_point'); + expect(filter).toEqual({ + geo_bounding_box: { + location: { + top_left: [-180, 89], + bottom_right: [180, -89], }, }, - }, + }); }); - }); - it('should clamp longitudes to -180 to 180', () => { - const mapExtent = { - maxLat: 39, - maxLon: 209, - minLat: 35, - minLon: -191, - }; - const filter = createExtentFilter(mapExtent, geoFieldName, 'geo_shape'); - expect(filter).toEqual({ - geo_shape: { - location: { - relation: 'INTERSECTS', - shape: { - coordinates: [ - [ - [-180, 39], - [-180, 35], - [180, 35], - [180, 39], - [-180, 39], - ], - ], - type: 'Polygon', + it('should make left longitude greater then right longitude when area crosses 180 meridian east to west', () => { + const mapExtent = { + maxLat: 39, + maxLon: 200, + minLat: 35, + minLon: 100, + }; + const filter = createExtentFilter(mapExtent, geoFieldName, 'geo_point'); + const leftLon = filter.geo_bounding_box.location.top_left[0]; + const rightLon = filter.geo_bounding_box.location.bottom_right[0]; + expect(leftLon).toBeGreaterThan(rightLon); + expect(filter).toEqual({ + geo_bounding_box: { + location: { + top_left: [100, 39], + bottom_right: [-160, 35], }, }, - }, - }); - }); -}); - -describe('convertMapExtentToPolygon', () => { - it('should convert bounds to envelope', () => { - const bounds = { - maxLat: 10, - maxLon: 100, - minLat: -10, - minLon: 90, - }; - expect(convertMapExtentToPolygon(bounds)).toEqual({ - type: 'Polygon', - coordinates: [ - [ - [90, 10], - [90, -10], - [100, -10], - [100, 10], - [90, 10], - ], - ], - }); - }); - - it('should clamp longitudes to -180 to 180', () => { - const bounds = { - maxLat: 10, - maxLon: 200, - minLat: -10, - minLon: -400, - }; - expect(convertMapExtentToPolygon(bounds)).toEqual({ - type: 'Polygon', - coordinates: [ - [ - [-180, 10], - [-180, -10], - [180, -10], - [180, 10], - [-180, 10], - ], - ], + }); }); - }); - it('should clamp longitudes to -180 to 180 when bounds span entire globe (360)', () => { - const bounds = { - maxLat: 10, - maxLon: 170, - minLat: -10, - minLon: -400, - }; - expect(convertMapExtentToPolygon(bounds)).toEqual({ - type: 'Polygon', - coordinates: [ - [ - [-180, 10], - [-180, -10], - [180, -10], - [180, 10], - [-180, 10], - ], - ], + it('should make left longitude greater then right longitude when area crosses 180 meridian west to east', () => { + const mapExtent = { + maxLat: 39, + maxLon: -100, + minLat: 35, + minLon: -200, + }; + const filter = createExtentFilter(mapExtent, geoFieldName, 'geo_point'); + const leftLon = filter.geo_bounding_box.location.top_left[0]; + const rightLon = filter.geo_bounding_box.location.bottom_right[0]; + expect(leftLon).toBeGreaterThan(rightLon); + expect(filter).toEqual({ + geo_bounding_box: { + location: { + top_left: [160, 39], + bottom_right: [-100, 35], + }, + }, + }); }); }); - it('should handle bounds that cross dateline(east to west)', () => { - const bounds = { - maxLat: 10, - maxLon: 190, - minLat: -10, - minLon: 170, - }; - expect(convertMapExtentToPolygon(bounds)).toEqual({ - type: 'Polygon', - coordinates: [ - [ - [170, 10], - [170, -10], - [-170, -10], - [-170, 10], - [170, 10], - ], - ], + describe('geo_shape field', () => { + it('should return elasticsearch geo_shape filter', () => { + const mapExtent = { + maxLat: 39, + maxLon: -83, + minLat: 35, + minLon: -89, + }; + const filter = createExtentFilter(mapExtent, geoFieldName, 'geo_shape'); + expect(filter).toEqual({ + geo_shape: { + location: { + relation: 'INTERSECTS', + shape: { + coordinates: [ + [ + [-89, 39], + [-89, 35], + [-83, 35], + [-83, 39], + [-89, 39], + ], + ], + type: 'Polygon', + }, + }, + }, + }); }); - }); - it('should handle bounds that cross dateline(west to east)', () => { - const bounds = { - maxLat: 10, - maxLon: -170, - minLat: -10, - minLon: -190, - }; - expect(convertMapExtentToPolygon(bounds)).toEqual({ - type: 'Polygon', - coordinates: [ - [ - [170, 10], - [170, -10], - [-170, -10], - [-170, 10], - [170, 10], - ], - ], + it('should not clamp longitudes to -180 to 180', () => { + const mapExtent = { + maxLat: 39, + maxLon: 209, + minLat: 35, + minLon: -191, + }; + const filter = createExtentFilter(mapExtent, geoFieldName, 'geo_shape'); + expect(filter).toEqual({ + geo_shape: { + location: { + relation: 'INTERSECTS', + shape: { + coordinates: [ + [ + [-191, 39], + [-191, 35], + [209, 35], + [209, 39], + [-191, 39], + ], + ], + type: 'Polygon', + }, + }, + }, + }); }); }); }); From e67480d1fcdf6e898e636b78327055edd289d68a Mon Sep 17 00:00:00 2001 From: Gidi Meir Morris Date: Mon, 11 May 2020 16:35:48 +0100 Subject: [PATCH 39/65] [Task Manager] restores migrations of old tasks in TM (#65978) When migrating to KP last week the migrations were missed - this PR restores them. --- .../server/saved_objects/index.ts | 2 ++ .../server/saved_objects/migrations.ts | 21 ++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/x-pack/plugins/task_manager/server/saved_objects/index.ts b/x-pack/plugins/task_manager/server/saved_objects/index.ts index 0ad9021cd7f39c..fbb54b566ece0d 100644 --- a/x-pack/plugins/task_manager/server/saved_objects/index.ts +++ b/x-pack/plugins/task_manager/server/saved_objects/index.ts @@ -6,6 +6,7 @@ import { SavedObjectsServiceSetup } from 'kibana/server'; import mappings from './mappings.json'; +import { migrations } from './migrations'; import { TaskManagerConfig } from '../config.js'; export function setupSavedObjects( @@ -18,6 +19,7 @@ export function setupSavedObjects( hidden: true, convertToAliasScript: `ctx._id = ctx._source.type + ':' + ctx._id`, mappings: mappings.task, + migrations, indexPattern: config.index, }); } diff --git a/x-pack/plugins/task_manager/server/saved_objects/migrations.ts b/x-pack/plugins/task_manager/server/saved_objects/migrations.ts index 1c2cf73d0fe134..617ef80749d6a9 100644 --- a/x-pack/plugins/task_manager/server/saved_objects/migrations.ts +++ b/x-pack/plugins/task_manager/server/saved_objects/migrations.ts @@ -3,22 +3,23 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { SavedObject } from '../../../../../src/core/server'; +import { SavedObjectMigrationMap, SavedObjectUnsanitizedDoc } from '../../../../../src/core/server'; +import { TaskInstance, TaskInstanceWithDeprecatedFields } from '../task'; -export const migrations = { - task: { - '7.4.0': (doc: SavedObject>) => ({ - ...doc, - updated_at: new Date().toISOString(), - }), - '7.6.0': moveIntervalIntoSchedule, - }, +export const migrations: SavedObjectMigrationMap = { + '7.4.0': doc => ({ + ...doc, + updated_at: new Date().toISOString(), + }), + '7.6.0': moveIntervalIntoSchedule, }; function moveIntervalIntoSchedule({ attributes: { interval, ...attributes }, ...doc -}: SavedObject>) { +}: SavedObjectUnsanitizedDoc): SavedObjectUnsanitizedDoc< + TaskInstance +> { return { ...doc, attributes: { From 49226ddc1fdbe3841422404c6634643629200631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?= Date: Mon, 11 May 2020 16:57:45 +0100 Subject: [PATCH 40/65] [Telemetry] Remove ui_metric from the legacy codebase (#65739) --- src/legacy/core_plugins/ui_metric/index.ts | 30 ------------- .../core_plugins/ui_metric/package.json | 4 -- .../core_plugins/ui_metric/public/index.ts | 21 --------- .../public/services/telemetry_analytics.ts | 24 ---------- src/plugins/usage_collection/README.md | 44 ------------------- 5 files changed, 123 deletions(-) delete mode 100644 src/legacy/core_plugins/ui_metric/index.ts delete mode 100644 src/legacy/core_plugins/ui_metric/package.json delete mode 100644 src/legacy/core_plugins/ui_metric/public/index.ts delete mode 100644 src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts diff --git a/src/legacy/core_plugins/ui_metric/index.ts b/src/legacy/core_plugins/ui_metric/index.ts deleted file mode 100644 index 2e5be3d7b0a398..00000000000000 --- a/src/legacy/core_plugins/ui_metric/index.ts +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { resolve } from 'path'; - -// eslint-disable-next-line import/no-default-export -export default function(kibana: any) { - return new kibana.Plugin({ - id: 'ui_metric', - require: ['kibana', 'elasticsearch'], - publicDir: resolve(__dirname, 'public'), - init() {}, - }); -} diff --git a/src/legacy/core_plugins/ui_metric/package.json b/src/legacy/core_plugins/ui_metric/package.json deleted file mode 100644 index 3ddcac4eec47f6..00000000000000 --- a/src/legacy/core_plugins/ui_metric/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "ui_metric", - "version": "kibana" -} diff --git a/src/legacy/core_plugins/ui_metric/public/index.ts b/src/legacy/core_plugins/ui_metric/public/index.ts deleted file mode 100644 index 19246b571cb842..00000000000000 --- a/src/legacy/core_plugins/ui_metric/public/index.ts +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export { createUiStatsReporter } from './services/telemetry_analytics'; -export { METRIC_TYPE, UiStatsMetricType } from '@kbn/analytics'; diff --git a/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts b/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts deleted file mode 100644 index 0e517e6ff22449..00000000000000 --- a/src/legacy/core_plugins/ui_metric/public/services/telemetry_analytics.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -import { npSetup } from 'ui/new_platform'; - -export const createUiStatsReporter = (appName: string) => { - const { usageCollection } = npSetup.plugins; - return usageCollection.reportUiStats.bind(usageCollection, appName); -}; diff --git a/src/plugins/usage_collection/README.md b/src/plugins/usage_collection/README.md index e32dfae35832bb..99075d5d48f596 100644 --- a/src/plugins/usage_collection/README.md +++ b/src/plugins/usage_collection/README.md @@ -126,41 +126,6 @@ export function registerMyPluginUsageCollector( } ``` -### Migrating to NP from Legacy Plugins - -Pass `usageCollection` to the setup NP plugin setup function under plugins. Inside the `setup` function call the `registerCollector` like what you'd do in the NP example above. - -```js -// index.js -export const myPlugin = (kibana: any) => { - return new kibana.Plugin({ - init: async function (server) { - const { usageCollection } = server.newPlatform.setup.plugins; - const plugins = { - usageCollection, - }; - plugin(initializerContext).setup(core, plugins); - } - }); -} -``` - -### Legacy Plugins - -Typically, a plugin will create the collector object and register it with the Telemetry service from the `init` method of the plugin definition, or a helper module called from `init`. - -```js -// index.js -export const myPlugin = (kibana: any) => { - return new kibana.Plugin({ - init: async function (server) { - const { usageCollection } = server.newPlatform.setup.plugins; - registerMyPluginUsageCollector(usageCollection); - } - }); -} -``` - ## Update the telemetry payload and telemetry cluster field mappings There is a module in the telemetry service that creates the payload of data that gets sent up to the telemetry cluster. @@ -239,15 +204,6 @@ To track a user interaction, use the `reportUiStats` method exposed by the plugi } ``` -Alternatively, in the Legacy world you can still import the `createUiStatsReporter` helper function from UI Metric app: - -```js -import { createUiStatsReporter, METRIC_TYPE } from 'relative/path/to/src/legacy/core_plugins/ui_metric/public'; -const trackMetric = createUiStatsReporter(``); -trackMetric(METRIC_TYPE.CLICK, ``); -trackMetric('click', ``); -``` - Metric Types: - `METRIC_TYPE.CLICK` for tracking clicks `trackMetric(METRIC_TYPE.CLICK, 'my_button_clicked');` From a1a157dc87135c9dd26da45320072283df1f932e Mon Sep 17 00:00:00 2001 From: Sonja Krause-Harder Date: Mon, 11 May 2020 18:06:19 +0200 Subject: [PATCH 41/65] [Ingest] Use Kibana logger for proper server-side logging (#66017) * Add logger to app context. --- x-pack/plugins/ingest_manager/server/plugin.ts | 5 +++++ .../plugins/ingest_manager/server/services/app_context.ts | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts index 24f3a11789dc7f..cd44b61974b035 100644 --- a/x-pack/plugins/ingest_manager/server/plugin.ts +++ b/x-pack/plugins/ingest_manager/server/plugin.ts @@ -8,6 +8,7 @@ import { first } from 'rxjs/operators'; import { CoreSetup, CoreStart, + Logger, Plugin, PluginInitializerContext, SavedObjectsServiceStart, @@ -73,6 +74,7 @@ export interface IngestManagerAppContext { isProductionMode: boolean; kibanaVersion: string; cloud?: CloudSetup; + logger?: Logger; httpSetup?: HttpServiceSetup; } @@ -108,6 +110,7 @@ export class IngestManagerPlugin private config$: Observable; private security: SecurityPluginSetup | undefined; private cloud: CloudSetup | undefined; + private logger: Logger | undefined; private isProductionMode: boolean; private kibanaVersion: string; @@ -117,6 +120,7 @@ export class IngestManagerPlugin this.config$ = this.initializerContext.config.create(); this.isProductionMode = this.initializerContext.env.mode.prod; this.kibanaVersion = this.initializerContext.env.packageInfo.version; + this.logger = this.initializerContext.logger.get(); } public async setup(core: CoreSetup, deps: IngestManagerSetupDeps) { @@ -208,6 +212,7 @@ export class IngestManagerPlugin kibanaVersion: this.kibanaVersion, httpSetup: this.httpSetup, cloud: this.cloud, + logger: this.logger, }); licenseService.start(this.licensing$); return { diff --git a/x-pack/plugins/ingest_manager/server/services/app_context.ts b/x-pack/plugins/ingest_manager/server/services/app_context.ts index 6da0a137fa087e..e5bc082f6f0fc7 100644 --- a/x-pack/plugins/ingest_manager/server/services/app_context.ts +++ b/x-pack/plugins/ingest_manager/server/services/app_context.ts @@ -5,7 +5,7 @@ */ import { BehaviorSubject, Observable } from 'rxjs'; import { first } from 'rxjs/operators'; -import { SavedObjectsServiceStart, HttpServiceSetup } from 'src/core/server'; +import { SavedObjectsServiceStart, HttpServiceSetup, Logger } from 'src/core/server'; import { EncryptedSavedObjectsPluginStart } from '../../../encrypted_saved_objects/server'; import { SecurityPluginSetup } from '../../../security/server'; import { IngestManagerConfigType } from '../../common'; @@ -21,6 +21,7 @@ class AppContextService { private isProductionMode: boolean = false; private kibanaVersion: string | undefined; private cloud?: CloudSetup; + private logger?: Logger; private httpSetup?: HttpServiceSetup; public async start(appContext: IngestManagerAppContext) { @@ -29,6 +30,7 @@ class AppContextService { this.savedObjects = appContext.savedObjects; this.isProductionMode = appContext.isProductionMode; this.cloud = appContext.cloud; + this.logger = appContext.logger; this.kibanaVersion = appContext.kibanaVersion; this.httpSetup = appContext.httpSetup; @@ -60,6 +62,10 @@ class AppContextService { return this.cloud; } + public getLogger() { + return this.logger; + } + public getConfig() { return this.configSubject$?.value; } From 4912153ce6c6943815f4944e21de6b6b08597fe7 Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Mon, 11 May 2020 18:43:45 +0200 Subject: [PATCH 42/65] don't register any features in LP. (#65611) * don't register any features in LP. breaks features value reading in KP * move test plugin to NP * fix mappings * update docs * migrate another test * use contstants file for BWC with original code Co-authored-by: Elastic Machine --- ...ver.savedobjectscorefieldmapping.fields.md | 1 + ...ore-server.savedobjectscorefieldmapping.md | 2 +- .../server/saved_objects/mappings/types.ts | 1 + src/core/server/server.api.md | 1 + x-pack/legacy/plugins/maps/server/plugin.js | 34 +--------- .../xpack_main/server/lib/setup_xpack_main.js | 3 +- .../plugins/xpack_main/server/xpack_main.d.ts | 1 - x-pack/plugins/maps/kibana.json | 6 +- .../app.js => plugins/maps/server/index.ts} | 5 ++ x-pack/plugins/maps/server/plugin.ts | 52 +++++++++++++++ .../namespace_agnostic_type_plugin/index.js | 55 ---------------- .../kibana.json | 8 +++ .../mappings.json | 15 ----- .../package.json | 7 -- .../server/index.ts | 64 +++++++++++++++++++ .../fixtures/plugins/foo_plugin/index.js | 52 --------------- .../fixtures/plugins/foo_plugin/kibana.json | 8 +++ .../fixtures/plugins/foo_plugin/package.json | 7 -- .../plugins/foo_plugin/public/index.ts | 21 ++++++ .../plugins/foo_plugin/server/index.ts | 47 ++++++++++++++ 20 files changed, 215 insertions(+), 175 deletions(-) rename x-pack/{test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/app.js => plugins/maps/server/index.ts} (53%) create mode 100644 x-pack/plugins/maps/server/plugin.ts delete mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/index.js create mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/kibana.json delete mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json delete mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/package.json create mode 100644 x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/server/index.ts delete mode 100644 x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js create mode 100644 x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/kibana.json delete mode 100644 x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/package.json create mode 100644 x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts create mode 100644 x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md index db774a055e5281..4f88b635ca2f7c 100644 --- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md +++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md @@ -10,6 +10,7 @@ fields?: { [subfield: string]: { type: string; + ignore_above?: number; }; }; ``` diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md index dbc7d0ca431cec..9a31d37b3ff30e 100644 --- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md +++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md @@ -17,7 +17,7 @@ export interface SavedObjectsCoreFieldMapping | Property | Type | Description | | --- | --- | --- | | [enabled](./kibana-plugin-core-server.savedobjectscorefieldmapping.enabled.md) | boolean | | -| [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | {
[subfield: string]: {
type: string;
};
} | | +| [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | {
[subfield: string]: {
type: string;
ignore_above?: number;
};
} | | | [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md) | boolean | | | [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md) | number | boolean | string | | | [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md) | string | | diff --git a/src/core/server/saved_objects/mappings/types.ts b/src/core/server/saved_objects/mappings/types.ts index c1b65763949bbe..8362d1f16bd2a0 100644 --- a/src/core/server/saved_objects/mappings/types.ts +++ b/src/core/server/saved_objects/mappings/types.ts @@ -137,6 +137,7 @@ export interface SavedObjectsCoreFieldMapping { fields?: { [subfield: string]: { type: string; + ignore_above?: number; }; }; } diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md index e4234689c25e81..bb8ee1d8e7a318 100644 --- a/src/core/server/server.api.md +++ b/src/core/server/server.api.md @@ -1884,6 +1884,7 @@ export interface SavedObjectsCoreFieldMapping { fields?: { [subfield: string]: { type: string; + ignore_above?: number; }; }; // (undocumented) diff --git a/x-pack/legacy/plugins/maps/server/plugin.js b/x-pack/legacy/plugins/maps/server/plugin.js index d2d5309606cde1..6a542dff2eb1bb 100644 --- a/x-pack/legacy/plugins/maps/server/plugin.js +++ b/x-pack/legacy/plugins/maps/server/plugin.js @@ -19,42 +19,10 @@ import { emsBoundariesSpecProvider } from './tutorials/ems'; export class MapPlugin { setup(core, plugins, __LEGACY) { - const { featuresPlugin, home, licensing, usageCollection, mapsLegacy } = plugins; + const { home, licensing, usageCollection, mapsLegacy } = plugins; let routesInitialized = false; const mapConfig = mapsLegacy.config; - featuresPlugin.registerFeature({ - id: APP_ID, - name: i18n.translate('xpack.maps.featureRegistry.mapsFeatureName', { - defaultMessage: 'Maps', - }), - order: 600, - icon: APP_ICON, - navLinkId: APP_ID, - app: [APP_ID, 'kibana'], - catalogue: [APP_ID], - privileges: { - all: { - app: [APP_ID, 'kibana'], - catalogue: [APP_ID], - savedObject: { - all: [MAP_SAVED_OBJECT_TYPE, 'query'], - read: ['index-pattern'], - }, - ui: ['save', 'show', 'saveQuery'], - }, - read: { - app: [APP_ID, 'kibana'], - catalogue: [APP_ID], - savedObject: { - all: [], - read: [MAP_SAVED_OBJECT_TYPE, 'index-pattern', 'query'], - }, - ui: ['show'], - }, - }, - }); - licensing.license$.subscribe(license => { const { state } = license.check('maps', 'basic'); if (state === 'valid' && !routesInitialized) { diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js b/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js index 2707858a5fec8e..9196b210bba20a 100644 --- a/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js +++ b/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js @@ -22,8 +22,7 @@ export function setupXPackMain(server) { server.ext('onPreResponse', (request, h) => injectXPackInfoSignature(info, request, h)); - const { registerFeature, getFeatures } = server.newPlatform.setup.plugins.features; - server.expose('registerFeature', registerFeature); + const { getFeatures } = server.newPlatform.setup.plugins.features; server.expose('getFeatures', getFeatures); const setPluginStatus = () => { diff --git a/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts b/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts index 7b5dc19760627d..2a59c2f1366d4a 100644 --- a/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts +++ b/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts @@ -12,5 +12,4 @@ export { XPackFeature } from './lib/xpack_info'; export interface XPackMainPlugin { info: XPackInfo; getFeatures(): Feature[]; - registerFeature(feature: FeatureConfig): void; } diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json index 077601204e3eeb..efbac56a817be8 100644 --- a/x-pack/plugins/maps/kibana.json +++ b/x-pack/plugins/maps/kibana.json @@ -4,8 +4,9 @@ "kibanaVersion": "kibana", "configPath": ["xpack", "maps"], "requiredPlugins": [ - "inspector", "licensing", + "features", + "inspector", "home", "data", "fileUpload", @@ -15,5 +16,6 @@ "embeddable", "mapsLegacy" ], - "ui": true + "ui": true, + "server": true } diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/app.js b/x-pack/plugins/maps/server/index.ts similarity index 53% rename from x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/app.js rename to x-pack/plugins/maps/server/index.ts index 41bc2aa2588073..1b714a3555b345 100644 --- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/app.js +++ b/x-pack/plugins/maps/server/index.ts @@ -3,3 +3,8 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ +import { PluginInitializerContext } from 'src/core/server'; +import { MapsPlugin } from './plugin'; + +export const plugin = (initializerContext: PluginInitializerContext) => + new MapsPlugin(initializerContext); diff --git a/x-pack/plugins/maps/server/plugin.ts b/x-pack/plugins/maps/server/plugin.ts new file mode 100644 index 00000000000000..7de0a69fb00796 --- /dev/null +++ b/x-pack/plugins/maps/server/plugin.ts @@ -0,0 +1,52 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { i18n } from '@kbn/i18n'; +import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/server'; +import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server'; + +import { APP_ID, APP_ICON, MAP_SAVED_OBJECT_TYPE } from '../common/constants'; + +interface SetupDeps { + features: FeaturesPluginSetupContract; +} + +export class MapsPlugin implements Plugin { + constructor(initializerContext: PluginInitializerContext) {} + setup(core: CoreSetup, plugins: SetupDeps) { + plugins.features.registerFeature({ + id: APP_ID, + name: i18n.translate('xpack.maps.featureRegistry.mapsFeatureName', { + defaultMessage: 'Maps', + }), + order: 600, + icon: APP_ICON, + navLinkId: APP_ID, + app: [APP_ID, 'kibana'], + catalogue: [APP_ID], + privileges: { + all: { + app: [APP_ID, 'kibana'], + catalogue: [APP_ID], + savedObject: { + all: [MAP_SAVED_OBJECT_TYPE, 'query'], + read: ['index-pattern'], + }, + ui: ['save', 'show', 'saveQuery'], + }, + read: { + app: [APP_ID, 'kibana'], + catalogue: [APP_ID], + savedObject: { + all: [], + read: [MAP_SAVED_OBJECT_TYPE, 'index-pattern', 'query'], + }, + ui: ['show'], + }, + }, + }); + } + start(core: CoreStart) {} +} diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/index.js b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/index.js deleted file mode 100644 index b8dbdeb07d7fe2..00000000000000 --- a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/index.js +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import mappings from './mappings.json'; - -export default function(kibana) { - return new kibana.Plugin({ - require: ['kibana', 'elasticsearch', 'xpack_main'], - name: 'namespace_agnostic_type_plugin', - uiExports: { - savedObjectsManagement: { - globaltype: { - isImportableAndExportable: true, - }, - }, - savedObjectSchemas: { - globaltype: { - isNamespaceAgnostic: true, - }, - }, - mappings, - }, - - config() {}, - - init(server) { - server.plugins.xpack_main.registerFeature({ - id: 'namespace_agnostic_type_plugin', - name: 'namespace_agnostic_type_plugin', - icon: 'upArrow', - navLinkId: 'namespace_agnostic_type_plugin', - app: [], - privileges: { - all: { - savedObject: { - all: ['globaltype'], - read: [], - }, - ui: [], - }, - read: { - savedObject: { - all: [], - read: ['globaltype'], - }, - ui: [], - }, - }, - }); - }, - }); -} diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/kibana.json b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/kibana.json new file mode 100644 index 00000000000000..ec3077999d8bdc --- /dev/null +++ b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/kibana.json @@ -0,0 +1,8 @@ +{ + "id": "namespace_agnostic_type_plugin", + "version": "1.0.0", + "kibanaVersion": "kibana", + "requiredPlugins": ["features"], + "server": true, + "ui": false +} diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json deleted file mode 100644 index 64d309b4209a20..00000000000000 --- a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/mappings.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "globaltype": { - "properties": { - "title": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword", - "ignore_above": 2048 - } - } - } - } - } -} diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/package.json b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/package.json deleted file mode 100644 index 1a0afbc6bfcb30..00000000000000 --- a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "namespace_agnostic_type_plugin", - "version": "0.0.0", - "kibana": { - "version": "kibana" - } -} diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/server/index.ts b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/server/index.ts new file mode 100644 index 00000000000000..d8940c96e676a0 --- /dev/null +++ b/x-pack/test/saved_object_api_integration/common/fixtures/namespace_agnostic_type_plugin/server/index.ts @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { CoreSetup, Plugin } from 'src/core/server'; +import { PluginSetupContract as FeaturesPluginSetupContract } from '../../../../../../plugins/features/server'; + +export const plugin = () => new NamespaceAgnosticTypePlugin(); + +interface SetupDeps { + features: FeaturesPluginSetupContract; +} + +class NamespaceAgnosticTypePlugin implements Plugin { + setup(core: CoreSetup, plugins: SetupDeps) { + core.savedObjects.registerType({ + name: 'globaltype', + hidden: false, + namespaceType: 'agnostic', + management: { + importableAndExportable: true, + }, + mappings: { + properties: { + title: { + type: 'text', + fields: { + keyword: { + type: 'keyword', + ignore_above: 2048, + }, + }, + }, + }, + }, + }); + + plugins.features.registerFeature({ + id: 'namespace_agnostic_type_plugin', + name: 'namespace_agnostic_type_plugin', + icon: 'upArrow', + navLinkId: 'namespace_agnostic_type_plugin', + app: [], + privileges: { + all: { + savedObject: { + all: ['globaltype'], + read: [], + }, + ui: [], + }, + read: { + savedObject: { + all: [], + read: ['globaltype'], + }, + ui: [], + }, + }, + }); + } + start() {} +} diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js deleted file mode 100644 index 89ae0125614b67..00000000000000 --- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/index.js +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -export default function(kibana) { - return new kibana.Plugin({ - require: ['kibana', 'elasticsearch', 'xpack_main'], - name: 'foo', - uiExports: { - app: { - title: 'Foo', - order: 1000, - euiIconType: 'uiArray', - description: 'Foo app', - main: 'plugins/foo_plugin/app', - }, - }, - - init(server) { - server.plugins.xpack_main.registerFeature({ - id: 'foo', - name: 'Foo', - icon: 'upArrow', - navLinkId: 'foo_plugin', - app: ['kibana'], - catalogue: ['foo'], - privileges: { - all: { - app: ['kibana'], - catalogue: ['foo'], - savedObject: { - all: ['foo'], - read: ['index-pattern'], - }, - ui: ['create', 'edit', 'delete', 'show'], - }, - read: { - app: ['kibana'], - catalogue: ['foo'], - savedObject: { - all: [], - read: ['foo', 'index-pattern'], - }, - ui: ['show'], - }, - }, - }); - }, - }); -} diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/kibana.json b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/kibana.json new file mode 100644 index 00000000000000..cec1640fbb047b --- /dev/null +++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/kibana.json @@ -0,0 +1,8 @@ +{ + "id": "foo_plugin", + "version": "1.0.0", + "kibanaVersion": "kibana", + "requiredPlugins": ["features"], + "server": true, + "ui": true +} diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/package.json b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/package.json deleted file mode 100644 index 45228b47c0a318..00000000000000 --- a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "foo_plugin", - "version": "0.0.0", - "kibana": { - "version": "kibana" - } -} diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts new file mode 100644 index 00000000000000..357cbba3349284 --- /dev/null +++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/public/index.ts @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { CoreSetup, Plugin } from 'src/core/public'; +export const plugin = () => new FooPlugin(); + +class FooPlugin implements Plugin { + setup(core: CoreSetup) { + core.application.register({ + id: 'foo', + title: 'Foo app', + euiIconType: 'uiArray', + mount() { + return () => null; + }, + }); + } + start() {} +} diff --git a/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts new file mode 100644 index 00000000000000..bff794801119af --- /dev/null +++ b/x-pack/test/ui_capabilities/common/fixtures/plugins/foo_plugin/server/index.ts @@ -0,0 +1,47 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { CoreSetup, Plugin } from 'src/core/server'; +import { PluginSetupContract as FeaturesPluginSetupContract } from '../../../../../../../plugins/features/server'; + +export const plugin = () => new FooPlugin(); + +interface SetupDeps { + features: FeaturesPluginSetupContract; +} + +class FooPlugin implements Plugin { + setup(core: CoreSetup, plugins: SetupDeps) { + plugins.features.registerFeature({ + id: 'foo', + name: 'Foo', + icon: 'upArrow', + navLinkId: 'foo_plugin', + app: ['kibana'], + catalogue: ['foo'], + privileges: { + all: { + app: ['kibana'], + catalogue: ['foo'], + savedObject: { + all: ['foo'], + read: ['index-pattern'], + }, + ui: ['create', 'edit', 'delete', 'show'], + }, + read: { + app: ['kibana'], + catalogue: ['foo'], + savedObject: { + all: [], + read: ['foo', 'index-pattern'], + }, + ui: ['show'], + }, + }, + }); + } + start() {} +} From 4174bab3cc357f1c85b8e643dad83ea62ae73956 Mon Sep 17 00:00:00 2001 From: Melissa Alvarez Date: Mon, 11 May 2020 12:56:25 -0400 Subject: [PATCH 43/65] [ML] Anomaly Explorer: if filter includes wildcard ensure matching swimlanes are not masked (#65384) * if wildcard search no mask for matching swimlanes * update swimlane proptypes * add helper function * add tests for helper function --- .../__mocks__/mock_viewby_swimlane.json | 33 +++++++++++++++++++ .../public/application/explorer/explorer.js | 11 ++++++- .../explorer/explorer_swimlane.tsx | 2 +- .../explorer/has_matching_points.test.ts | 31 +++++++++++++++++ .../explorer/has_matching_points.ts | 30 +++++++++++++++++ 5 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 x-pack/plugins/ml/public/application/explorer/__mocks__/mock_viewby_swimlane.json create mode 100644 x-pack/plugins/ml/public/application/explorer/has_matching_points.test.ts create mode 100644 x-pack/plugins/ml/public/application/explorer/has_matching_points.ts diff --git a/x-pack/plugins/ml/public/application/explorer/__mocks__/mock_viewby_swimlane.json b/x-pack/plugins/ml/public/application/explorer/__mocks__/mock_viewby_swimlane.json new file mode 100644 index 00000000000000..05095c90ac1d65 --- /dev/null +++ b/x-pack/plugins/ml/public/application/explorer/__mocks__/mock_viewby_swimlane.json @@ -0,0 +1,33 @@ +{ + "laneLabels": [ + "View by" + ], + "points": [ + { + "laneLabel": "test-1", + "time": 1486425600, + "value": 0 + }, + { + "laneLabel": "test-2", + "time": 1486440000, + "value": 0.01107053 + }, + { + "laneLabel": "other-3", + "time": 1486454400, + "value": 0.1870243 + }, + { + "laneLabel": "other-4", + "time": 1486468800, + "value": 0.5947769 + }, + { + "laneLabel": "other-5", + "time": 1486483200, + "value": 0 + } + ], + "interval": 14400 +} diff --git a/x-pack/plugins/ml/public/application/explorer/explorer.js b/x-pack/plugins/ml/public/application/explorer/explorer.js index 8fd24798178073..9c9c82a2124725 100644 --- a/x-pack/plugins/ml/public/application/explorer/explorer.js +++ b/x-pack/plugins/ml/public/application/explorer/explorer.js @@ -81,6 +81,7 @@ import { AnomaliesTable } from '../components/anomalies_table/anomalies_table'; import { ResizeChecker } from '../../../../../../src/plugins/kibana_utils/public'; import { getTimefilter, getToastNotifications } from '../util/dependency_cache'; import { MlTooltipComponent } from '../components/chart_tooltip'; +import { hasMatchingPoints } from './has_matching_points'; function mapSwimlaneOptionsToEuiOptions(options) { return options.map(option => ({ @@ -284,6 +285,7 @@ export class Explorer extends React.Component { annotationsData, chartsData, filterActive, + filteredFields, filterPlaceHolder, indexPattern, influencers, @@ -418,6 +420,7 @@ export class Explorer extends React.Component { { if (selectedCellTimes.length > 0) { this.highlightOverall(selectedCellTimes); } - this.maskIrrelevantSwimlanes(!!maskAll); + this.maskIrrelevantSwimlanes(Boolean(maskAll)); } else { this.clearSelection(); } diff --git a/x-pack/plugins/ml/public/application/explorer/has_matching_points.test.ts b/x-pack/plugins/ml/public/application/explorer/has_matching_points.test.ts new file mode 100644 index 00000000000000..8d6f71bb7720d5 --- /dev/null +++ b/x-pack/plugins/ml/public/application/explorer/has_matching_points.test.ts @@ -0,0 +1,31 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import mockViewBySwimlaneData from './__mocks__/mock_viewby_swimlane.json'; +import { hasMatchingPoints } from './has_matching_points'; + +const filteredFieldsMatch = ['test@kuery-wildcard@']; +const filteredFieldsNoMatch = ['no-match@kuery-wildcard@', 'nonexistant']; + +describe('hasMatchingPoints', () => { + test('is true', () => { + expect( + hasMatchingPoints({ + filteredFields: filteredFieldsMatch, + swimlaneData: mockViewBySwimlaneData, + }) + ).toBe(true); + }); + + test('is false', () => { + expect( + hasMatchingPoints({ + filteredFields: filteredFieldsNoMatch, + swimlaneData: mockViewBySwimlaneData, + }) + ).toBe(false); + }); +}); diff --git a/x-pack/plugins/ml/public/application/explorer/has_matching_points.ts b/x-pack/plugins/ml/public/application/explorer/has_matching_points.ts new file mode 100644 index 00000000000000..397615d68f189d --- /dev/null +++ b/x-pack/plugins/ml/public/application/explorer/has_matching_points.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { ExplorerState } from './reducers'; +import { OverallSwimlaneData, SwimlaneData } from './explorer_utils'; + +interface HasMatchingPointsParams { + filteredFields?: ExplorerState['filteredFields']; + swimlaneData: SwimlaneData | OverallSwimlaneData; +} + +export const hasMatchingPoints = ({ + filteredFields = [], + swimlaneData, +}: HasMatchingPointsParams): boolean => { + // If filtered fields includes a wildcard search maskAll only if there are no points matching the pattern + const wildCardField = filteredFields.find(field => /\@kuery-wildcard\@$/.test(field)); + const substring = + wildCardField !== undefined ? wildCardField.replace(/\@kuery-wildcard\@$/, '') : null; + + return ( + substring !== null && + swimlaneData.points.some(point => { + return point.laneLabel.includes(substring); + }) + ); +}; From be7902311d92d28befee183ff6c8ef7b44cd142d Mon Sep 17 00:00:00 2001 From: Tiago Costa Date: Mon, 11 May 2020 18:23:42 +0100 Subject: [PATCH 44/65] chore(NA): skip mapping editor shape datatype test (#66041) --- .../client_integration/datatypes/shape_datatype.test.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/datatypes/shape_datatype.test.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/datatypes/shape_datatype.test.tsx index 19bf6973472ff3..0816770aab3a8b 100644 --- a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/datatypes/shape_datatype.test.tsx +++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/datatypes/shape_datatype.test.tsx @@ -20,7 +20,9 @@ export const defaultShapeParameters = { ignore_z_value: true, }; -describe('Mappings editor: shape datatype', () => { +// That test is being flaky and is under work to be fixed +// Skipping it for now. +describe.skip('Mappings editor: shape datatype', () => { let testBed: MappingsEditorTestBed; /** From cbe559745a66ddf41b2d5c7dce67d16f572ba200 Mon Sep 17 00:00:00 2001 From: Spencer Date: Mon, 11 May 2020 11:04:23 -0700 Subject: [PATCH 45/65] [procrunner] avoid waiting for processes forever (#65909) --- .../src/proc_runner/proc_runner.ts | 26 +- packages/kbn-pm/dist/index.js | 21246 ++++++++-------- 2 files changed, 10647 insertions(+), 10625 deletions(-) diff --git a/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts b/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts index 14c87766213cd1..1759ca2840c5be 100644 --- a/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts +++ b/packages/kbn-dev-utils/src/proc_runner/proc_runner.ts @@ -18,17 +18,22 @@ */ import moment from 'moment'; -import { filter, first, catchError } from 'rxjs/operators'; +import * as Rx from 'rxjs'; +import { filter, first, catchError, map } from 'rxjs/operators'; import exitHook from 'exit-hook'; import { ToolingLog } from '../tooling_log'; import { createCliError } from './errors'; import { Proc, ProcOptions, startProc } from './proc'; +const SECOND = 1000; +const MINUTE = 60 * SECOND; + const noop = () => {}; interface RunOptions extends ProcOptions { wait: true | RegExp; + waitTimeout?: number | false; } /** @@ -71,6 +76,7 @@ export class ProcRunner { cwd = process.cwd(), stdin = undefined, wait = false, + waitTimeout = 15 * MINUTE, env = process.env, } = options; @@ -97,8 +103,8 @@ export class ProcRunner { try { if (wait instanceof RegExp) { // wait for process to log matching line - await proc.lines$ - .pipe( + await Rx.race( + proc.lines$.pipe( filter(line => wait.test(line)), first(), catchError(err => { @@ -108,8 +114,18 @@ export class ProcRunner { throw err; } }) - ) - .toPromise(); + ), + waitTimeout === false + ? Rx.NEVER + : Rx.timer(waitTimeout).pipe( + map(() => { + const sec = waitTimeout / SECOND; + throw createCliError( + `[${name}] failed to match pattern within ${sec} seconds [pattern=${wait}]` + ); + }) + ) + ).toPromise(); } if (wait === true) { diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index 1b70cced4a5c9c..1b670eb8cd8169 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -4838,10 +4838,13 @@ exports.withProcRunner = withProcRunner; Object.defineProperty(exports, "__esModule", { value: true }); const tslib_1 = __webpack_require__(36); const moment_1 = tslib_1.__importDefault(__webpack_require__(40)); -const operators_1 = __webpack_require__(169); -const exit_hook_1 = tslib_1.__importDefault(__webpack_require__(348)); -const errors_1 = __webpack_require__(349); -const proc_1 = __webpack_require__(350); +const Rx = tslib_1.__importStar(__webpack_require__(169)); +const operators_1 = __webpack_require__(270); +const exit_hook_1 = tslib_1.__importDefault(__webpack_require__(368)); +const errors_1 = __webpack_require__(369); +const proc_1 = __webpack_require__(370); +const SECOND = 1000; +const MINUTE = 60 * SECOND; const noop = () => { }; /** * Helper for starting and managing processes. In many ways it resembles the @@ -4875,7 +4878,7 @@ class ProcRunner { * @return {Promise} */ async run(name, options) { - const { cmd, args = [], cwd = process.cwd(), stdin = undefined, wait = false, env = process.env, } = options; + const { cmd, args = [], cwd = process.cwd(), stdin = undefined, wait = false, waitTimeout = 15 * MINUTE, env = process.env, } = options; if (this.closing) { throw new Error('ProcRunner is closing'); } @@ -4895,16 +4898,19 @@ class ProcRunner { try { if (wait instanceof RegExp) { // wait for process to log matching line - await proc.lines$ - .pipe(operators_1.filter(line => wait.test(line)), operators_1.first(), operators_1.catchError(err => { + await Rx.race(proc.lines$.pipe(operators_1.filter(line => wait.test(line)), operators_1.first(), operators_1.catchError(err => { if (err.name !== 'EmptyError') { throw errors_1.createCliError(`[${name}] exited without matching pattern: ${wait}`); } else { throw err; } - })) - .toPromise(); + })), waitTimeout === false + ? Rx.NEVER + : Rx.timer(waitTimeout).pipe(operators_1.map(() => { + const sec = waitTimeout / SECOND; + throw errors_1.createCliError(`[${name}] failed to match pattern within ${sec} seconds [pattern=${wait}]`); + }))).toPromise(); } if (wait === true) { // wait for process to complete @@ -21959,316 +21965,172 @@ webpackContext.id = 41; "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["audit"]; }); - -/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["auditTime"]; }); - -/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(207); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__["buffer"]; }); - -/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(208); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__["bufferCount"]; }); - -/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(209); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["bufferTime"]; }); - -/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(210); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__["bufferToggle"]; }); - -/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(211); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["bufferWhen"]; }); - -/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(212); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["catchError"]; }); - -/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(213); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["combineAll"]; }); - -/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(217); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__["combineLatest"]; }); - -/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(225); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__["concat"]; }); - -/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(228); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__["concatAll"]; }); - -/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(233); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__["concatMap"]; }); - -/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(234); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__["concatMapTo"]; }); - -/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(235); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__["count"]; }); - -/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(236); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__["debounce"]; }); - -/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(237); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__["debounceTime"]; }); - -/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(238); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__["defaultIfEmpty"]; }); - -/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(239); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__["delay"]; }); - -/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(244); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__["delayWhen"]; }); - -/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(245); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__["dematerialize"]; }); - -/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(246); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__["distinct"]; }); - -/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(247); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__["distinctUntilChanged"]; }); - -/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(248); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__["distinctUntilKeyChanged"]; }); - -/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(249); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__["elementAt"]; }); - -/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(255); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__["endWith"]; }); - -/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(256); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__["every"]; }); - -/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(257); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__["exhaust"]; }); - -/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(258); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__["exhaustMap"]; }); - -/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(259); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__["expand"]; }); - -/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(251); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__["filter"]; }); - -/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(260); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__["finalize"]; }); - -/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(261); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__["find"]; }); - -/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(262); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__["findIndex"]; }); - -/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(263); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__["first"]; }); - -/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(264); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__["groupBy"]; }); - -/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(268); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__["ignoreElements"]; }); - -/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(269); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__["isEmpty"]; }); - -/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(270); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__["last"]; }); - -/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(231); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__["map"]; }); - -/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(272); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__["mapTo"]; }); - -/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(273); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__["materialize"]; }); - -/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(274); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__["max"]; }); - -/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(277); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__["merge"]; }); - -/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(229); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__["mergeAll"]; }); - -/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(230); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; }); - -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; }); - -/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(279); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__["mergeMapTo"]; }); +/* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return _internal_Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]; }); -/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(280); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__["mergeScan"]; }); +/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(186); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["ConnectableObservable"]; }); -/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(281); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__["min"]; }); +/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(191); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__["GroupedObservable"]; }); -/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(282); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__["multicast"]; }); +/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(183); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__["observable"]; }); -/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(285); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__["observeOn"]; }); +/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(187); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _internal_Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]; }); -/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(286); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__["onErrorResumeNext"]; }); +/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(192); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__["BehaviorSubject"]; }); -/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(287); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__["pairwise"]; }); +/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(193); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__["ReplaySubject"]; }); -/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(288); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__["partition"]; }); +/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(210); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__["AsyncSubject"]; }); -/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(290); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__["pluck"]; }); +/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(211); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["asap"]; }); -/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(291); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__["publish"]; }); +/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(215); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["async"]; }); -/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(292); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__["publishBehavior"]; }); +/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(194); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["queue"]; }); -/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(294); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__["publishLast"]; }); +/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(216); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["animationFrame"]; }); -/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(296); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__["publishReplay"]; }); +/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(219); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualTimeScheduler"]; }); -/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(301); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__["race"]; }); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualAction"]; }); -/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(275); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__["reduce"]; }); +/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(200); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__["Scheduler"]; }); -/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(303); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__["repeat"]; }); +/* harmony import */ var _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(177); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__["Subscription"]; }); -/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(304); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__["repeatWhen"]; }); +/* harmony import */ var _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(172); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__["Subscriber"]; }); -/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(305); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__["retry"]; }); +/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(202); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["Notification"]; }); -/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(306); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__["retryWhen"]; }); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["NotificationKind"]; }); -/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(284); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__["refCount"]; }); +/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(184); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__["pipe"]; }); -/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(307); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__["sample"]; }); +/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(185); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__["noop"]; }); -/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(308); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__["sampleTime"]; }); +/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(220); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__["identity"]; }); -/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(276); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__["scan"]; }); +/* harmony import */ var _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(221); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__["isObservable"]; }); -/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(309); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__["sequenceEqual"]; }); +/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(222); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__["ArgumentOutOfRangeError"]; }); -/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(310); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__["share"]; }); +/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(223); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__["EmptyError"]; }); -/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(311); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__["shareReplay"]; }); +/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(188); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__["ObjectUnsubscribedError"]; }); -/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(312); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__["single"]; }); +/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(180); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__["UnsubscriptionError"]; }); -/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(313); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__["skip"]; }); +/* harmony import */ var _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(224); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__["TimeoutError"]; }); -/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(314); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__["skipLast"]; }); +/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(225); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__["bindCallback"]; }); -/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(315); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__["skipUntil"]; }); +/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(227); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__["bindNodeCallback"]; }); -/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(316); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__["skipWhile"]; }); +/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(228); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__["combineLatest"]; }); -/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(317); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__["startWith"]; }); +/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(239); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__["concat"]; }); -/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(318); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__["subscribeOn"]; }); +/* harmony import */ var _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(250); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__["defer"]; }); -/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(324); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__["switchAll"]; }); +/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(203); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["empty"]; }); -/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(325); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__["switchMap"]; }); +/* harmony import */ var _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(251); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__["forkJoin"]; }); -/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(326); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__["switchMapTo"]; }); +/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(243); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "from", function() { return _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__["from"]; }); -/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(254); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__["take"]; }); +/* harmony import */ var _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(252); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__["fromEvent"]; }); -/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(271); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__["takeLast"]; }); +/* harmony import */ var _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(253); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_35__["fromEventPattern"]; }); -/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(327); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__["takeUntil"]; }); +/* harmony import */ var _internal_observable_generate__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(254); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return _internal_observable_generate__WEBPACK_IMPORTED_MODULE_36__["generate"]; }); -/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(328); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__["takeWhile"]; }); +/* harmony import */ var _internal_observable_iif__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(255); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return _internal_observable_iif__WEBPACK_IMPORTED_MODULE_37__["iif"]; }); -/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(329); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__["tap"]; }); +/* harmony import */ var _internal_observable_interval__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(256); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return _internal_observable_interval__WEBPACK_IMPORTED_MODULE_38__["interval"]; }); -/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(330); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__["throttle"]; }); +/* harmony import */ var _internal_observable_merge__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(258); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_observable_merge__WEBPACK_IMPORTED_MODULE_39__["merge"]; }); -/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(331); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__["throttleTime"]; }); +/* harmony import */ var _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(259); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "never", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["never"]; }); -/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(252); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__["throwIfEmpty"]; }); +/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(204); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "of", function() { return _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__["of"]; }); -/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(332); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__["timeInterval"]; }); +/* harmony import */ var _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(260); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__["onErrorResumeNext"]; }); -/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(334); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__["timeout"]; }); +/* harmony import */ var _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(261); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__["pairs"]; }); -/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(336); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__["timeoutWith"]; }); +/* harmony import */ var _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(262); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__["partition"]; }); -/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(337); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__["timestamp"]; }); +/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(265); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__["race"]; }); -/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(338); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__["toArray"]; }); +/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(266); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__["range"]; }); -/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(339); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__["window"]; }); +/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(209); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__["throwError"]; }); -/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(340); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__["windowCount"]; }); +/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(267); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__["timer"]; }); -/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(341); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__["windowTime"]; }); +/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(268); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__["using"]; }); -/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(342); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__["windowToggle"]; }); +/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(269); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__["zip"]; }); -/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(343); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__["windowWhen"]; }); +/* harmony import */ var _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(244); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__["scheduled"]; }); -/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(344); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__["withLatestFrom"]; }); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["EMPTY"]; }); -/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(345); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__["zip"]; }); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["NEVER"]; }); -/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(347); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__["zipAll"]; }); +/* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(175); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_52__["config"]; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ @@ -22305,55 +22167,6 @@ __webpack_require__.r(__webpack_exports__); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22384,79 +22197,128 @@ __webpack_require__.r(__webpack_exports__); "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return audit; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return Observable; }); +/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(171); +/* harmony import */ var _util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(182); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183); +/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(184); +/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(175); +/** PURE_IMPORTS_START _util_canReportError,_util_toSubscriber,_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */ -function audit(durationSelector) { - return function auditOperatorFunction(source) { - return source.lift(new AuditOperator(durationSelector)); - }; -} -var AuditOperator = /*@__PURE__*/ (function () { - function AuditOperator(durationSelector) { - this.durationSelector = durationSelector; + + +var Observable = /*@__PURE__*/ (function () { + function Observable(subscribe) { + this._isScalar = false; + if (subscribe) { + this._subscribe = subscribe; + } } - AuditOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new AuditSubscriber(subscriber, this.durationSelector)); + Observable.prototype.lift = function (operator) { + var observable = new Observable(); + observable.source = this; + observable.operator = operator; + return observable; }; - return AuditOperator; -}()); -var AuditSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AuditSubscriber, _super); - function AuditSubscriber(destination, durationSelector) { - var _this = _super.call(this, destination) || this; - _this.durationSelector = durationSelector; - _this.hasValue = false; - return _this; - } - AuditSubscriber.prototype._next = function (value) { - this.value = value; - this.hasValue = true; - if (!this.throttled) { - var duration = void 0; - try { - var durationSelector = this.durationSelector; - duration = durationSelector(value); + Observable.prototype.subscribe = function (observerOrNext, error, complete) { + var operator = this.operator; + var sink = Object(_util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__["toSubscriber"])(observerOrNext, error, complete); + if (operator) { + sink.add(operator.call(sink, this.source)); + } + else { + sink.add(this.source || (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ? + this._subscribe(sink) : + this._trySubscribe(sink)); + } + if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) { + if (sink.syncErrorThrowable) { + sink.syncErrorThrowable = false; + if (sink.syncErrorThrown) { + throw sink.syncErrorValue; + } } - catch (err) { - return this.destination.error(err); + } + return sink; + }; + Observable.prototype._trySubscribe = function (sink) { + try { + return this._subscribe(sink); + } + catch (err) { + if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) { + sink.syncErrorThrown = true; + sink.syncErrorValue = err; } - var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration); - if (!innerSubscription || innerSubscription.closed) { - this.clearThrottle(); + if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_0__["canReportError"])(sink)) { + sink.error(err); } else { - this.add(this.throttled = innerSubscription); + console.warn(err); } } }; - AuditSubscriber.prototype.clearThrottle = function () { - var _a = this, value = _a.value, hasValue = _a.hasValue, throttled = _a.throttled; - if (throttled) { - this.remove(throttled); - this.throttled = null; - throttled.unsubscribe(); + Observable.prototype.forEach = function (next, promiseCtor) { + var _this = this; + promiseCtor = getPromiseCtor(promiseCtor); + return new promiseCtor(function (resolve, reject) { + var subscription; + subscription = _this.subscribe(function (value) { + try { + next(value); + } + catch (err) { + reject(err); + if (subscription) { + subscription.unsubscribe(); + } + } + }, reject, resolve); + }); + }; + Observable.prototype._subscribe = function (subscriber) { + var source = this.source; + return source && source.subscribe(subscriber); + }; + Observable.prototype[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]] = function () { + return this; + }; + Observable.prototype.pipe = function () { + var operations = []; + for (var _i = 0; _i < arguments.length; _i++) { + operations[_i] = arguments[_i]; } - if (hasValue) { - this.value = null; - this.hasValue = false; - this.destination.next(value); + if (operations.length === 0) { + return this; } + return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipeFromArray"])(operations)(this); }; - AuditSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex) { - this.clearThrottle(); + Observable.prototype.toPromise = function (promiseCtor) { + var _this = this; + promiseCtor = getPromiseCtor(promiseCtor); + return new promiseCtor(function (resolve, reject) { + var value; + _this.subscribe(function (x) { return value = x; }, function (err) { return reject(err); }, function () { return resolve(value); }); + }); }; - AuditSubscriber.prototype.notifyComplete = function () { - this.clearThrottle(); + Observable.create = function (subscribe) { + return new Observable(subscribe); }; - return AuditSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=audit.js.map + return Observable; +}()); + +function getPromiseCtor(promiseCtor) { + if (!promiseCtor) { + promiseCtor = _config__WEBPACK_IMPORTED_MODULE_4__["config"].Promise || Promise; + } + if (!promiseCtor) { + throw new Error('no Promise impl found'); + } + return promiseCtor; +} +//# sourceMappingURL=Observable.js.map /***/ }), @@ -22465,30 +22327,26 @@ var AuditSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "OuterSubscriber", function() { return OuterSubscriber; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canReportError", function() { return canReportError; }); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(172); +/** PURE_IMPORTS_START _Subscriber PURE_IMPORTS_END */ -var OuterSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OuterSubscriber, _super); - function OuterSubscriber() { - return _super !== null && _super.apply(this, arguments) || this; +function canReportError(observer) { + while (observer) { + var _a = observer, closed_1 = _a.closed, destination = _a.destination, isStopped = _a.isStopped; + if (closed_1 || isStopped) { + return false; + } + else if (destination && destination instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) { + observer = destination; + } + else { + observer = null; + } } - OuterSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.destination.next(innerValue); - }; - OuterSubscriber.prototype.notifyError = function (error, innerSub) { - this.destination.error(error); - }; - OuterSubscriber.prototype.notifyComplete = function (innerSub) { - this.destination.complete(); - }; - return OuterSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); - -//# sourceMappingURL=OuterSubscriber.js.map + return true; +} +//# sourceMappingURL=canReportError.js.map /***/ }), @@ -23048,27 +22906,29 @@ var $$rxSubscriber = rxSubscriber; "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToResult", function() { return subscribeToResult; }); -/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(183); -/* harmony import */ var _subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(184); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(193); -/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo,_Observable PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toSubscriber", function() { return toSubscriber; }); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(172); +/* harmony import */ var _symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(181); +/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(174); +/** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */ -function subscribeToResult(outerSubscriber, result, outerValue, outerIndex, destination) { - if (destination === void 0) { - destination = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__["InnerSubscriber"](outerSubscriber, outerValue, outerIndex); - } - if (destination.closed) { - return undefined; +function toSubscriber(nextOrObserver, error, complete) { + if (nextOrObserver) { + if (nextOrObserver instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) { + return nextOrObserver; + } + if (nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]) { + return nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]](); + } } - if (result instanceof _Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]) { - return result.subscribe(destination); + if (!nextOrObserver && !error && !complete) { + return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](_Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]); } - return Object(_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(result)(destination); + return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](nextOrObserver, error, complete); } -//# sourceMappingURL=subscribeToResult.js.map +//# sourceMappingURL=toSubscriber.js.map /***/ }), @@ -23077,37 +22937,10 @@ function subscribeToResult(outerSubscriber, result, outerValue, outerIndex, dest "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "InnerSubscriber", function() { return InnerSubscriber; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - - -var InnerSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerSubscriber, _super); - function InnerSubscriber(parent, outerValue, outerIndex) { - var _this = _super.call(this) || this; - _this.parent = parent; - _this.outerValue = outerValue; - _this.outerIndex = outerIndex; - _this.index = 0; - return _this; - } - InnerSubscriber.prototype._next = function (value) { - this.parent.notifyNext(this.outerValue, value, this.outerIndex, this.index++, this); - }; - InnerSubscriber.prototype._error = function (error) { - this.parent.notifyError(error, this); - this.unsubscribe(); - }; - InnerSubscriber.prototype._complete = function () { - this.parent.notifyComplete(this); - this.unsubscribe(); - }; - return InnerSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); - -//# sourceMappingURL=InnerSubscriber.js.map +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return observable; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var observable = /*@__PURE__*/ (function () { return typeof Symbol === 'function' && Symbol.observable || '@@observable'; })(); +//# sourceMappingURL=observable.js.map /***/ }), @@ -23116,47 +22949,30 @@ var InnerSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeTo", function() { return subscribeTo; }); -/* harmony import */ var _subscribeToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(185); -/* harmony import */ var _subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(186); -/* harmony import */ var _subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(187); -/* harmony import */ var _subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(189); -/* harmony import */ var _isArrayLike__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(191); -/* harmony import */ var _isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(192); -/* harmony import */ var _isObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(179); -/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(188); -/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(190); -/** PURE_IMPORTS_START _subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */ - - - - - - - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return pipe; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipeFromArray", function() { return pipeFromArray; }); +/* harmony import */ var _noop__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(185); +/** PURE_IMPORTS_START _noop PURE_IMPORTS_END */ -var subscribeTo = function (result) { - if (!!result && typeof result[_symbol_observable__WEBPACK_IMPORTED_MODULE_8__["observable"]] === 'function') { - return Object(_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__["subscribeToObservable"])(result); - } - else if (Object(_isArrayLike__WEBPACK_IMPORTED_MODULE_4__["isArrayLike"])(result)) { - return Object(_subscribeToArray__WEBPACK_IMPORTED_MODULE_0__["subscribeToArray"])(result); - } - else if (Object(_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(result)) { - return Object(_subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__["subscribeToPromise"])(result); +function pipe() { + var fns = []; + for (var _i = 0; _i < arguments.length; _i++) { + fns[_i] = arguments[_i]; } - else if (!!result && typeof result[_symbol_iterator__WEBPACK_IMPORTED_MODULE_7__["iterator"]] === 'function') { - return Object(_subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__["subscribeToIterable"])(result); + return pipeFromArray(fns); +} +function pipeFromArray(fns) { + if (!fns) { + return _noop__WEBPACK_IMPORTED_MODULE_0__["noop"]; } - else { - var value = Object(_isObject__WEBPACK_IMPORTED_MODULE_6__["isObject"])(result) ? 'an invalid object' : "'" + result + "'"; - var msg = "You provided " + value + " where a stream was expected." - + ' You can provide an Observable, Promise, Array, or Iterable.'; - throw new TypeError(msg); + if (fns.length === 1) { + return fns[0]; } -}; -//# sourceMappingURL=subscribeTo.js.map + return function piped(input) { + return fns.reduce(function (prev, fn) { return fn(prev); }, input); + }; +} +//# sourceMappingURL=pipe.js.map /***/ }), @@ -23165,17 +22981,10 @@ var subscribeTo = function (result) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToArray", function() { return subscribeToArray; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return noop; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ -var subscribeToArray = function (array) { - return function (subscriber) { - for (var i = 0, len = array.length; i < len && !subscriber.closed; i++) { - subscriber.next(array[i]); - } - subscriber.complete(); - }; -}; -//# sourceMappingURL=subscribeToArray.js.map +function noop() { } +//# sourceMappingURL=noop.js.map /***/ }), @@ -23184,2009 +22993,2195 @@ var subscribeToArray = function (array) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToPromise", function() { return subscribeToPromise; }); -/* harmony import */ var _hostReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(176); -/** PURE_IMPORTS_START _hostReportError PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return ConnectableObservable; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "connectableObservableDescriptor", function() { return connectableObservableDescriptor; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(170); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(177); +/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(190); +/** PURE_IMPORTS_START tslib,_Subject,_Observable,_Subscriber,_Subscription,_operators_refCount PURE_IMPORTS_END */ -var subscribeToPromise = function (promise) { - return function (subscriber) { - promise.then(function (value) { - if (!subscriber.closed) { - subscriber.next(value); - subscriber.complete(); - } - }, function (err) { return subscriber.error(err); }) - .then(null, _hostReportError__WEBPACK_IMPORTED_MODULE_0__["hostReportError"]); - return subscriber; - }; -}; -//# sourceMappingURL=subscribeToPromise.js.map -/***/ }), -/* 187 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToIterable", function() { return subscribeToIterable; }); -/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(188); -/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */ -var subscribeToIterable = function (iterable) { - return function (subscriber) { - var iterator = iterable[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]](); - do { - var item = iterator.next(); - if (item.done) { - subscriber.complete(); - break; - } - subscriber.next(item.value); - if (subscriber.closed) { - break; + +var ConnectableObservable = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableObservable, _super); + function ConnectableObservable(source, subjectFactory) { + var _this = _super.call(this) || this; + _this.source = source; + _this.subjectFactory = subjectFactory; + _this._refCount = 0; + _this._isComplete = false; + return _this; + } + ConnectableObservable.prototype._subscribe = function (subscriber) { + return this.getSubject().subscribe(subscriber); + }; + ConnectableObservable.prototype.getSubject = function () { + var subject = this._subject; + if (!subject || subject.isStopped) { + this._subject = this.subjectFactory(); + } + return this._subject; + }; + ConnectableObservable.prototype.connect = function () { + var connection = this._connection; + if (!connection) { + this._isComplete = false; + connection = this._connection = new _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"](); + connection.add(this.source + .subscribe(new ConnectableSubscriber(this.getSubject(), this))); + if (connection.closed) { + this._connection = null; + connection = _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"].EMPTY; } - } while (true); - if (typeof iterator.return === 'function') { - subscriber.add(function () { - if (iterator.return) { - iterator.return(); - } - }); } - return subscriber; + return connection; }; -}; -//# sourceMappingURL=subscribeToIterable.js.map - - -/***/ }), -/* 188 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + ConnectableObservable.prototype.refCount = function () { + return Object(_operators_refCount__WEBPACK_IMPORTED_MODULE_5__["refCount"])()(this); + }; + return ConnectableObservable; +}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"])); -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSymbolIterator", function() { return getSymbolIterator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iterator", function() { return iterator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$iterator", function() { return $$iterator; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function getSymbolIterator() { - if (typeof Symbol !== 'function' || !Symbol.iterator) { - return '@@iterator'; +var connectableObservableDescriptor = /*@__PURE__*/ (function () { + var connectableProto = ConnectableObservable.prototype; + return { + operator: { value: null }, + _refCount: { value: 0, writable: true }, + _subject: { value: null, writable: true }, + _connection: { value: null, writable: true }, + _subscribe: { value: connectableProto._subscribe }, + _isComplete: { value: connectableProto._isComplete, writable: true }, + getSubject: { value: connectableProto.getSubject }, + connect: { value: connectableProto.connect }, + refCount: { value: connectableProto.refCount } + }; +})(); +var ConnectableSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableSubscriber, _super); + function ConnectableSubscriber(destination, connectable) { + var _this = _super.call(this, destination) || this; + _this.connectable = connectable; + return _this; } - return Symbol.iterator; -} -var iterator = /*@__PURE__*/ getSymbolIterator(); -var $$iterator = iterator; -//# sourceMappingURL=iterator.js.map - - -/***/ }), -/* 189 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToObservable", function() { return subscribeToObservable; }); -/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(190); -/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */ - -var subscribeToObservable = function (obj) { - return function (subscriber) { - var obs = obj[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]](); - if (typeof obs.subscribe !== 'function') { - throw new TypeError('Provided object does not correctly implement Symbol.observable'); + ConnectableSubscriber.prototype._error = function (err) { + this._unsubscribe(); + _super.prototype._error.call(this, err); + }; + ConnectableSubscriber.prototype._complete = function () { + this.connectable._isComplete = true; + this._unsubscribe(); + _super.prototype._complete.call(this); + }; + ConnectableSubscriber.prototype._unsubscribe = function () { + var connectable = this.connectable; + if (connectable) { + this.connectable = null; + var connection = connectable._connection; + connectable._refCount = 0; + connectable._subject = null; + connectable._connection = null; + if (connection) { + connection.unsubscribe(); + } } - else { - return obs.subscribe(subscriber); + }; + return ConnectableSubscriber; +}(_Subject__WEBPACK_IMPORTED_MODULE_1__["SubjectSubscriber"])); +var RefCountOperator = /*@__PURE__*/ (function () { + function RefCountOperator(connectable) { + this.connectable = connectable; + } + RefCountOperator.prototype.call = function (subscriber, source) { + var connectable = this.connectable; + connectable._refCount++; + var refCounter = new RefCountSubscriber(subscriber, connectable); + var subscription = source.subscribe(refCounter); + if (!refCounter.closed) { + refCounter.connection = connectable.connect(); } + return subscription; }; -}; -//# sourceMappingURL=subscribeToObservable.js.map - - -/***/ }), -/* 190 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return observable; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var observable = /*@__PURE__*/ (function () { return typeof Symbol === 'function' && Symbol.observable || '@@observable'; })(); -//# sourceMappingURL=observable.js.map - - -/***/ }), -/* 191 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArrayLike", function() { return isArrayLike; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; }); -//# sourceMappingURL=isArrayLike.js.map + return RefCountOperator; +}()); +var RefCountSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super); + function RefCountSubscriber(destination, connectable) { + var _this = _super.call(this, destination) || this; + _this.connectable = connectable; + return _this; + } + RefCountSubscriber.prototype._unsubscribe = function () { + var connectable = this.connectable; + if (!connectable) { + this.connection = null; + return; + } + this.connectable = null; + var refCount = connectable._refCount; + if (refCount <= 0) { + this.connection = null; + return; + } + connectable._refCount = refCount - 1; + if (refCount > 1) { + this.connection = null; + return; + } + var connection = this.connection; + var sharedConnection = connectable._connection; + this.connection = null; + if (sharedConnection && (!connection || sharedConnection === connection)) { + sharedConnection.unsubscribe(); + } + }; + return RefCountSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"])); +//# sourceMappingURL=ConnectableObservable.js.map /***/ }), -/* 192 */ +/* 187 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPromise", function() { return isPromise; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function isPromise(value) { - return !!value && typeof value.subscribe !== 'function' && typeof value.then === 'function'; -} -//# sourceMappingURL=isPromise.js.map +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscriber", function() { return SubjectSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return Subject; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnonymousSubject", function() { return AnonymousSubject; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(170); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(177); +/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(188); +/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(189); +/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(181); +/** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */ -/***/ }), -/* 193 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return Observable; }); -/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(194); -/* harmony import */ var _util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(195); -/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(190); -/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(196); -/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(175); -/** PURE_IMPORTS_START _util_canReportError,_util_toSubscriber,_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */ +var SubjectSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscriber, _super); + function SubjectSubscriber(destination) { + var _this = _super.call(this, destination) || this; + _this.destination = destination; + return _this; + } + return SubjectSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"])); -var Observable = /*@__PURE__*/ (function () { - function Observable(subscribe) { - this._isScalar = false; - if (subscribe) { - this._subscribe = subscribe; - } +var Subject = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Subject, _super); + function Subject() { + var _this = _super.call(this) || this; + _this.observers = []; + _this.closed = false; + _this.isStopped = false; + _this.hasError = false; + _this.thrownError = null; + return _this; } - Observable.prototype.lift = function (operator) { - var observable = new Observable(); - observable.source = this; - observable.operator = operator; - return observable; + Subject.prototype[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__["rxSubscriber"]] = function () { + return new SubjectSubscriber(this); }; - Observable.prototype.subscribe = function (observerOrNext, error, complete) { - var operator = this.operator; - var sink = Object(_util_toSubscriber__WEBPACK_IMPORTED_MODULE_1__["toSubscriber"])(observerOrNext, error, complete); - if (operator) { - sink.add(operator.call(sink, this.source)); - } - else { - sink.add(this.source || (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ? - this._subscribe(sink) : - this._trySubscribe(sink)); + Subject.prototype.lift = function (operator) { + var subject = new AnonymousSubject(this, this); + subject.operator = operator; + return subject; + }; + Subject.prototype.next = function (value) { + if (this.closed) { + throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); } - if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) { - if (sink.syncErrorThrowable) { - sink.syncErrorThrowable = false; - if (sink.syncErrorThrown) { - throw sink.syncErrorValue; - } + if (!this.isStopped) { + var observers = this.observers; + var len = observers.length; + var copy = observers.slice(); + for (var i = 0; i < len; i++) { + copy[i].next(value); } } - return sink; }; - Observable.prototype._trySubscribe = function (sink) { - try { - return this._subscribe(sink); + Subject.prototype.error = function (err) { + if (this.closed) { + throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); } - catch (err) { - if (_config__WEBPACK_IMPORTED_MODULE_4__["config"].useDeprecatedSynchronousErrorHandling) { - sink.syncErrorThrown = true; - sink.syncErrorValue = err; - } - if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_0__["canReportError"])(sink)) { - sink.error(err); - } - else { - console.warn(err); - } + this.hasError = true; + this.thrownError = err; + this.isStopped = true; + var observers = this.observers; + var len = observers.length; + var copy = observers.slice(); + for (var i = 0; i < len; i++) { + copy[i].error(err); } + this.observers.length = 0; }; - Observable.prototype.forEach = function (next, promiseCtor) { - var _this = this; - promiseCtor = getPromiseCtor(promiseCtor); - return new promiseCtor(function (resolve, reject) { - var subscription; - subscription = _this.subscribe(function (value) { - try { - next(value); - } - catch (err) { - reject(err); - if (subscription) { - subscription.unsubscribe(); - } - } - }, reject, resolve); - }); - }; - Observable.prototype._subscribe = function (subscriber) { - var source = this.source; - return source && source.subscribe(subscriber); - }; - Observable.prototype[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]] = function () { - return this; - }; - Observable.prototype.pipe = function () { - var operations = []; - for (var _i = 0; _i < arguments.length; _i++) { - operations[_i] = arguments[_i]; + Subject.prototype.complete = function () { + if (this.closed) { + throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); } - if (operations.length === 0) { - return this; + this.isStopped = true; + var observers = this.observers; + var len = observers.length; + var copy = observers.slice(); + for (var i = 0; i < len; i++) { + copy[i].complete(); } - return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipeFromArray"])(operations)(this); + this.observers.length = 0; }; - Observable.prototype.toPromise = function (promiseCtor) { - var _this = this; - promiseCtor = getPromiseCtor(promiseCtor); - return new promiseCtor(function (resolve, reject) { - var value; - _this.subscribe(function (x) { return value = x; }, function (err) { return reject(err); }, function () { return resolve(value); }); - }); + Subject.prototype.unsubscribe = function () { + this.isStopped = true; + this.closed = true; + this.observers = null; }; - Observable.create = function (subscribe) { - return new Observable(subscribe); + Subject.prototype._trySubscribe = function (subscriber) { + if (this.closed) { + throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); + } + else { + return _super.prototype._trySubscribe.call(this, subscriber); + } }; - return Observable; -}()); - -function getPromiseCtor(promiseCtor) { - if (!promiseCtor) { - promiseCtor = _config__WEBPACK_IMPORTED_MODULE_4__["config"].Promise || Promise; - } - if (!promiseCtor) { - throw new Error('no Promise impl found'); - } - return promiseCtor; -} -//# sourceMappingURL=Observable.js.map - - -/***/ }), -/* 194 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "canReportError", function() { return canReportError; }); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(172); -/** PURE_IMPORTS_START _Subscriber PURE_IMPORTS_END */ - -function canReportError(observer) { - while (observer) { - var _a = observer, closed_1 = _a.closed, destination = _a.destination, isStopped = _a.isStopped; - if (closed_1 || isStopped) { - return false; + Subject.prototype._subscribe = function (subscriber) { + if (this.closed) { + throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); } - else if (destination && destination instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) { - observer = destination; + else if (this.hasError) { + subscriber.error(this.thrownError); + return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY; + } + else if (this.isStopped) { + subscriber.complete(); + return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY; } else { - observer = null; + this.observers.push(subscriber); + return new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__["SubjectSubscription"](this, subscriber); } - } - return true; -} -//# sourceMappingURL=canReportError.js.map - - -/***/ }), -/* 195 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toSubscriber", function() { return toSubscriber; }); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(172); -/* harmony import */ var _symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(181); -/* harmony import */ var _Observer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(174); -/** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */ - - + }; + Subject.prototype.asObservable = function () { + var observable = new _Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"](); + observable.source = this; + return observable; + }; + Subject.create = function (destination, source) { + return new AnonymousSubject(destination, source); + }; + return Subject; +}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"])); -function toSubscriber(nextOrObserver, error, complete) { - if (nextOrObserver) { - if (nextOrObserver instanceof _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"]) { - return nextOrObserver; +var AnonymousSubject = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnonymousSubject, _super); + function AnonymousSubject(destination, source) { + var _this = _super.call(this) || this; + _this.destination = destination; + _this.source = source; + return _this; + } + AnonymousSubject.prototype.next = function (value) { + var destination = this.destination; + if (destination && destination.next) { + destination.next(value); } - if (nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]]) { - return nextOrObserver[_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_1__["rxSubscriber"]](); + }; + AnonymousSubject.prototype.error = function (err) { + var destination = this.destination; + if (destination && destination.error) { + this.destination.error(err); } - } - if (!nextOrObserver && !error && !complete) { - return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](_Observer__WEBPACK_IMPORTED_MODULE_2__["empty"]); - } - return new _Subscriber__WEBPACK_IMPORTED_MODULE_0__["Subscriber"](nextOrObserver, error, complete); -} -//# sourceMappingURL=toSubscriber.js.map - - -/***/ }), -/* 196 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return pipe; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pipeFromArray", function() { return pipeFromArray; }); -/* harmony import */ var _noop__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(197); -/** PURE_IMPORTS_START _noop PURE_IMPORTS_END */ - -function pipe() { - var fns = []; - for (var _i = 0; _i < arguments.length; _i++) { - fns[_i] = arguments[_i]; - } - return pipeFromArray(fns); -} -function pipeFromArray(fns) { - if (!fns) { - return _noop__WEBPACK_IMPORTED_MODULE_0__["noop"]; - } - if (fns.length === 1) { - return fns[0]; - } - return function piped(input) { - return fns.reduce(function (prev, fn) { return fn(prev); }, input); }; -} -//# sourceMappingURL=pipe.js.map - - -/***/ }), -/* 197 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + AnonymousSubject.prototype.complete = function () { + var destination = this.destination; + if (destination && destination.complete) { + this.destination.complete(); + } + }; + AnonymousSubject.prototype._subscribe = function (subscriber) { + var source = this.source; + if (source) { + return this.source.subscribe(subscriber); + } + else { + return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY; + } + }; + return AnonymousSubject; +}(Subject)); -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return noop; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function noop() { } -//# sourceMappingURL=noop.js.map +//# sourceMappingURL=Subject.js.map /***/ }), -/* 198 */ +/* 188 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return auditTime; }); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199); -/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(170); -/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(204); -/** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */ - - - -function auditTime(duration, scheduler) { - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"]; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return ObjectUnsubscribedError; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var ObjectUnsubscribedErrorImpl = /*@__PURE__*/ (function () { + function ObjectUnsubscribedErrorImpl() { + Error.call(this); + this.message = 'object unsubscribed'; + this.name = 'ObjectUnsubscribedError'; + return this; } - return Object(_audit__WEBPACK_IMPORTED_MODULE_1__["audit"])(function () { return Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__["timer"])(duration, scheduler); }); -} -//# sourceMappingURL=auditTime.js.map - - -/***/ }), -/* 199 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "async", function() { return async; }); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(200); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(202); -/** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */ - - -var async = /*@__PURE__*/ new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"](_AsyncAction__WEBPACK_IMPORTED_MODULE_0__["AsyncAction"]); -//# sourceMappingURL=async.js.map + ObjectUnsubscribedErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); + return ObjectUnsubscribedErrorImpl; +})(); +var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl; +//# sourceMappingURL=ObjectUnsubscribedError.js.map /***/ }), -/* 200 */ +/* 189 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncAction", function() { return AsyncAction; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscription", function() { return SubjectSubscription; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(201); -/** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */ +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); +/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */ -var AsyncAction = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncAction, _super); - function AsyncAction(scheduler, work) { - var _this = _super.call(this, scheduler, work) || this; - _this.scheduler = scheduler; - _this.work = work; - _this.pending = false; +var SubjectSubscription = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscription, _super); + function SubjectSubscription(subject, subscriber) { + var _this = _super.call(this) || this; + _this.subject = subject; + _this.subscriber = subscriber; + _this.closed = false; return _this; } - AsyncAction.prototype.schedule = function (state, delay) { - if (delay === void 0) { - delay = 0; - } - if (this.closed) { - return this; - } - this.state = state; - var id = this.id; - var scheduler = this.scheduler; - if (id != null) { - this.id = this.recycleAsyncId(scheduler, id, delay); - } - this.pending = true; - this.delay = delay; - this.id = this.id || this.requestAsyncId(scheduler, this.id, delay); - return this; - }; - AsyncAction.prototype.requestAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; - } - return setInterval(scheduler.flush.bind(scheduler, this), delay); - }; - AsyncAction.prototype.recycleAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; - } - if (delay !== null && this.delay === delay && this.pending === false) { - return id; - } - clearInterval(id); - return undefined; - }; - AsyncAction.prototype.execute = function (state, delay) { + SubjectSubscription.prototype.unsubscribe = function () { if (this.closed) { - return new Error('executing a cancelled action'); - } - this.pending = false; - var error = this._execute(state, delay); - if (error) { - return error; - } - else if (this.pending === false && this.id != null) { - this.id = this.recycleAsyncId(this.scheduler, this.id, null); - } - }; - AsyncAction.prototype._execute = function (state, delay) { - var errored = false; - var errorValue = undefined; - try { - this.work(state); - } - catch (e) { - errored = true; - errorValue = !!e && e || new Error(e); - } - if (errored) { - this.unsubscribe(); - return errorValue; + return; } - }; - AsyncAction.prototype._unsubscribe = function () { - var id = this.id; - var scheduler = this.scheduler; - var actions = scheduler.actions; - var index = actions.indexOf(this); - this.work = null; - this.state = null; - this.pending = false; - this.scheduler = null; - if (index !== -1) { - actions.splice(index, 1); + this.closed = true; + var subject = this.subject; + var observers = subject.observers; + this.subject = null; + if (!observers || observers.length === 0 || subject.isStopped || subject.closed) { + return; } - if (id != null) { - this.id = this.recycleAsyncId(scheduler, id, null); + var subscriberIndex = observers.indexOf(this.subscriber); + if (subscriberIndex !== -1) { + observers.splice(subscriberIndex, 1); } - this.delay = null; }; - return AsyncAction; -}(_Action__WEBPACK_IMPORTED_MODULE_1__["Action"])); + return SubjectSubscription; +}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"])); -//# sourceMappingURL=AsyncAction.js.map +//# sourceMappingURL=SubjectSubscription.js.map /***/ }), -/* 201 */ +/* 190 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Action", function() { return Action; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return refCount; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); -/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */ +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -var Action = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Action, _super); - function Action(scheduler, work) { - return _super.call(this) || this; +function refCount() { + return function refCountOperatorFunction(source) { + return source.lift(new RefCountOperator(source)); + }; +} +var RefCountOperator = /*@__PURE__*/ (function () { + function RefCountOperator(connectable) { + this.connectable = connectable; } - Action.prototype.schedule = function (state, delay) { - if (delay === void 0) { - delay = 0; + RefCountOperator.prototype.call = function (subscriber, source) { + var connectable = this.connectable; + connectable._refCount++; + var refCounter = new RefCountSubscriber(subscriber, connectable); + var subscription = source.subscribe(refCounter); + if (!refCounter.closed) { + refCounter.connection = connectable.connect(); } - return this; + return subscription; }; - return Action; -}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"])); - -//# sourceMappingURL=Action.js.map - - -/***/ }), -/* 202 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncScheduler", function() { return AsyncScheduler; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(203); -/** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */ - - -var AsyncScheduler = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncScheduler, _super); - function AsyncScheduler(SchedulerAction, now) { - if (now === void 0) { - now = _Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"].now; - } - var _this = _super.call(this, SchedulerAction, function () { - if (AsyncScheduler.delegate && AsyncScheduler.delegate !== _this) { - return AsyncScheduler.delegate.now(); - } - else { - return now(); - } - }) || this; - _this.actions = []; - _this.active = false; - _this.scheduled = undefined; + return RefCountOperator; +}()); +var RefCountSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super); + function RefCountSubscriber(destination, connectable) { + var _this = _super.call(this, destination) || this; + _this.connectable = connectable; return _this; } - AsyncScheduler.prototype.schedule = function (work, delay, state) { - if (delay === void 0) { - delay = 0; - } - if (AsyncScheduler.delegate && AsyncScheduler.delegate !== this) { - return AsyncScheduler.delegate.schedule(work, delay, state); + RefCountSubscriber.prototype._unsubscribe = function () { + var connectable = this.connectable; + if (!connectable) { + this.connection = null; + return; } - else { - return _super.prototype.schedule.call(this, work, delay, state); + this.connectable = null; + var refCount = connectable._refCount; + if (refCount <= 0) { + this.connection = null; + return; } - }; - AsyncScheduler.prototype.flush = function (action) { - var actions = this.actions; - if (this.active) { - actions.push(action); + connectable._refCount = refCount - 1; + if (refCount > 1) { + this.connection = null; return; } - var error; - this.active = true; - do { - if (error = action.execute(action.state, action.delay)) { - break; - } - } while (action = actions.shift()); - this.active = false; - if (error) { - while (action = actions.shift()) { - action.unsubscribe(); - } - throw error; + var connection = this.connection; + var sharedConnection = connectable._connection; + this.connection = null; + if (sharedConnection && (!connection || sharedConnection === connection)) { + sharedConnection.unsubscribe(); } }; - return AsyncScheduler; -}(_Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"])); - -//# sourceMappingURL=AsyncScheduler.js.map + return RefCountSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=refCount.js.map /***/ }), -/* 203 */ +/* 191 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return Scheduler; }); -var Scheduler = /*@__PURE__*/ (function () { - function Scheduler(SchedulerAction, now) { - if (now === void 0) { - now = Scheduler.now; - } - this.SchedulerAction = SchedulerAction; - this.now = now; - } - Scheduler.prototype.schedule = function (work, delay, state) { - if (delay === void 0) { - delay = 0; - } - return new this.SchedulerAction(this, work).schedule(state, delay); - }; - Scheduler.now = function () { return Date.now(); }; - return Scheduler; -}()); - -//# sourceMappingURL=Scheduler.js.map - - -/***/ }), -/* 204 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return groupBy; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return GroupedObservable; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(170); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(187); +/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription,_Observable,_Subject PURE_IMPORTS_END */ -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return timer; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199); -/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(206); -/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */ -function timer(dueTime, periodOrScheduler, scheduler) { - if (dueTime === void 0) { - dueTime = 0; - } - var period = -1; - if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(periodOrScheduler)) { - period = Number(periodOrScheduler) < 1 && 1 || Number(periodOrScheduler); +function groupBy(keySelector, elementSelector, durationSelector, subjectSelector) { + return function (source) { + return source.lift(new GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector)); + }; +} +var GroupByOperator = /*@__PURE__*/ (function () { + function GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector) { + this.keySelector = keySelector; + this.elementSelector = elementSelector; + this.durationSelector = durationSelector; + this.subjectSelector = subjectSelector; } - else if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(periodOrScheduler)) { - scheduler = periodOrScheduler; + GroupByOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new GroupBySubscriber(subscriber, this.keySelector, this.elementSelector, this.durationSelector, this.subjectSelector)); + }; + return GroupByOperator; +}()); +var GroupBySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupBySubscriber, _super); + function GroupBySubscriber(destination, keySelector, elementSelector, durationSelector, subjectSelector) { + var _this = _super.call(this, destination) || this; + _this.keySelector = keySelector; + _this.elementSelector = elementSelector; + _this.durationSelector = durationSelector; + _this.subjectSelector = subjectSelector; + _this.groups = null; + _this.attemptedToUnsubscribe = false; + _this.count = 0; + return _this; } - if (!Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(scheduler)) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; + GroupBySubscriber.prototype._next = function (value) { + var key; + try { + key = this.keySelector(value); + } + catch (err) { + this.error(err); + return; + } + this._group(value, key); + }; + GroupBySubscriber.prototype._group = function (value, key) { + var groups = this.groups; + if (!groups) { + groups = this.groups = new Map(); + } + var group = groups.get(key); + var element; + if (this.elementSelector) { + try { + element = this.elementSelector(value); + } + catch (err) { + this.error(err); + } + } + else { + element = value; + } + if (!group) { + group = (this.subjectSelector ? this.subjectSelector() : new _Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]()); + groups.set(key, group); + var groupedObservable = new GroupedObservable(key, group, this); + this.destination.next(groupedObservable); + if (this.durationSelector) { + var duration = void 0; + try { + duration = this.durationSelector(new GroupedObservable(key, group)); + } + catch (err) { + this.error(err); + return; + } + this.add(duration.subscribe(new GroupDurationSubscriber(key, group, this))); + } + } + if (!group.closed) { + group.next(element); + } + }; + GroupBySubscriber.prototype._error = function (err) { + var groups = this.groups; + if (groups) { + groups.forEach(function (group, key) { + group.error(err); + }); + groups.clear(); + } + this.destination.error(err); + }; + GroupBySubscriber.prototype._complete = function () { + var groups = this.groups; + if (groups) { + groups.forEach(function (group, key) { + group.complete(); + }); + groups.clear(); + } + this.destination.complete(); + }; + GroupBySubscriber.prototype.removeGroup = function (key) { + this.groups.delete(key); + }; + GroupBySubscriber.prototype.unsubscribe = function () { + if (!this.closed) { + this.attemptedToUnsubscribe = true; + if (this.count === 0) { + _super.prototype.unsubscribe.call(this); + } + } + }; + return GroupBySubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +var GroupDurationSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupDurationSubscriber, _super); + function GroupDurationSubscriber(key, group, parent) { + var _this = _super.call(this, group) || this; + _this.key = key; + _this.group = group; + _this.parent = parent; + return _this; } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var due = Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(dueTime) - ? dueTime - : (+dueTime - scheduler.now()); - return scheduler.schedule(dispatch, due, { - index: 0, period: period, subscriber: subscriber - }); - }); -} -function dispatch(state) { - var index = state.index, period = state.period, subscriber = state.subscriber; - subscriber.next(index); - if (subscriber.closed) { - return; + GroupDurationSubscriber.prototype._next = function (value) { + this.complete(); + }; + GroupDurationSubscriber.prototype._unsubscribe = function () { + var _a = this, parent = _a.parent, key = _a.key; + this.key = this.parent = null; + if (parent) { + parent.removeGroup(key); + } + }; + return GroupDurationSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +var GroupedObservable = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupedObservable, _super); + function GroupedObservable(key, groupSubject, refCountSubscription) { + var _this = _super.call(this) || this; + _this.key = key; + _this.groupSubject = groupSubject; + _this.refCountSubscription = refCountSubscription; + return _this; } - else if (period === -1) { - return subscriber.complete(); + GroupedObservable.prototype._subscribe = function (subscriber) { + var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](); + var _a = this, refCountSubscription = _a.refCountSubscription, groupSubject = _a.groupSubject; + if (refCountSubscription && !refCountSubscription.closed) { + subscription.add(new InnerRefCountSubscription(refCountSubscription)); + } + subscription.add(groupSubject.subscribe(subscriber)); + return subscription; + }; + return GroupedObservable; +}(_Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"])); + +var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerRefCountSubscription, _super); + function InnerRefCountSubscription(parent) { + var _this = _super.call(this) || this; + _this.parent = parent; + parent.count++; + return _this; } - state.index = index + 1; - this.schedule(state, period); -} -//# sourceMappingURL=timer.js.map + InnerRefCountSubscription.prototype.unsubscribe = function () { + var parent = this.parent; + if (!parent.closed && !this.closed) { + _super.prototype.unsubscribe.call(this); + parent.count -= 1; + if (parent.count === 0 && parent.attemptedToUnsubscribe) { + parent.unsubscribe(); + } + } + }; + return InnerRefCountSubscription; +}(_Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"])); +//# sourceMappingURL=groupBy.js.map /***/ }), -/* 205 */ +/* 192 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isNumeric", function() { return isNumeric; }); -/* harmony import */ var _isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(178); -/** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return BehaviorSubject; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(188); +/** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */ -function isNumeric(val) { - return !Object(_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(val) && (val - parseFloat(val) + 1) >= 0; -} -//# sourceMappingURL=isNumeric.js.map -/***/ }), -/* 206 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +var BehaviorSubject = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BehaviorSubject, _super); + function BehaviorSubject(_value) { + var _this = _super.call(this) || this; + _this._value = _value; + return _this; + } + Object.defineProperty(BehaviorSubject.prototype, "value", { + get: function () { + return this.getValue(); + }, + enumerable: true, + configurable: true + }); + BehaviorSubject.prototype._subscribe = function (subscriber) { + var subscription = _super.prototype._subscribe.call(this, subscriber); + if (subscription && !subscription.closed) { + subscriber.next(this._value); + } + return subscription; + }; + BehaviorSubject.prototype.getValue = function () { + if (this.hasError) { + throw this.thrownError; + } + else if (this.closed) { + throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__["ObjectUnsubscribedError"](); + } + else { + return this._value; + } + }; + BehaviorSubject.prototype.next = function (value) { + _super.prototype.next.call(this, this._value = value); + }; + return BehaviorSubject; +}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"])); -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isScheduler", function() { return isScheduler; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function isScheduler(value) { - return value && typeof value.schedule === 'function'; -} -//# sourceMappingURL=isScheduler.js.map +//# sourceMappingURL=BehaviorSubject.js.map /***/ }), -/* 207 */ +/* 193 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return buffer; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return ReplaySubject; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(194); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(177); +/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(201); +/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(188); +/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(189); +/** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */ -function buffer(closingNotifier) { - return function bufferOperatorFunction(source) { - return source.lift(new BufferOperator(closingNotifier)); - }; -} -var BufferOperator = /*@__PURE__*/ (function () { - function BufferOperator(closingNotifier) { - this.closingNotifier = closingNotifier; - } - BufferOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new BufferSubscriber(subscriber, this.closingNotifier)); - }; - return BufferOperator; -}()); -var BufferSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSubscriber, _super); - function BufferSubscriber(destination, closingNotifier) { - var _this = _super.call(this, destination) || this; - _this.buffer = []; - _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, closingNotifier)); - return _this; - } - BufferSubscriber.prototype._next = function (value) { - this.buffer.push(value); - }; - BufferSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - var buffer = this.buffer; - this.buffer = []; - this.destination.next(buffer); - }; - return BufferSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=buffer.js.map -/***/ }), -/* 208 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return bufferCount; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function bufferCount(bufferSize, startBufferEvery) { - if (startBufferEvery === void 0) { - startBufferEvery = null; - } - return function bufferCountOperatorFunction(source) { - return source.lift(new BufferCountOperator(bufferSize, startBufferEvery)); - }; -} -var BufferCountOperator = /*@__PURE__*/ (function () { - function BufferCountOperator(bufferSize, startBufferEvery) { - this.bufferSize = bufferSize; - this.startBufferEvery = startBufferEvery; - if (!startBufferEvery || bufferSize === startBufferEvery) { - this.subscriberClass = BufferCountSubscriber; +var ReplaySubject = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ReplaySubject, _super); + function ReplaySubject(bufferSize, windowTime, scheduler) { + if (bufferSize === void 0) { + bufferSize = Number.POSITIVE_INFINITY; + } + if (windowTime === void 0) { + windowTime = Number.POSITIVE_INFINITY; + } + var _this = _super.call(this) || this; + _this.scheduler = scheduler; + _this._events = []; + _this._infiniteTimeWindow = false; + _this._bufferSize = bufferSize < 1 ? 1 : bufferSize; + _this._windowTime = windowTime < 1 ? 1 : windowTime; + if (windowTime === Number.POSITIVE_INFINITY) { + _this._infiniteTimeWindow = true; + _this.next = _this.nextInfiniteTimeWindow; } else { - this.subscriberClass = BufferSkipCountSubscriber; + _this.next = _this.nextTimeWindow; } - } - BufferCountOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new this.subscriberClass(subscriber, this.bufferSize, this.startBufferEvery)); - }; - return BufferCountOperator; -}()); -var BufferCountSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferCountSubscriber, _super); - function BufferCountSubscriber(destination, bufferSize) { - var _this = _super.call(this, destination) || this; - _this.bufferSize = bufferSize; - _this.buffer = []; return _this; } - BufferCountSubscriber.prototype._next = function (value) { - var buffer = this.buffer; - buffer.push(value); - if (buffer.length == this.bufferSize) { - this.destination.next(buffer); - this.buffer = []; + ReplaySubject.prototype.nextInfiniteTimeWindow = function (value) { + var _events = this._events; + _events.push(value); + if (_events.length > this._bufferSize) { + _events.shift(); } + _super.prototype.next.call(this, value); }; - BufferCountSubscriber.prototype._complete = function () { - var buffer = this.buffer; - if (buffer.length > 0) { - this.destination.next(buffer); - } - _super.prototype._complete.call(this); + ReplaySubject.prototype.nextTimeWindow = function (value) { + this._events.push(new ReplayEvent(this._getNow(), value)); + this._trimBufferThenGetEvents(); + _super.prototype.next.call(this, value); }; - return BufferCountSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSkipCountSubscriber, _super); - function BufferSkipCountSubscriber(destination, bufferSize, startBufferEvery) { - var _this = _super.call(this, destination) || this; - _this.bufferSize = bufferSize; - _this.startBufferEvery = startBufferEvery; - _this.buffers = []; - _this.count = 0; - return _this; - } - BufferSkipCountSubscriber.prototype._next = function (value) { - var _a = this, bufferSize = _a.bufferSize, startBufferEvery = _a.startBufferEvery, buffers = _a.buffers, count = _a.count; - this.count++; - if (count % startBufferEvery === 0) { - buffers.push([]); + ReplaySubject.prototype._subscribe = function (subscriber) { + var _infiniteTimeWindow = this._infiniteTimeWindow; + var _events = _infiniteTimeWindow ? this._events : this._trimBufferThenGetEvents(); + var scheduler = this.scheduler; + var len = _events.length; + var subscription; + if (this.closed) { + throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__["ObjectUnsubscribedError"](); } - for (var i = buffers.length; i--;) { - var buffer = buffers[i]; - buffer.push(value); - if (buffer.length === bufferSize) { - buffers.splice(i, 1); - this.destination.next(buffer); + else if (this.isStopped || this.hasError) { + subscription = _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY; + } + else { + this.observers.push(subscriber); + subscription = new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__["SubjectSubscription"](this, subscriber); + } + if (scheduler) { + subscriber.add(subscriber = new _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__["ObserveOnSubscriber"](subscriber, scheduler)); + } + if (_infiniteTimeWindow) { + for (var i = 0; i < len && !subscriber.closed; i++) { + subscriber.next(_events[i]); + } + } + else { + for (var i = 0; i < len && !subscriber.closed; i++) { + subscriber.next(_events[i].value); } } + if (this.hasError) { + subscriber.error(this.thrownError); + } + else if (this.isStopped) { + subscriber.complete(); + } + return subscription; }; - BufferSkipCountSubscriber.prototype._complete = function () { - var _a = this, buffers = _a.buffers, destination = _a.destination; - while (buffers.length > 0) { - var buffer = buffers.shift(); - if (buffer.length > 0) { - destination.next(buffer); + ReplaySubject.prototype._getNow = function () { + return (this.scheduler || _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__["queue"]).now(); + }; + ReplaySubject.prototype._trimBufferThenGetEvents = function () { + var now = this._getNow(); + var _bufferSize = this._bufferSize; + var _windowTime = this._windowTime; + var _events = this._events; + var eventsCount = _events.length; + var spliceCount = 0; + while (spliceCount < eventsCount) { + if ((now - _events[spliceCount].time) < _windowTime) { + break; } + spliceCount++; } - _super.prototype._complete.call(this); + if (eventsCount > _bufferSize) { + spliceCount = Math.max(spliceCount, eventsCount - _bufferSize); + } + if (spliceCount > 0) { + _events.splice(0, spliceCount); + } + return _events; }; - return BufferSkipCountSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=bufferCount.js.map + return ReplaySubject; +}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"])); + +var ReplayEvent = /*@__PURE__*/ (function () { + function ReplayEvent(time, value) { + this.time = time; + this.value = value; + } + return ReplayEvent; +}()); +//# sourceMappingURL=ReplaySubject.js.map /***/ }), -/* 209 */ +/* 194 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return bufferTime; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(206); -/** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return queue; }); +/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(195); +/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(198); +/** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */ +var queue = /*@__PURE__*/ new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__["QueueScheduler"](_QueueAction__WEBPACK_IMPORTED_MODULE_0__["QueueAction"]); +//# sourceMappingURL=queue.js.map -function bufferTime(bufferTimeSpan) { - var length = arguments.length; - var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(arguments[arguments.length - 1])) { - scheduler = arguments[arguments.length - 1]; - length--; - } - var bufferCreationInterval = null; - if (length >= 2) { - bufferCreationInterval = arguments[1]; +/***/ }), +/* 195 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueAction", function() { return QueueAction; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(196); +/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */ + + +var QueueAction = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueAction, _super); + function QueueAction(scheduler, work) { + var _this = _super.call(this, scheduler, work) || this; + _this.scheduler = scheduler; + _this.work = work; + return _this; } - var maxBufferSize = Number.POSITIVE_INFINITY; - if (length >= 3) { - maxBufferSize = arguments[2]; - } - return function bufferTimeOperatorFunction(source) { - return source.lift(new BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler)); - }; -} -var BufferTimeOperator = /*@__PURE__*/ (function () { - function BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) { - this.bufferTimeSpan = bufferTimeSpan; - this.bufferCreationInterval = bufferCreationInterval; - this.maxBufferSize = maxBufferSize; - this.scheduler = scheduler; - } - BufferTimeOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new BufferTimeSubscriber(subscriber, this.bufferTimeSpan, this.bufferCreationInterval, this.maxBufferSize, this.scheduler)); - }; - return BufferTimeOperator; -}()); -var Context = /*@__PURE__*/ (function () { - function Context() { - this.buffer = []; - } - return Context; -}()); -var BufferTimeSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferTimeSubscriber, _super); - function BufferTimeSubscriber(destination, bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) { - var _this = _super.call(this, destination) || this; - _this.bufferTimeSpan = bufferTimeSpan; - _this.bufferCreationInterval = bufferCreationInterval; - _this.maxBufferSize = maxBufferSize; - _this.scheduler = scheduler; - _this.contexts = []; - var context = _this.openContext(); - _this.timespanOnly = bufferCreationInterval == null || bufferCreationInterval < 0; - if (_this.timespanOnly) { - var timeSpanOnlyState = { subscriber: _this, context: context, bufferTimeSpan: bufferTimeSpan }; - _this.add(context.closeAction = scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState)); - } - else { - var closeState = { subscriber: _this, context: context }; - var creationState = { bufferTimeSpan: bufferTimeSpan, bufferCreationInterval: bufferCreationInterval, subscriber: _this, scheduler: scheduler }; - _this.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, closeState)); - _this.add(scheduler.schedule(dispatchBufferCreation, bufferCreationInterval, creationState)); - } - return _this; - } - BufferTimeSubscriber.prototype._next = function (value) { - var contexts = this.contexts; - var len = contexts.length; - var filledBufferContext; - for (var i = 0; i < len; i++) { - var context_1 = contexts[i]; - var buffer = context_1.buffer; - buffer.push(value); - if (buffer.length == this.maxBufferSize) { - filledBufferContext = context_1; - } - } - if (filledBufferContext) { - this.onBufferFull(filledBufferContext); + QueueAction.prototype.schedule = function (state, delay) { + if (delay === void 0) { + delay = 0; } - }; - BufferTimeSubscriber.prototype._error = function (err) { - this.contexts.length = 0; - _super.prototype._error.call(this, err); - }; - BufferTimeSubscriber.prototype._complete = function () { - var _a = this, contexts = _a.contexts, destination = _a.destination; - while (contexts.length > 0) { - var context_2 = contexts.shift(); - destination.next(context_2.buffer); + if (delay > 0) { + return _super.prototype.schedule.call(this, state, delay); } - _super.prototype._complete.call(this); + this.delay = delay; + this.state = state; + this.scheduler.flush(this); + return this; }; - BufferTimeSubscriber.prototype._unsubscribe = function () { - this.contexts = null; + QueueAction.prototype.execute = function (state, delay) { + return (delay > 0 || this.closed) ? + _super.prototype.execute.call(this, state, delay) : + this._execute(state, delay); }; - BufferTimeSubscriber.prototype.onBufferFull = function (context) { - this.closeContext(context); - var closeAction = context.closeAction; - closeAction.unsubscribe(); - this.remove(closeAction); - if (!this.closed && this.timespanOnly) { - context = this.openContext(); - var bufferTimeSpan = this.bufferTimeSpan; - var timeSpanOnlyState = { subscriber: this, context: context, bufferTimeSpan: bufferTimeSpan }; - this.add(context.closeAction = this.scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState)); + QueueAction.prototype.requestAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; } - }; - BufferTimeSubscriber.prototype.openContext = function () { - var context = new Context(); - this.contexts.push(context); - return context; - }; - BufferTimeSubscriber.prototype.closeContext = function (context) { - this.destination.next(context.buffer); - var contexts = this.contexts; - var spliceIndex = contexts ? contexts.indexOf(context) : -1; - if (spliceIndex >= 0) { - contexts.splice(contexts.indexOf(context), 1); + if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) { + return _super.prototype.requestAsyncId.call(this, scheduler, id, delay); } + return scheduler.flush(this); }; - return BufferTimeSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"])); -function dispatchBufferTimeSpanOnly(state) { - var subscriber = state.subscriber; - var prevContext = state.context; - if (prevContext) { - subscriber.closeContext(prevContext); - } - if (!subscriber.closed) { - state.context = subscriber.openContext(); - state.context.closeAction = this.schedule(state, state.bufferTimeSpan); - } -} -function dispatchBufferCreation(state) { - var bufferCreationInterval = state.bufferCreationInterval, bufferTimeSpan = state.bufferTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler; - var context = subscriber.openContext(); - var action = this; - if (!subscriber.closed) { - subscriber.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, { subscriber: subscriber, context: context })); - action.schedule(state, bufferCreationInterval); - } -} -function dispatchBufferClose(arg) { - var subscriber = arg.subscriber, context = arg.context; - subscriber.closeContext(context); -} -//# sourceMappingURL=bufferTime.js.map + return QueueAction; +}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"])); + +//# sourceMappingURL=QueueAction.js.map /***/ }), -/* 210 */ +/* 196 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return bufferToggle; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncAction", function() { return AsyncAction; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171); -/** PURE_IMPORTS_START tslib,_Subscription,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */ - - +/* harmony import */ var _Action__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(197); +/** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */ -function bufferToggle(openings, closingSelector) { - return function bufferToggleOperatorFunction(source) { - return source.lift(new BufferToggleOperator(openings, closingSelector)); - }; -} -var BufferToggleOperator = /*@__PURE__*/ (function () { - function BufferToggleOperator(openings, closingSelector) { - this.openings = openings; - this.closingSelector = closingSelector; - } - BufferToggleOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new BufferToggleSubscriber(subscriber, this.openings, this.closingSelector)); - }; - return BufferToggleOperator; -}()); -var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferToggleSubscriber, _super); - function BufferToggleSubscriber(destination, openings, closingSelector) { - var _this = _super.call(this, destination) || this; - _this.openings = openings; - _this.closingSelector = closingSelector; - _this.contexts = []; - _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, openings)); +var AsyncAction = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncAction, _super); + function AsyncAction(scheduler, work) { + var _this = _super.call(this, scheduler, work) || this; + _this.scheduler = scheduler; + _this.work = work; + _this.pending = false; return _this; } - BufferToggleSubscriber.prototype._next = function (value) { - var contexts = this.contexts; - var len = contexts.length; - for (var i = 0; i < len; i++) { - contexts[i].buffer.push(value); + AsyncAction.prototype.schedule = function (state, delay) { + if (delay === void 0) { + delay = 0; } - }; - BufferToggleSubscriber.prototype._error = function (err) { - var contexts = this.contexts; - while (contexts.length > 0) { - var context_1 = contexts.shift(); - context_1.subscription.unsubscribe(); - context_1.buffer = null; - context_1.subscription = null; + if (this.closed) { + return this; } - this.contexts = null; - _super.prototype._error.call(this, err); + this.state = state; + var id = this.id; + var scheduler = this.scheduler; + if (id != null) { + this.id = this.recycleAsyncId(scheduler, id, delay); + } + this.pending = true; + this.delay = delay; + this.id = this.id || this.requestAsyncId(scheduler, this.id, delay); + return this; }; - BufferToggleSubscriber.prototype._complete = function () { - var contexts = this.contexts; - while (contexts.length > 0) { - var context_2 = contexts.shift(); - this.destination.next(context_2.buffer); - context_2.subscription.unsubscribe(); - context_2.buffer = null; - context_2.subscription = null; + AsyncAction.prototype.requestAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; } - this.contexts = null; - _super.prototype._complete.call(this); + return setInterval(scheduler.flush.bind(scheduler, this), delay); }; - BufferToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - outerValue ? this.closeBuffer(outerValue) : this.openBuffer(innerValue); + AsyncAction.prototype.recycleAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; + } + if (delay !== null && this.delay === delay && this.pending === false) { + return id; + } + clearInterval(id); + return undefined; }; - BufferToggleSubscriber.prototype.notifyComplete = function (innerSub) { - this.closeBuffer(innerSub.context); + AsyncAction.prototype.execute = function (state, delay) { + if (this.closed) { + return new Error('executing a cancelled action'); + } + this.pending = false; + var error = this._execute(state, delay); + if (error) { + return error; + } + else if (this.pending === false && this.id != null) { + this.id = this.recycleAsyncId(this.scheduler, this.id, null); + } }; - BufferToggleSubscriber.prototype.openBuffer = function (value) { + AsyncAction.prototype._execute = function (state, delay) { + var errored = false; + var errorValue = undefined; try { - var closingSelector = this.closingSelector; - var closingNotifier = closingSelector.call(this, value); - if (closingNotifier) { - this.trySubscribe(closingNotifier); - } + this.work(state); } - catch (err) { - this._error(err); + catch (e) { + errored = true; + errorValue = !!e && e || new Error(e); } - }; - BufferToggleSubscriber.prototype.closeBuffer = function (context) { - var contexts = this.contexts; - if (contexts && context) { - var buffer = context.buffer, subscription = context.subscription; - this.destination.next(buffer); - contexts.splice(contexts.indexOf(context), 1); - this.remove(subscription); - subscription.unsubscribe(); + if (errored) { + this.unsubscribe(); + return errorValue; } }; - BufferToggleSubscriber.prototype.trySubscribe = function (closingNotifier) { - var contexts = this.contexts; - var buffer = []; - var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - var context = { buffer: buffer, subscription: subscription }; - contexts.push(context); - var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, closingNotifier, context); - if (!innerSubscription || innerSubscription.closed) { - this.closeBuffer(context); + AsyncAction.prototype._unsubscribe = function () { + var id = this.id; + var scheduler = this.scheduler; + var actions = scheduler.actions; + var index = actions.indexOf(this); + this.work = null; + this.state = null; + this.pending = false; + this.scheduler = null; + if (index !== -1) { + actions.splice(index, 1); } - else { - innerSubscription.context = context; - this.add(innerSubscription); - subscription.add(innerSubscription); + if (id != null) { + this.id = this.recycleAsyncId(scheduler, id, null); } + this.delay = null; }; - return BufferToggleSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); -//# sourceMappingURL=bufferToggle.js.map + return AsyncAction; +}(_Action__WEBPACK_IMPORTED_MODULE_1__["Action"])); + +//# sourceMappingURL=AsyncAction.js.map /***/ }), -/* 211 */ +/* 197 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return bufferWhen; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Action", function() { return Action; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */ -function bufferWhen(closingSelector) { - return function (source) { - return source.lift(new BufferWhenOperator(closingSelector)); - }; -} -var BufferWhenOperator = /*@__PURE__*/ (function () { - function BufferWhenOperator(closingSelector) { - this.closingSelector = closingSelector; - } - BufferWhenOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new BufferWhenSubscriber(subscriber, this.closingSelector)); - }; - return BufferWhenOperator; -}()); -var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferWhenSubscriber, _super); - function BufferWhenSubscriber(destination, closingSelector) { - var _this = _super.call(this, destination) || this; - _this.closingSelector = closingSelector; - _this.subscribing = false; - _this.openBuffer(); - return _this; +var Action = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Action, _super); + function Action(scheduler, work) { + return _super.call(this) || this; } - BufferWhenSubscriber.prototype._next = function (value) { - this.buffer.push(value); - }; - BufferWhenSubscriber.prototype._complete = function () { - var buffer = this.buffer; - if (buffer) { - this.destination.next(buffer); - } - _super.prototype._complete.call(this); - }; - BufferWhenSubscriber.prototype._unsubscribe = function () { - this.buffer = null; - this.subscribing = false; - }; - BufferWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.openBuffer(); - }; - BufferWhenSubscriber.prototype.notifyComplete = function () { - if (this.subscribing) { - this.complete(); - } - else { - this.openBuffer(); - } - }; - BufferWhenSubscriber.prototype.openBuffer = function () { - var closingSubscription = this.closingSubscription; - if (closingSubscription) { - this.remove(closingSubscription); - closingSubscription.unsubscribe(); - } - var buffer = this.buffer; - if (this.buffer) { - this.destination.next(buffer); - } - this.buffer = []; - var closingNotifier; - try { - var closingSelector = this.closingSelector; - closingNotifier = closingSelector(); - } - catch (err) { - return this.error(err); + Action.prototype.schedule = function (state, delay) { + if (delay === void 0) { + delay = 0; } - closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - this.closingSubscription = closingSubscription; - this.add(closingSubscription); - this.subscribing = true; - closingSubscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, closingNotifier)); - this.subscribing = false; + return this; }; - return BufferWhenSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); -//# sourceMappingURL=bufferWhen.js.map + return Action; +}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"])); + +//# sourceMappingURL=Action.js.map /***/ }), -/* 212 */ +/* 198 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return catchError; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueScheduler", function() { return QueueScheduler; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199); +/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ -function catchError(selector) { - return function catchErrorOperatorFunction(source) { - var operator = new CatchOperator(selector); - var caught = source.lift(operator); - return (operator.caught = caught); - }; -} -var CatchOperator = /*@__PURE__*/ (function () { - function CatchOperator(selector) { - this.selector = selector; - } - CatchOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new CatchSubscriber(subscriber, this.selector, this.caught)); - }; - return CatchOperator; -}()); -var CatchSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CatchSubscriber, _super); - function CatchSubscriber(destination, selector, caught) { - var _this = _super.call(this, destination) || this; - _this.selector = selector; - _this.caught = caught; - return _this; +var QueueScheduler = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueScheduler, _super); + function QueueScheduler() { + return _super !== null && _super.apply(this, arguments) || this; } - CatchSubscriber.prototype.error = function (err) { - if (!this.isStopped) { - var result = void 0; - try { - result = this.selector(err, this.caught); - } - catch (err2) { - _super.prototype.error.call(this, err2); - return; - } - this._unsubscribeAndRecycle(); - var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined); - this.add(innerSubscriber); - Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, undefined, undefined, innerSubscriber); - } - }; - return CatchSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=catchError.js.map - - -/***/ }), -/* 213 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return combineAll; }); -/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(214); -/** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */ + return QueueScheduler; +}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"])); -function combineAll(project) { - return function (source) { return source.lift(new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__["CombineLatestOperator"](project)); }; -} -//# sourceMappingURL=combineAll.js.map +//# sourceMappingURL=QueueScheduler.js.map /***/ }), -/* 214 */ +/* 199 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestOperator", function() { return CombineLatestOperator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestSubscriber", function() { return CombineLatestSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncScheduler", function() { return AsyncScheduler; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(206); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(215); -/** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */ - - - - +/* harmony import */ var _Scheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(200); +/** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */ -var NONE = {}; -function combineLatest() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - var resultSelector = null; - var scheduler = null; - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(observables[observables.length - 1])) { - scheduler = observables.pop(); - } - if (typeof observables[observables.length - 1] === 'function') { - resultSelector = observables.pop(); - } - if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(observables[0])) { - observables = observables[0]; - } - return Object(_fromArray__WEBPACK_IMPORTED_MODULE_5__["fromArray"])(observables, scheduler).lift(new CombineLatestOperator(resultSelector)); -} -var CombineLatestOperator = /*@__PURE__*/ (function () { - function CombineLatestOperator(resultSelector) { - this.resultSelector = resultSelector; - } - CombineLatestOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new CombineLatestSubscriber(subscriber, this.resultSelector)); - }; - return CombineLatestOperator; -}()); - -var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CombineLatestSubscriber, _super); - function CombineLatestSubscriber(destination, resultSelector) { - var _this = _super.call(this, destination) || this; - _this.resultSelector = resultSelector; - _this.active = 0; - _this.values = []; - _this.observables = []; +var AsyncScheduler = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncScheduler, _super); + function AsyncScheduler(SchedulerAction, now) { + if (now === void 0) { + now = _Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"].now; + } + var _this = _super.call(this, SchedulerAction, function () { + if (AsyncScheduler.delegate && AsyncScheduler.delegate !== _this) { + return AsyncScheduler.delegate.now(); + } + else { + return now(); + } + }) || this; + _this.actions = []; + _this.active = false; + _this.scheduled = undefined; return _this; } - CombineLatestSubscriber.prototype._next = function (observable) { - this.values.push(NONE); - this.observables.push(observable); - }; - CombineLatestSubscriber.prototype._complete = function () { - var observables = this.observables; - var len = observables.length; - if (len === 0) { - this.destination.complete(); + AsyncScheduler.prototype.schedule = function (work, delay, state) { + if (delay === void 0) { + delay = 0; + } + if (AsyncScheduler.delegate && AsyncScheduler.delegate !== this) { + return AsyncScheduler.delegate.schedule(work, delay, state); } else { - this.active = len; - this.toRespond = len; - for (var i = 0; i < len; i++) { - var observable = observables[i]; - this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, observable, i)); - } + return _super.prototype.schedule.call(this, work, delay, state); } }; - CombineLatestSubscriber.prototype.notifyComplete = function (unused) { - if ((this.active -= 1) === 0) { - this.destination.complete(); + AsyncScheduler.prototype.flush = function (action) { + var actions = this.actions; + if (this.active) { + actions.push(action); + return; } - }; - CombineLatestSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - var values = this.values; - var oldVal = values[outerIndex]; - var toRespond = !this.toRespond - ? 0 - : oldVal === NONE ? --this.toRespond : this.toRespond; - values[outerIndex] = innerValue; - if (toRespond === 0) { - if (this.resultSelector) { - this._tryResultSelector(values); + var error; + this.active = true; + do { + if (error = action.execute(action.state, action.delay)) { + break; } - else { - this.destination.next(values.slice()); + } while (action = actions.shift()); + this.active = false; + if (error) { + while (action = actions.shift()) { + action.unsubscribe(); } + throw error; } }; - CombineLatestSubscriber.prototype._tryResultSelector = function (values) { - var result; - try { - result = this.resultSelector.apply(this, values); + return AsyncScheduler; +}(_Scheduler__WEBPACK_IMPORTED_MODULE_1__["Scheduler"])); + +//# sourceMappingURL=AsyncScheduler.js.map + + +/***/ }), +/* 200 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return Scheduler; }); +var Scheduler = /*@__PURE__*/ (function () { + function Scheduler(SchedulerAction, now) { + if (now === void 0) { + now = Scheduler.now; } - catch (err) { - this.destination.error(err); - return; + this.SchedulerAction = SchedulerAction; + this.now = now; + } + Scheduler.prototype.schedule = function (work, delay, state) { + if (delay === void 0) { + delay = 0; } - this.destination.next(result); + return new this.SchedulerAction(this, work).schedule(state, delay); }; - return CombineLatestSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); + Scheduler.now = function () { return Date.now(); }; + return Scheduler; +}()); -//# sourceMappingURL=combineLatest.js.map +//# sourceMappingURL=Scheduler.js.map /***/ }), -/* 215 */ +/* 201 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromArray", function() { return fromArray; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(185); -/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(216); -/** PURE_IMPORTS_START _Observable,_util_subscribeToArray,_scheduled_scheduleArray PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return observeOn; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnOperator", function() { return ObserveOnOperator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnSubscriber", function() { return ObserveOnSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnMessage", function() { return ObserveOnMessage; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(202); +/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */ -function fromArray(input, scheduler) { - if (!scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__["subscribeToArray"])(input)); - } - else { - return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler); +function observeOn(scheduler, delay) { + if (delay === void 0) { + delay = 0; } + return function observeOnOperatorFunction(source) { + return source.lift(new ObserveOnOperator(scheduler, delay)); + }; } -//# sourceMappingURL=fromArray.js.map +var ObserveOnOperator = /*@__PURE__*/ (function () { + function ObserveOnOperator(scheduler, delay) { + if (delay === void 0) { + delay = 0; + } + this.scheduler = scheduler; + this.delay = delay; + } + ObserveOnOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ObserveOnSubscriber(subscriber, this.scheduler, this.delay)); + }; + return ObserveOnOperator; +}()); + +var ObserveOnSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ObserveOnSubscriber, _super); + function ObserveOnSubscriber(destination, scheduler, delay) { + if (delay === void 0) { + delay = 0; + } + var _this = _super.call(this, destination) || this; + _this.scheduler = scheduler; + _this.delay = delay; + return _this; + } + ObserveOnSubscriber.dispatch = function (arg) { + var notification = arg.notification, destination = arg.destination; + notification.observe(destination); + this.unsubscribe(); + }; + ObserveOnSubscriber.prototype.scheduleMessage = function (notification) { + var destination = this.destination; + destination.add(this.scheduler.schedule(ObserveOnSubscriber.dispatch, this.delay, new ObserveOnMessage(notification, this.destination))); + }; + ObserveOnSubscriber.prototype._next = function (value) { + this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value)); + }; + ObserveOnSubscriber.prototype._error = function (err) { + this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err)); + this.unsubscribe(); + }; + ObserveOnSubscriber.prototype._complete = function () { + this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete()); + this.unsubscribe(); + }; + return ObserveOnSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); + +var ObserveOnMessage = /*@__PURE__*/ (function () { + function ObserveOnMessage(notification, destination) { + this.notification = notification; + this.destination = destination; + } + return ObserveOnMessage; +}()); + +//# sourceMappingURL=observeOn.js.map /***/ }), -/* 216 */ +/* 202 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleArray", function() { return scheduleArray; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); -/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return NotificationKind; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return Notification; }); +/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(203); +/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204); +/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(209); +/** PURE_IMPORTS_START _observable_empty,_observable_of,_observable_throwError PURE_IMPORTS_END */ -function scheduleArray(input, scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - var i = 0; - sub.add(scheduler.schedule(function () { - if (i === input.length) { - subscriber.complete(); - return; - } - subscriber.next(input[i++]); - if (!subscriber.closed) { - sub.add(this.schedule()); - } - })); - return sub; - }); -} -//# sourceMappingURL=scheduleArray.js.map + +var NotificationKind; +/*@__PURE__*/ (function (NotificationKind) { + NotificationKind["NEXT"] = "N"; + NotificationKind["ERROR"] = "E"; + NotificationKind["COMPLETE"] = "C"; +})(NotificationKind || (NotificationKind = {})); +var Notification = /*@__PURE__*/ (function () { + function Notification(kind, value, error) { + this.kind = kind; + this.value = value; + this.error = error; + this.hasValue = kind === 'N'; + } + Notification.prototype.observe = function (observer) { + switch (this.kind) { + case 'N': + return observer.next && observer.next(this.value); + case 'E': + return observer.error && observer.error(this.error); + case 'C': + return observer.complete && observer.complete(); + } + }; + Notification.prototype.do = function (next, error, complete) { + var kind = this.kind; + switch (kind) { + case 'N': + return next && next(this.value); + case 'E': + return error && error(this.error); + case 'C': + return complete && complete(); + } + }; + Notification.prototype.accept = function (nextOrObserver, error, complete) { + if (nextOrObserver && typeof nextOrObserver.next === 'function') { + return this.observe(nextOrObserver); + } + else { + return this.do(nextOrObserver, error, complete); + } + }; + Notification.prototype.toObservable = function () { + var kind = this.kind; + switch (kind) { + case 'N': + return Object(_observable_of__WEBPACK_IMPORTED_MODULE_1__["of"])(this.value); + case 'E': + return Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_2__["throwError"])(this.error); + case 'C': + return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_0__["empty"])(); + } + throw new Error('unexpected notification kind value'); + }; + Notification.createNext = function (value) { + if (typeof value !== 'undefined') { + return new Notification('N', value); + } + return Notification.undefinedValueNotification; + }; + Notification.createError = function (err) { + return new Notification('E', undefined, err); + }; + Notification.createComplete = function () { + return Notification.completeNotification; + }; + Notification.completeNotification = new Notification('C'); + Notification.undefinedValueNotification = new Notification('N', undefined); + return Notification; +}()); + +//# sourceMappingURL=Notification.js.map /***/ }), -/* 217 */ +/* 203 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; }); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(178); -/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(214); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(218); -/** PURE_IMPORTS_START _util_isArray,_observable_combineLatest,_observable_from PURE_IMPORTS_END */ - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return EMPTY; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return empty; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ -var none = {}; -function combineLatest() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - var project = null; - if (typeof observables[observables.length - 1] === 'function') { - project = observables.pop(); - } - if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) { - observables = observables[0].slice(); - } - return function (source) { return source.lift.call(Object(_observable_from__WEBPACK_IMPORTED_MODULE_2__["from"])([source].concat(observables)), new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__["CombineLatestOperator"](project)); }; +var EMPTY = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.complete(); }); +function empty(scheduler) { + return scheduler ? emptyScheduled(scheduler) : EMPTY; } -//# sourceMappingURL=combineLatest.js.map +function emptyScheduled(scheduler) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); }); +} +//# sourceMappingURL=empty.js.map /***/ }), -/* 218 */ +/* 204 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return from; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(184); -/* harmony import */ var _scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(219); -/** PURE_IMPORTS_START _Observable,_util_subscribeTo,_scheduled_scheduled PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "of", function() { return of; }); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(205); +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(206); +/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(208); +/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_scheduled_scheduleArray PURE_IMPORTS_END */ -function from(input, scheduler) { - if (!scheduler) { - if (input instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) { - return input; - } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(input)); +function of() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + var scheduler = args[args.length - 1]; + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_0__["isScheduler"])(scheduler)) { + args.pop(); + return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(args, scheduler); } else { - return Object(_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__["scheduled"])(input, scheduler); + return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args); } } -//# sourceMappingURL=from.js.map +//# sourceMappingURL=of.js.map /***/ }), -/* 219 */ +/* 205 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return scheduled; }); -/* harmony import */ var _scheduleObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(220); -/* harmony import */ var _schedulePromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(221); -/* harmony import */ var _scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(216); -/* harmony import */ var _scheduleIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(222); -/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(223); -/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(192); -/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(191); -/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(224); -/** PURE_IMPORTS_START _scheduleObservable,_schedulePromise,_scheduleArray,_scheduleIterable,_util_isInteropObservable,_util_isPromise,_util_isArrayLike,_util_isIterable PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isScheduler", function() { return isScheduler; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function isScheduler(value) { + return value && typeof value.schedule === 'function'; +} +//# sourceMappingURL=isScheduler.js.map + +/***/ }), +/* 206 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromArray", function() { return fromArray; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(207); +/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(208); +/** PURE_IMPORTS_START _Observable,_util_subscribeToArray,_scheduled_scheduleArray PURE_IMPORTS_END */ +function fromArray(input, scheduler) { + if (!scheduler) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeToArray__WEBPACK_IMPORTED_MODULE_1__["subscribeToArray"])(input)); + } + else { + return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler); + } +} +//# sourceMappingURL=fromArray.js.map +/***/ }), +/* 207 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -function scheduled(input, scheduler) { - if (input != null) { - if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__["isInteropObservable"])(input)) { - return Object(_scheduleObservable__WEBPACK_IMPORTED_MODULE_0__["scheduleObservable"])(input, scheduler); - } - else if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(input)) { - return Object(_schedulePromise__WEBPACK_IMPORTED_MODULE_1__["schedulePromise"])(input, scheduler); - } - else if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__["isArrayLike"])(input)) { - return Object(_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler); - } - else if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_7__["isIterable"])(input) || typeof input === 'string') { - return Object(_scheduleIterable__WEBPACK_IMPORTED_MODULE_3__["scheduleIterable"])(input, scheduler); +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToArray", function() { return subscribeToArray; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var subscribeToArray = function (array) { + return function (subscriber) { + for (var i = 0, len = array.length; i < len && !subscriber.closed; i++) { + subscriber.next(array[i]); } - } - throw new TypeError((input !== null && typeof input || input) + ' is not observable'); -} -//# sourceMappingURL=scheduled.js.map + subscriber.complete(); + }; +}; +//# sourceMappingURL=subscribeToArray.js.map /***/ }), -/* 220 */ +/* 208 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleObservable", function() { return scheduleObservable; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleArray", function() { return scheduleArray; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); /* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); -/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(190); -/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable PURE_IMPORTS_END */ - +/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */ -function scheduleObservable(input, scheduler) { +function scheduleArray(input, scheduler) { return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + var i = 0; sub.add(scheduler.schedule(function () { - var observable = input[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]](); - sub.add(observable.subscribe({ - next: function (value) { sub.add(scheduler.schedule(function () { return subscriber.next(value); })); }, - error: function (err) { sub.add(scheduler.schedule(function () { return subscriber.error(err); })); }, - complete: function () { sub.add(scheduler.schedule(function () { return subscriber.complete(); })); }, - })); + if (i === input.length) { + subscriber.complete(); + return; + } + subscriber.next(input[i++]); + if (!subscriber.closed) { + sub.add(this.schedule()); + } })); return sub; }); } -//# sourceMappingURL=scheduleObservable.js.map +//# sourceMappingURL=scheduleArray.js.map /***/ }), -/* 221 */ +/* 209 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "schedulePromise", function() { return schedulePromise; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); -/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return throwError; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ -function schedulePromise(input, scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - sub.add(scheduler.schedule(function () { - return input.then(function (value) { - sub.add(scheduler.schedule(function () { - subscriber.next(value); - sub.add(scheduler.schedule(function () { return subscriber.complete(); })); - })); - }, function (err) { - sub.add(scheduler.schedule(function () { return subscriber.error(err); })); - }); - })); - return sub; - }); +function throwError(error, scheduler) { + if (!scheduler) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.error(error); }); + } + else { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(dispatch, 0, { error: error, subscriber: subscriber }); }); + } } -//# sourceMappingURL=schedulePromise.js.map +function dispatch(_a) { + var error = _a.error, subscriber = _a.subscriber; + subscriber.error(error); +} +//# sourceMappingURL=throwError.js.map /***/ }), -/* 222 */ +/* 210 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleIterable", function() { return scheduleIterable; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); -/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(188); -/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return AsyncSubject; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177); +/** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */ -function scheduleIterable(input, scheduler) { - if (!input) { - throw new Error('Iterable cannot be null'); +var AsyncSubject = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncSubject, _super); + function AsyncSubject() { + var _this = _super !== null && _super.apply(this, arguments) || this; + _this.value = null; + _this.hasNext = false; + _this.hasCompleted = false; + return _this; } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - var iterator; - sub.add(function () { - if (iterator && typeof iterator.return === 'function') { - iterator.return(); - } - }); - sub.add(scheduler.schedule(function () { - iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_2__["iterator"]](); - sub.add(scheduler.schedule(function () { - if (subscriber.closed) { - return; - } - var value; - var done; - try { - var result = iterator.next(); - value = result.value; - done = result.done; - } - catch (err) { - subscriber.error(err); - return; - } - if (done) { - subscriber.complete(); - } - else { - subscriber.next(value); - this.schedule(); - } - })); - })); - return sub; - }); -} -//# sourceMappingURL=scheduleIterable.js.map + AsyncSubject.prototype._subscribe = function (subscriber) { + if (this.hasError) { + subscriber.error(this.thrownError); + return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY; + } + else if (this.hasCompleted && this.hasNext) { + subscriber.next(this.value); + subscriber.complete(); + return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY; + } + return _super.prototype._subscribe.call(this, subscriber); + }; + AsyncSubject.prototype.next = function (value) { + if (!this.hasCompleted) { + this.value = value; + this.hasNext = true; + } + }; + AsyncSubject.prototype.error = function (error) { + if (!this.hasCompleted) { + _super.prototype.error.call(this, error); + } + }; + AsyncSubject.prototype.complete = function () { + this.hasCompleted = true; + if (this.hasNext) { + _super.prototype.next.call(this, this.value); + } + _super.prototype.complete.call(this); + }; + return AsyncSubject; +}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"])); + +//# sourceMappingURL=AsyncSubject.js.map /***/ }), -/* 223 */ +/* 211 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isInteropObservable", function() { return isInteropObservable; }); -/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(190); -/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return asap; }); +/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(212); +/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(214); +/** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */ -function isInteropObservable(input) { - return input && typeof input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]] === 'function'; -} -//# sourceMappingURL=isInteropObservable.js.map + +var asap = /*@__PURE__*/ new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__["AsapScheduler"](_AsapAction__WEBPACK_IMPORTED_MODULE_0__["AsapAction"]); +//# sourceMappingURL=asap.js.map /***/ }), -/* 224 */ +/* 212 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isIterable", function() { return isIterable; }); -/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(188); -/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapAction", function() { return AsapAction; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(213); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(196); +/** PURE_IMPORTS_START tslib,_util_Immediate,_AsyncAction PURE_IMPORTS_END */ -function isIterable(input) { - return input && typeof input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]] === 'function'; -} -//# sourceMappingURL=isIterable.js.map + + +var AsapAction = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapAction, _super); + function AsapAction(scheduler, work) { + var _this = _super.call(this, scheduler, work) || this; + _this.scheduler = scheduler; + _this.work = work; + return _this; + } + AsapAction.prototype.requestAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; + } + if (delay !== null && delay > 0) { + return _super.prototype.requestAsyncId.call(this, scheduler, id, delay); + } + scheduler.actions.push(this); + return scheduler.scheduled || (scheduler.scheduled = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].setImmediate(scheduler.flush.bind(scheduler, null))); + }; + AsapAction.prototype.recycleAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; + } + if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) { + return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay); + } + if (scheduler.actions.length === 0) { + _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].clearImmediate(id); + scheduler.scheduled = undefined; + } + return undefined; + }; + return AsapAction; +}(_AsyncAction__WEBPACK_IMPORTED_MODULE_2__["AsyncAction"])); + +//# sourceMappingURL=AsapAction.js.map /***/ }), -/* 225 */ +/* 213 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; }); -/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(226); -/** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */ - -function concat() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Immediate", function() { return Immediate; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var nextHandle = 1; +var tasksByHandle = {}; +function runIfPresent(handle) { + var cb = tasksByHandle[handle]; + if (cb) { + cb(); } - return function (source) { return source.lift.call(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"].apply(void 0, [source].concat(observables))); }; } -//# sourceMappingURL=concat.js.map +var Immediate = { + setImmediate: function (cb) { + var handle = nextHandle++; + tasksByHandle[handle] = cb; + Promise.resolve().then(function () { return runIfPresent(handle); }); + return handle; + }, + clearImmediate: function (handle) { + delete tasksByHandle[handle]; + }, +}; +//# sourceMappingURL=Immediate.js.map /***/ }), -/* 226 */ +/* 214 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; }); -/* harmony import */ var _of__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(227); -/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(228); -/** PURE_IMPORTS_START _of,_operators_concatAll PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapScheduler", function() { return AsapScheduler; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199); +/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ -function concat() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; +var AsapScheduler = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapScheduler, _super); + function AsapScheduler() { + return _super !== null && _super.apply(this, arguments) || this; } - return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_1__["concatAll"])()(_of__WEBPACK_IMPORTED_MODULE_0__["of"].apply(void 0, observables)); -} -//# sourceMappingURL=concat.js.map + AsapScheduler.prototype.flush = function (action) { + this.active = true; + this.scheduled = undefined; + var actions = this.actions; + var error; + var index = -1; + var count = actions.length; + action = action || actions.shift(); + do { + if (error = action.execute(action.state, action.delay)) { + break; + } + } while (++index < count && (action = actions.shift())); + this.active = false; + if (error) { + while (++index < count && (action = actions.shift())) { + action.unsubscribe(); + } + throw error; + } + }; + return AsapScheduler; +}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"])); + +//# sourceMappingURL=AsapScheduler.js.map /***/ }), -/* 227 */ +/* 215 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "of", function() { return of; }); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(206); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215); -/* harmony import */ var _scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(216); -/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_scheduled_scheduleArray PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "async", function() { return async; }); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(196); +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199); +/** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */ -function of() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var scheduler = args[args.length - 1]; - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_0__["isScheduler"])(scheduler)) { - args.pop(); - return Object(_scheduled_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(args, scheduler); - } - else { - return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(args); - } -} -//# sourceMappingURL=of.js.map +var async = /*@__PURE__*/ new _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"](_AsyncAction__WEBPACK_IMPORTED_MODULE_0__["AsyncAction"]); +//# sourceMappingURL=async.js.map /***/ }), -/* 228 */ +/* 216 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return concatAll; }); -/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(229); -/** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return animationFrame; }); +/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(217); +/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218); +/** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */ -function concatAll() { - return Object(_mergeAll__WEBPACK_IMPORTED_MODULE_0__["mergeAll"])(1); -} -//# sourceMappingURL=concatAll.js.map + +var animationFrame = /*@__PURE__*/ new _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__["AnimationFrameScheduler"](_AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__["AnimationFrameAction"]); +//# sourceMappingURL=animationFrame.js.map /***/ }), -/* 229 */ +/* 217 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return mergeAll; }); -/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(230); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232); -/** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameAction", function() { return AnimationFrameAction; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(196); +/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */ -function mergeAll(concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; +var AnimationFrameAction = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameAction, _super); + function AnimationFrameAction(scheduler, work) { + var _this = _super.call(this, scheduler, work) || this; + _this.scheduler = scheduler; + _this.work = work; + return _this; } - return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"], concurrent); -} -//# sourceMappingURL=mergeAll.js.map + AnimationFrameAction.prototype.requestAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; + } + if (delay !== null && delay > 0) { + return _super.prototype.requestAsyncId.call(this, scheduler, id, delay); + } + scheduler.actions.push(this); + return scheduler.scheduled || (scheduler.scheduled = requestAnimationFrame(function () { return scheduler.flush(null); })); + }; + AnimationFrameAction.prototype.recycleAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; + } + if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) { + return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay); + } + if (scheduler.actions.length === 0) { + cancelAnimationFrame(id); + scheduler.scheduled = undefined; + } + return undefined; + }; + return AnimationFrameAction; +}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"])); + +//# sourceMappingURL=AnimationFrameAction.js.map /***/ }), -/* 230 */ +/* 218 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return mergeMap; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapOperator", function() { return MergeMapOperator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapSubscriber", function() { return MergeMapSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameScheduler", function() { return AnimationFrameScheduler; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(182); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171); -/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(183); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(218); -/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber,_map,_observable_from PURE_IMPORTS_END */ +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199); +/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ + + +var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameScheduler, _super); + function AnimationFrameScheduler() { + return _super !== null && _super.apply(this, arguments) || this; + } + AnimationFrameScheduler.prototype.flush = function (action) { + this.active = true; + this.scheduled = undefined; + var actions = this.actions; + var error; + var index = -1; + var count = actions.length; + action = action || actions.shift(); + do { + if (error = action.execute(action.state, action.delay)) { + break; + } + } while (++index < count && (action = actions.shift())); + this.active = false; + if (error) { + while (++index < count && (action = actions.shift())) { + action.unsubscribe(); + } + throw error; + } + }; + return AnimationFrameScheduler; +}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"])); +//# sourceMappingURL=AnimationFrameScheduler.js.map +/***/ }), +/* 219 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return VirtualTimeScheduler; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return VirtualAction; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(196); +/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(199); +/** PURE_IMPORTS_START tslib,_AsyncAction,_AsyncScheduler PURE_IMPORTS_END */ -function mergeMap(project, resultSelector, concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; - } - if (typeof resultSelector === 'function') { - return function (source) { return source.pipe(mergeMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); }; - } - else if (typeof resultSelector === 'number') { - concurrent = resultSelector; - } - return function (source) { return source.lift(new MergeMapOperator(project, concurrent)); }; -} -var MergeMapOperator = /*@__PURE__*/ (function () { - function MergeMapOperator(project, concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; + +var VirtualTimeScheduler = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualTimeScheduler, _super); + function VirtualTimeScheduler(SchedulerAction, maxFrames) { + if (SchedulerAction === void 0) { + SchedulerAction = VirtualAction; } - this.project = project; - this.concurrent = concurrent; + if (maxFrames === void 0) { + maxFrames = Number.POSITIVE_INFINITY; + } + var _this = _super.call(this, SchedulerAction, function () { return _this.frame; }) || this; + _this.maxFrames = maxFrames; + _this.frame = 0; + _this.index = -1; + return _this; } - MergeMapOperator.prototype.call = function (observer, source) { - return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent)); + VirtualTimeScheduler.prototype.flush = function () { + var _a = this, actions = _a.actions, maxFrames = _a.maxFrames; + var error, action; + while ((action = actions[0]) && action.delay <= maxFrames) { + actions.shift(); + this.frame = action.delay; + if (error = action.execute(action.state, action.delay)) { + break; + } + } + if (error) { + while (action = actions.shift()) { + action.unsubscribe(); + } + throw error; + } }; - return MergeMapOperator; -}()); + VirtualTimeScheduler.frameTimeFactor = 10; + return VirtualTimeScheduler; +}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__["AsyncScheduler"])); -var MergeMapSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeMapSubscriber, _super); - function MergeMapSubscriber(destination, project, concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; +var VirtualAction = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualAction, _super); + function VirtualAction(scheduler, work, index) { + if (index === void 0) { + index = scheduler.index += 1; } - var _this = _super.call(this, destination) || this; - _this.project = project; - _this.concurrent = concurrent; - _this.hasCompleted = false; - _this.buffer = []; - _this.active = 0; - _this.index = 0; + var _this = _super.call(this, scheduler, work) || this; + _this.scheduler = scheduler; + _this.work = work; + _this.index = index; + _this.active = true; + _this.index = scheduler.index = index; return _this; } - MergeMapSubscriber.prototype._next = function (value) { - if (this.active < this.concurrent) { - this._tryNext(value); + VirtualAction.prototype.schedule = function (state, delay) { + if (delay === void 0) { + delay = 0; } - else { - this.buffer.push(value); + if (!this.id) { + return _super.prototype.schedule.call(this, state, delay); } + this.active = false; + var action = new VirtualAction(this.scheduler, this.work); + this.add(action); + return action.schedule(state, delay); }; - MergeMapSubscriber.prototype._tryNext = function (value) { - var result; - var index = this.index++; - try { - result = this.project(value, index); - } - catch (err) { - this.destination.error(err); - return; + VirtualAction.prototype.requestAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; } - this.active++; - this._innerSub(result, value, index); - }; - MergeMapSubscriber.prototype._innerSub = function (ish, value, index) { - var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__["InnerSubscriber"](this, undefined, undefined); - var destination = this.destination; - destination.add(innerSubscriber); - Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index, innerSubscriber); + this.delay = scheduler.frame + delay; + var actions = scheduler.actions; + actions.push(this); + actions.sort(VirtualAction.sortActions); + return true; }; - MergeMapSubscriber.prototype._complete = function () { - this.hasCompleted = true; - if (this.active === 0 && this.buffer.length === 0) { - this.destination.complete(); + VirtualAction.prototype.recycleAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; } - this.unsubscribe(); + return undefined; }; - MergeMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.destination.next(innerValue); + VirtualAction.prototype._execute = function (state, delay) { + if (this.active === true) { + return _super.prototype._execute.call(this, state, delay); + } }; - MergeMapSubscriber.prototype.notifyComplete = function (innerSub) { - var buffer = this.buffer; - this.remove(innerSub); - this.active--; - if (buffer.length > 0) { - this._next(buffer.shift()); + VirtualAction.sortActions = function (a, b) { + if (a.delay === b.delay) { + if (a.index === b.index) { + return 0; + } + else if (a.index > b.index) { + return 1; + } + else { + return -1; + } } - else if (this.active === 0 && this.hasCompleted) { - this.destination.complete(); + else if (a.delay > b.delay) { + return 1; + } + else { + return -1; } }; - return MergeMapSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); + return VirtualAction; +}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"])); -//# sourceMappingURL=mergeMap.js.map +//# sourceMappingURL=VirtualTimeScheduler.js.map /***/ }), -/* 231 */ +/* 220 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return map; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MapOperator", function() { return MapOperator; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return identity; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function identity(x) { + return x; +} +//# sourceMappingURL=identity.js.map -function map(project, thisArg) { - return function mapOperation(source) { +/***/ }), +/* 221 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return isObservable; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ + +function isObservable(obj) { + return !!obj && (obj instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"] || (typeof obj.lift === 'function' && typeof obj.subscribe === 'function')); +} +//# sourceMappingURL=isObservable.js.map + + +/***/ }), +/* 222 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return ArgumentOutOfRangeError; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var ArgumentOutOfRangeErrorImpl = /*@__PURE__*/ (function () { + function ArgumentOutOfRangeErrorImpl() { + Error.call(this); + this.message = 'argument out of range'; + this.name = 'ArgumentOutOfRangeError'; + return this; + } + ArgumentOutOfRangeErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); + return ArgumentOutOfRangeErrorImpl; +})(); +var ArgumentOutOfRangeError = ArgumentOutOfRangeErrorImpl; +//# sourceMappingURL=ArgumentOutOfRangeError.js.map + + +/***/ }), +/* 223 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return EmptyError; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var EmptyErrorImpl = /*@__PURE__*/ (function () { + function EmptyErrorImpl() { + Error.call(this); + this.message = 'no elements in sequence'; + this.name = 'EmptyError'; + return this; + } + EmptyErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); + return EmptyErrorImpl; +})(); +var EmptyError = EmptyErrorImpl; +//# sourceMappingURL=EmptyError.js.map + + +/***/ }), +/* 224 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return TimeoutError; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var TimeoutErrorImpl = /*@__PURE__*/ (function () { + function TimeoutErrorImpl() { + Error.call(this); + this.message = 'Timeout has occurred'; + this.name = 'TimeoutError'; + return this; + } + TimeoutErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); + return TimeoutErrorImpl; +})(); +var TimeoutError = TimeoutErrorImpl; +//# sourceMappingURL=TimeoutError.js.map + + +/***/ }), +/* 225 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return bindCallback; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(210); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(226); +/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(178); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(205); +/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */ + + + + + + +function bindCallback(callbackFunc, resultSelector, scheduler) { + if (resultSelector) { + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(resultSelector)) { + scheduler = resultSelector; + } + else { + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return bindCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_4__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); + }; + } + } + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + var context = this; + var subject; + var params = { + context: context, + subject: subject, + callbackFunc: callbackFunc, + scheduler: scheduler, + }; + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + if (!scheduler) { + if (!subject) { + subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"](); + var handler = function () { + var innerArgs = []; + for (var _i = 0; _i < arguments.length; _i++) { + innerArgs[_i] = arguments[_i]; + } + subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs); + subject.complete(); + }; + try { + callbackFunc.apply(context, args.concat([handler])); + } + catch (err) { + if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) { + subject.error(err); + } + else { + console.warn(err); + } + } + } + return subject.subscribe(subscriber); + } + else { + var state = { + args: args, subscriber: subscriber, params: params, + }; + return scheduler.schedule(dispatch, 0, state); + } + }); + }; +} +function dispatch(state) { + var _this = this; + var self = this; + var args = state.args, subscriber = state.subscriber, params = state.params; + var callbackFunc = params.callbackFunc, context = params.context, scheduler = params.scheduler; + var subject = params.subject; + if (!subject) { + subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"](); + var handler = function () { + var innerArgs = []; + for (var _i = 0; _i < arguments.length; _i++) { + innerArgs[_i] = arguments[_i]; + } + var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs; + _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject })); + }; + try { + callbackFunc.apply(context, args.concat([handler])); + } + catch (err) { + subject.error(err); + } + } + this.add(subject.subscribe(subscriber)); +} +function dispatchNext(state) { + var value = state.value, subject = state.subject; + subject.next(value); + subject.complete(); +} +function dispatchError(state) { + var err = state.err, subject = state.subject; + subject.error(err); +} +//# sourceMappingURL=bindCallback.js.map + + +/***/ }), +/* 226 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return map; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MapOperator", function() { return MapOperator; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ + + +function map(project, thisArg) { + return function mapOperation(source) { if (typeof project !== 'function') { throw new TypeError('argument is not a function. Are you looking for `mapTo()`?'); } @@ -25230,1041 +25225,1045 @@ var MapSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 232 */ +/* 227 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return identity; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function identity(x) { - return x; -} -//# sourceMappingURL=identity.js.map +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return bindNodeCallback; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(210); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(226); +/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(205); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(178); +/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */ -/***/ }), -/* 233 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return concatMap; }); -/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(230); -/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */ -function concatMap(project, resultSelector) { - return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(project, resultSelector, 1); + + +function bindNodeCallback(callbackFunc, resultSelector, scheduler) { + if (resultSelector) { + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(resultSelector)) { + scheduler = resultSelector; + } + else { + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return bindNodeCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_5__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); + }; + } + } + return function () { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + var params = { + subject: undefined, + args: args, + callbackFunc: callbackFunc, + scheduler: scheduler, + context: this, + }; + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var context = params.context; + var subject = params.subject; + if (!scheduler) { + if (!subject) { + subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"](); + var handler = function () { + var innerArgs = []; + for (var _i = 0; _i < arguments.length; _i++) { + innerArgs[_i] = arguments[_i]; + } + var err = innerArgs.shift(); + if (err) { + subject.error(err); + return; + } + subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs); + subject.complete(); + }; + try { + callbackFunc.apply(context, args.concat([handler])); + } + catch (err) { + if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) { + subject.error(err); + } + else { + console.warn(err); + } + } + } + return subject.subscribe(subscriber); + } + else { + return scheduler.schedule(dispatch, 0, { params: params, subscriber: subscriber, context: context }); + } + }); + }; } -//# sourceMappingURL=concatMap.js.map +function dispatch(state) { + var _this = this; + var params = state.params, subscriber = state.subscriber, context = state.context; + var callbackFunc = params.callbackFunc, args = params.args, scheduler = params.scheduler; + var subject = params.subject; + if (!subject) { + subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"](); + var handler = function () { + var innerArgs = []; + for (var _i = 0; _i < arguments.length; _i++) { + innerArgs[_i] = arguments[_i]; + } + var err = innerArgs.shift(); + if (err) { + _this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject })); + } + else { + var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs; + _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject })); + } + }; + try { + callbackFunc.apply(context, args.concat([handler])); + } + catch (err) { + this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject })); + } + } + this.add(subject.subscribe(subscriber)); +} +function dispatchNext(arg) { + var value = arg.value, subject = arg.subject; + subject.next(value); + subject.complete(); +} +function dispatchError(arg) { + var err = arg.err, subject = arg.subject; + subject.error(err); +} +//# sourceMappingURL=bindNodeCallback.js.map /***/ }), -/* 234 */ +/* 228 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return concatMapTo; }); -/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(233); -/** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestOperator", function() { return CombineLatestOperator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CombineLatestSubscriber", function() { return CombineLatestSubscriber; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(205); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(230); +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(206); +/** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */ -function concatMapTo(innerObservable, resultSelector) { - return Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__["concatMap"])(function () { return innerObservable; }, resultSelector); -} -//# sourceMappingURL=concatMapTo.js.map -/***/ }), -/* 235 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "count", function() { return count; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function count(predicate) { - return function (source) { return source.lift(new CountOperator(predicate, source)); }; +var NONE = {}; +function combineLatest() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; + } + var resultSelector = null; + var scheduler = null; + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(observables[observables.length - 1])) { + scheduler = observables.pop(); + } + if (typeof observables[observables.length - 1] === 'function') { + resultSelector = observables.pop(); + } + if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(observables[0])) { + observables = observables[0]; + } + return Object(_fromArray__WEBPACK_IMPORTED_MODULE_5__["fromArray"])(observables, scheduler).lift(new CombineLatestOperator(resultSelector)); } -var CountOperator = /*@__PURE__*/ (function () { - function CountOperator(predicate, source) { - this.predicate = predicate; - this.source = source; +var CombineLatestOperator = /*@__PURE__*/ (function () { + function CombineLatestOperator(resultSelector) { + this.resultSelector = resultSelector; } - CountOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new CountSubscriber(subscriber, this.predicate, this.source)); + CombineLatestOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new CombineLatestSubscriber(subscriber, this.resultSelector)); }; - return CountOperator; + return CombineLatestOperator; }()); -var CountSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountSubscriber, _super); - function CountSubscriber(destination, predicate, source) { + +var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CombineLatestSubscriber, _super); + function CombineLatestSubscriber(destination, resultSelector) { var _this = _super.call(this, destination) || this; - _this.predicate = predicate; - _this.source = source; - _this.count = 0; - _this.index = 0; + _this.resultSelector = resultSelector; + _this.active = 0; + _this.values = []; + _this.observables = []; return _this; } - CountSubscriber.prototype._next = function (value) { - if (this.predicate) { - this._tryPredicate(value); + CombineLatestSubscriber.prototype._next = function (observable) { + this.values.push(NONE); + this.observables.push(observable); + }; + CombineLatestSubscriber.prototype._complete = function () { + var observables = this.observables; + var len = observables.length; + if (len === 0) { + this.destination.complete(); } else { - this.count++; + this.active = len; + this.toRespond = len; + for (var i = 0; i < len; i++) { + var observable = observables[i]; + this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, observable, i)); + } } }; - CountSubscriber.prototype._tryPredicate = function (value) { + CombineLatestSubscriber.prototype.notifyComplete = function (unused) { + if ((this.active -= 1) === 0) { + this.destination.complete(); + } + }; + CombineLatestSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + var values = this.values; + var oldVal = values[outerIndex]; + var toRespond = !this.toRespond + ? 0 + : oldVal === NONE ? --this.toRespond : this.toRespond; + values[outerIndex] = innerValue; + if (toRespond === 0) { + if (this.resultSelector) { + this._tryResultSelector(values); + } + else { + this.destination.next(values.slice()); + } + } + }; + CombineLatestSubscriber.prototype._tryResultSelector = function (values) { var result; try { - result = this.predicate(value, this.index++, this.source); + result = this.resultSelector.apply(this, values); } catch (err) { this.destination.error(err); return; } - if (result) { - this.count++; - } + this.destination.next(result); }; - CountSubscriber.prototype._complete = function () { - this.destination.next(this.count); + return CombineLatestSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); + +//# sourceMappingURL=combineLatest.js.map + + +/***/ }), +/* 229 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "OuterSubscriber", function() { return OuterSubscriber; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ + + +var OuterSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OuterSubscriber, _super); + function OuterSubscriber() { + return _super !== null && _super.apply(this, arguments) || this; + } + OuterSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.destination.next(innerValue); + }; + OuterSubscriber.prototype.notifyError = function (error, innerSub) { + this.destination.error(error); + }; + OuterSubscriber.prototype.notifyComplete = function (innerSub) { this.destination.complete(); }; - return CountSubscriber; + return OuterSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=count.js.map + +//# sourceMappingURL=OuterSubscriber.js.map /***/ }), -/* 236 */ +/* 230 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return debounce; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToResult", function() { return subscribeToResult; }); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(231); +/* harmony import */ var _subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(170); +/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo,_Observable PURE_IMPORTS_END */ -function debounce(durationSelector) { - return function (source) { return source.lift(new DebounceOperator(durationSelector)); }; -} -var DebounceOperator = /*@__PURE__*/ (function () { - function DebounceOperator(durationSelector) { - this.durationSelector = durationSelector; +function subscribeToResult(outerSubscriber, result, outerValue, outerIndex, destination) { + if (destination === void 0) { + destination = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_0__["InnerSubscriber"](outerSubscriber, outerValue, outerIndex); } - DebounceOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new DebounceSubscriber(subscriber, this.durationSelector)); - }; - return DebounceOperator; -}()); -var DebounceSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceSubscriber, _super); - function DebounceSubscriber(destination, durationSelector) { - var _this = _super.call(this, destination) || this; - _this.durationSelector = durationSelector; - _this.hasValue = false; - _this.durationSubscription = null; - return _this; + if (destination.closed) { + return undefined; } - DebounceSubscriber.prototype._next = function (value) { - try { - var result = this.durationSelector.call(this, value); - if (result) { - this._tryNext(value, result); - } - } - catch (err) { - this.destination.error(err); - } - }; - DebounceSubscriber.prototype._complete = function () { - this.emitValue(); - this.destination.complete(); - }; - DebounceSubscriber.prototype._tryNext = function (value, duration) { - var subscription = this.durationSubscription; - this.value = value; - this.hasValue = true; - if (subscription) { - subscription.unsubscribe(); - this.remove(subscription); - } - subscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration); - if (subscription && !subscription.closed) { - this.add(this.durationSubscription = subscription); - } - }; - DebounceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.emitValue(); - }; - DebounceSubscriber.prototype.notifyComplete = function () { - this.emitValue(); - }; - DebounceSubscriber.prototype.emitValue = function () { - if (this.hasValue) { - var value = this.value; - var subscription = this.durationSubscription; - if (subscription) { - this.durationSubscription = null; - subscription.unsubscribe(); - this.remove(subscription); - } - this.value = null; - this.hasValue = false; - _super.prototype._next.call(this, value); - } - }; - return DebounceSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=debounce.js.map + if (result instanceof _Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"]) { + return result.subscribe(destination); + } + return Object(_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(result)(destination); +} +//# sourceMappingURL=subscribeToResult.js.map /***/ }), -/* 237 */ +/* 231 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return debounceTime; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "InnerSubscriber", function() { return InnerSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(199); -/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */ - +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function debounceTime(dueTime, scheduler) { - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"]; - } - return function (source) { return source.lift(new DebounceTimeOperator(dueTime, scheduler)); }; -} -var DebounceTimeOperator = /*@__PURE__*/ (function () { - function DebounceTimeOperator(dueTime, scheduler) { - this.dueTime = dueTime; - this.scheduler = scheduler; - } - DebounceTimeOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new DebounceTimeSubscriber(subscriber, this.dueTime, this.scheduler)); - }; - return DebounceTimeOperator; -}()); -var DebounceTimeSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceTimeSubscriber, _super); - function DebounceTimeSubscriber(destination, dueTime, scheduler) { - var _this = _super.call(this, destination) || this; - _this.dueTime = dueTime; - _this.scheduler = scheduler; - _this.debouncedSubscription = null; - _this.lastValue = null; - _this.hasValue = false; +var InnerSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerSubscriber, _super); + function InnerSubscriber(parent, outerValue, outerIndex) { + var _this = _super.call(this) || this; + _this.parent = parent; + _this.outerValue = outerValue; + _this.outerIndex = outerIndex; + _this.index = 0; return _this; } - DebounceTimeSubscriber.prototype._next = function (value) { - this.clearDebounce(); - this.lastValue = value; - this.hasValue = true; - this.add(this.debouncedSubscription = this.scheduler.schedule(dispatchNext, this.dueTime, this)); - }; - DebounceTimeSubscriber.prototype._complete = function () { - this.debouncedNext(); - this.destination.complete(); + InnerSubscriber.prototype._next = function (value) { + this.parent.notifyNext(this.outerValue, value, this.outerIndex, this.index++, this); }; - DebounceTimeSubscriber.prototype.debouncedNext = function () { - this.clearDebounce(); - if (this.hasValue) { - var lastValue = this.lastValue; - this.lastValue = null; - this.hasValue = false; - this.destination.next(lastValue); - } + InnerSubscriber.prototype._error = function (error) { + this.parent.notifyError(error, this); + this.unsubscribe(); }; - DebounceTimeSubscriber.prototype.clearDebounce = function () { - var debouncedSubscription = this.debouncedSubscription; - if (debouncedSubscription !== null) { - this.remove(debouncedSubscription); - debouncedSubscription.unsubscribe(); - this.debouncedSubscription = null; - } + InnerSubscriber.prototype._complete = function () { + this.parent.notifyComplete(this); + this.unsubscribe(); }; - return DebounceTimeSubscriber; + return InnerSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -function dispatchNext(subscriber) { - subscriber.debouncedNext(); -} -//# sourceMappingURL=debounceTime.js.map + +//# sourceMappingURL=InnerSubscriber.js.map /***/ }), -/* 238 */ +/* 232 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return defaultIfEmpty; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeTo", function() { return subscribeTo; }); +/* harmony import */ var _subscribeToArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(207); +/* harmony import */ var _subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(233); +/* harmony import */ var _subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(234); +/* harmony import */ var _subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(236); +/* harmony import */ var _isArrayLike__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(237); +/* harmony import */ var _isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(238); +/* harmony import */ var _isObject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(179); +/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(235); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(183); +/** PURE_IMPORTS_START _subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */ -function defaultIfEmpty(defaultValue) { - if (defaultValue === void 0) { - defaultValue = null; + + + + + + + +var subscribeTo = function (result) { + if (!!result && typeof result[_symbol_observable__WEBPACK_IMPORTED_MODULE_8__["observable"]] === 'function') { + return Object(_subscribeToObservable__WEBPACK_IMPORTED_MODULE_3__["subscribeToObservable"])(result); } - return function (source) { return source.lift(new DefaultIfEmptyOperator(defaultValue)); }; -} -var DefaultIfEmptyOperator = /*@__PURE__*/ (function () { - function DefaultIfEmptyOperator(defaultValue) { - this.defaultValue = defaultValue; + else if (Object(_isArrayLike__WEBPACK_IMPORTED_MODULE_4__["isArrayLike"])(result)) { + return Object(_subscribeToArray__WEBPACK_IMPORTED_MODULE_0__["subscribeToArray"])(result); } - DefaultIfEmptyOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new DefaultIfEmptySubscriber(subscriber, this.defaultValue)); - }; - return DefaultIfEmptyOperator; -}()); -var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DefaultIfEmptySubscriber, _super); - function DefaultIfEmptySubscriber(destination, defaultValue) { - var _this = _super.call(this, destination) || this; - _this.defaultValue = defaultValue; - _this.isEmpty = true; - return _this; + else if (Object(_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(result)) { + return Object(_subscribeToPromise__WEBPACK_IMPORTED_MODULE_1__["subscribeToPromise"])(result); } - DefaultIfEmptySubscriber.prototype._next = function (value) { - this.isEmpty = false; - this.destination.next(value); - }; - DefaultIfEmptySubscriber.prototype._complete = function () { - if (this.isEmpty) { - this.destination.next(this.defaultValue); - } - this.destination.complete(); - }; - return DefaultIfEmptySubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=defaultIfEmpty.js.map + else if (!!result && typeof result[_symbol_iterator__WEBPACK_IMPORTED_MODULE_7__["iterator"]] === 'function') { + return Object(_subscribeToIterable__WEBPACK_IMPORTED_MODULE_2__["subscribeToIterable"])(result); + } + else { + var value = Object(_isObject__WEBPACK_IMPORTED_MODULE_6__["isObject"])(result) ? 'an invalid object' : "'" + result + "'"; + var msg = "You provided " + value + " where a stream was expected." + + ' You can provide an Observable, Promise, Array, or Iterable.'; + throw new TypeError(msg); + } +}; +//# sourceMappingURL=subscribeTo.js.map /***/ }), -/* 239 */ +/* 233 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return delay; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199); -/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(240); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172); -/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(241); -/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToPromise", function() { return subscribeToPromise; }); +/* harmony import */ var _hostReportError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(176); +/** PURE_IMPORTS_START _hostReportError PURE_IMPORTS_END */ +var subscribeToPromise = function (promise) { + return function (subscriber) { + promise.then(function (value) { + if (!subscriber.closed) { + subscriber.next(value); + subscriber.complete(); + } + }, function (err) { return subscriber.error(err); }) + .then(null, _hostReportError__WEBPACK_IMPORTED_MODULE_0__["hostReportError"]); + return subscriber; + }; +}; +//# sourceMappingURL=subscribeToPromise.js.map +/***/ }), +/* 234 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToIterable", function() { return subscribeToIterable; }); +/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(235); +/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */ -function delay(delay, scheduler) { - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; - } - var absoluteDelay = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(delay); - var delayFor = absoluteDelay ? (+delay - scheduler.now()) : Math.abs(delay); - return function (source) { return source.lift(new DelayOperator(delayFor, scheduler)); }; -} -var DelayOperator = /*@__PURE__*/ (function () { - function DelayOperator(delay, scheduler) { - this.delay = delay; - this.scheduler = scheduler; - } - DelayOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new DelaySubscriber(subscriber, this.delay, this.scheduler)); - }; - return DelayOperator; -}()); -var DelaySubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelaySubscriber, _super); - function DelaySubscriber(destination, delay, scheduler) { - var _this = _super.call(this, destination) || this; - _this.delay = delay; - _this.scheduler = scheduler; - _this.queue = []; - _this.active = false; - _this.errored = false; - return _this; - } - DelaySubscriber.dispatch = function (state) { - var source = state.source; - var queue = source.queue; - var scheduler = state.scheduler; - var destination = state.destination; - while (queue.length > 0 && (queue[0].time - scheduler.now()) <= 0) { - queue.shift().notification.observe(destination); - } - if (queue.length > 0) { - var delay_1 = Math.max(0, queue[0].time - scheduler.now()); - this.schedule(state, delay_1); - } - else { - this.unsubscribe(); - source.active = false; - } - }; - DelaySubscriber.prototype._schedule = function (scheduler) { - this.active = true; - var destination = this.destination; - destination.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, { - source: this, destination: this.destination, scheduler: scheduler - })); - }; - DelaySubscriber.prototype.scheduleNotification = function (notification) { - if (this.errored === true) { - return; - } - var scheduler = this.scheduler; - var message = new DelayMessage(scheduler.now() + this.delay, notification); - this.queue.push(message); - if (this.active === false) { - this._schedule(scheduler); +var subscribeToIterable = function (iterable) { + return function (subscriber) { + var iterator = iterable[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]](); + do { + var item = iterator.next(); + if (item.done) { + subscriber.complete(); + break; + } + subscriber.next(item.value); + if (subscriber.closed) { + break; + } + } while (true); + if (typeof iterator.return === 'function') { + subscriber.add(function () { + if (iterator.return) { + iterator.return(); + } + }); } + return subscriber; }; - DelaySubscriber.prototype._next = function (value) { - this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createNext(value)); - }; - DelaySubscriber.prototype._error = function (err) { - this.errored = true; - this.queue = []; - this.destination.error(err); - this.unsubscribe(); - }; - DelaySubscriber.prototype._complete = function () { - this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createComplete()); - this.unsubscribe(); - }; - return DelaySubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"])); -var DelayMessage = /*@__PURE__*/ (function () { - function DelayMessage(time, notification) { - this.time = time; - this.notification = notification; - } - return DelayMessage; -}()); -//# sourceMappingURL=delay.js.map +}; +//# sourceMappingURL=subscribeToIterable.js.map /***/ }), -/* 240 */ +/* 235 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isDate", function() { return isDate; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSymbolIterator", function() { return getSymbolIterator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iterator", function() { return iterator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "$$iterator", function() { return $$iterator; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ -function isDate(value) { - return value instanceof Date && !isNaN(+value); +function getSymbolIterator() { + if (typeof Symbol !== 'function' || !Symbol.iterator) { + return '@@iterator'; + } + return Symbol.iterator; } -//# sourceMappingURL=isDate.js.map +var iterator = /*@__PURE__*/ getSymbolIterator(); +var $$iterator = iterator; +//# sourceMappingURL=iterator.js.map /***/ }), -/* 241 */ +/* 236 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return NotificationKind; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return Notification; }); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(242); -/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227); -/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(243); -/** PURE_IMPORTS_START _observable_empty,_observable_of,_observable_throwError PURE_IMPORTS_END */ - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeToObservable", function() { return subscribeToObservable; }); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(183); +/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */ -var NotificationKind; -/*@__PURE__*/ (function (NotificationKind) { - NotificationKind["NEXT"] = "N"; - NotificationKind["ERROR"] = "E"; - NotificationKind["COMPLETE"] = "C"; -})(NotificationKind || (NotificationKind = {})); -var Notification = /*@__PURE__*/ (function () { - function Notification(kind, value, error) { - this.kind = kind; - this.value = value; - this.error = error; - this.hasValue = kind === 'N'; - } - Notification.prototype.observe = function (observer) { - switch (this.kind) { - case 'N': - return observer.next && observer.next(this.value); - case 'E': - return observer.error && observer.error(this.error); - case 'C': - return observer.complete && observer.complete(); - } - }; - Notification.prototype.do = function (next, error, complete) { - var kind = this.kind; - switch (kind) { - case 'N': - return next && next(this.value); - case 'E': - return error && error(this.error); - case 'C': - return complete && complete(); - } - }; - Notification.prototype.accept = function (nextOrObserver, error, complete) { - if (nextOrObserver && typeof nextOrObserver.next === 'function') { - return this.observe(nextOrObserver); +var subscribeToObservable = function (obj) { + return function (subscriber) { + var obs = obj[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]](); + if (typeof obs.subscribe !== 'function') { + throw new TypeError('Provided object does not correctly implement Symbol.observable'); } else { - return this.do(nextOrObserver, error, complete); - } - }; - Notification.prototype.toObservable = function () { - var kind = this.kind; - switch (kind) { - case 'N': - return Object(_observable_of__WEBPACK_IMPORTED_MODULE_1__["of"])(this.value); - case 'E': - return Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_2__["throwError"])(this.error); - case 'C': - return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_0__["empty"])(); - } - throw new Error('unexpected notification kind value'); - }; - Notification.createNext = function (value) { - if (typeof value !== 'undefined') { - return new Notification('N', value); + return obs.subscribe(subscriber); } - return Notification.undefinedValueNotification; - }; - Notification.createError = function (err) { - return new Notification('E', undefined, err); - }; - Notification.createComplete = function () { - return Notification.completeNotification; }; - Notification.completeNotification = new Notification('C'); - Notification.undefinedValueNotification = new Notification('N', undefined); - return Notification; -}()); - -//# sourceMappingURL=Notification.js.map +}; +//# sourceMappingURL=subscribeToObservable.js.map /***/ }), -/* 242 */ +/* 237 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return EMPTY; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return empty; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isArrayLike", function() { return isArrayLike; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var isArrayLike = (function (x) { return x && typeof x.length === 'number' && typeof x !== 'function'; }); +//# sourceMappingURL=isArrayLike.js.map -var EMPTY = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.complete(); }); -function empty(scheduler) { - return scheduler ? emptyScheduled(scheduler) : EMPTY; -} -function emptyScheduled(scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); }); + +/***/ }), +/* 238 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPromise", function() { return isPromise; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function isPromise(value) { + return !!value && typeof value.subscribe !== 'function' && typeof value.then === 'function'; } -//# sourceMappingURL=empty.js.map +//# sourceMappingURL=isPromise.js.map /***/ }), -/* 243 */ +/* 239 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return throwError; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; }); +/* harmony import */ var _of__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(204); +/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(240); +/** PURE_IMPORTS_START _of,_operators_concatAll PURE_IMPORTS_END */ -function throwError(error, scheduler) { - if (!scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return subscriber.error(error); }); - } - else { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { return scheduler.schedule(dispatch, 0, { error: error, subscriber: subscriber }); }); + +function concat() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; } + return Object(_operators_concatAll__WEBPACK_IMPORTED_MODULE_1__["concatAll"])()(_of__WEBPACK_IMPORTED_MODULE_0__["of"].apply(void 0, observables)); } -function dispatch(_a) { - var error = _a.error, subscriber = _a.subscriber; - subscriber.error(error); -} -//# sourceMappingURL=throwError.js.map +//# sourceMappingURL=concat.js.map /***/ }), -/* 244 */ +/* 240 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return delayWhen; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return concatAll; }); +/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(241); +/** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */ + +function concatAll() { + return Object(_mergeAll__WEBPACK_IMPORTED_MODULE_0__["mergeAll"])(1); +} +//# sourceMappingURL=concatAll.js.map + + +/***/ }), +/* 241 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return mergeAll; }); +/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(242); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(220); +/** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */ + + +function mergeAll(concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; + } + return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"], concurrent); +} +//# sourceMappingURL=mergeAll.js.map + + +/***/ }), +/* 242 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return mergeMap; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapOperator", function() { return MergeMapOperator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeMapSubscriber", function() { return MergeMapSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(193); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(230); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(229); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(226); +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(243); +/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber,_map,_observable_from PURE_IMPORTS_END */ -function delayWhen(delayDurationSelector, subscriptionDelay) { - if (subscriptionDelay) { - return function (source) { - return new SubscriptionDelayObservable(source, subscriptionDelay) - .lift(new DelayWhenOperator(delayDurationSelector)); - }; + +function mergeMap(project, resultSelector, concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; } - return function (source) { return source.lift(new DelayWhenOperator(delayDurationSelector)); }; + if (typeof resultSelector === 'function') { + return function (source) { return source.pipe(mergeMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); }; + } + else if (typeof resultSelector === 'number') { + concurrent = resultSelector; + } + return function (source) { return source.lift(new MergeMapOperator(project, concurrent)); }; } -var DelayWhenOperator = /*@__PURE__*/ (function () { - function DelayWhenOperator(delayDurationSelector) { - this.delayDurationSelector = delayDurationSelector; +var MergeMapOperator = /*@__PURE__*/ (function () { + function MergeMapOperator(project, concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; + } + this.project = project; + this.concurrent = concurrent; } - DelayWhenOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new DelayWhenSubscriber(subscriber, this.delayDurationSelector)); + MergeMapOperator.prototype.call = function (observer, source) { + return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent)); }; - return DelayWhenOperator; + return MergeMapOperator; }()); -var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelayWhenSubscriber, _super); - function DelayWhenSubscriber(destination, delayDurationSelector) { + +var MergeMapSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeMapSubscriber, _super); + function MergeMapSubscriber(destination, project, concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; + } var _this = _super.call(this, destination) || this; - _this.delayDurationSelector = delayDurationSelector; - _this.completed = false; - _this.delayNotifierSubscriptions = []; + _this.project = project; + _this.concurrent = concurrent; + _this.hasCompleted = false; + _this.buffer = []; + _this.active = 0; _this.index = 0; return _this; } - DelayWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.destination.next(outerValue); - this.removeSubscription(innerSub); - this.tryComplete(); - }; - DelayWhenSubscriber.prototype.notifyError = function (error, innerSub) { - this._error(error); - }; - DelayWhenSubscriber.prototype.notifyComplete = function (innerSub) { - var value = this.removeSubscription(innerSub); - if (value) { - this.destination.next(value); + MergeMapSubscriber.prototype._next = function (value) { + if (this.active < this.concurrent) { + this._tryNext(value); + } + else { + this.buffer.push(value); } - this.tryComplete(); }; - DelayWhenSubscriber.prototype._next = function (value) { + MergeMapSubscriber.prototype._tryNext = function (value) { + var result; var index = this.index++; try { - var delayNotifier = this.delayDurationSelector(value, index); - if (delayNotifier) { - this.tryDelay(delayNotifier, value); - } + result = this.project(value, index); } catch (err) { this.destination.error(err); + return; } + this.active++; + this._innerSub(result, value, index); }; - DelayWhenSubscriber.prototype._complete = function () { - this.completed = true; - this.tryComplete(); - this.unsubscribe(); - }; - DelayWhenSubscriber.prototype.removeSubscription = function (subscription) { - subscription.unsubscribe(); - var subscriptionIdx = this.delayNotifierSubscriptions.indexOf(subscription); - if (subscriptionIdx !== -1) { - this.delayNotifierSubscriptions.splice(subscriptionIdx, 1); - } - return subscription.outerValue; - }; - DelayWhenSubscriber.prototype.tryDelay = function (delayNotifier, value) { - var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, delayNotifier, value); - if (notifierSubscription && !notifierSubscription.closed) { - var destination = this.destination; - destination.add(notifierSubscription); - this.delayNotifierSubscriptions.push(notifierSubscription); - } + MergeMapSubscriber.prototype._innerSub = function (ish, value, index) { + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__["InnerSubscriber"](this, undefined, undefined); + var destination = this.destination; + destination.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index, innerSubscriber); }; - DelayWhenSubscriber.prototype.tryComplete = function () { - if (this.completed && this.delayNotifierSubscriptions.length === 0) { + MergeMapSubscriber.prototype._complete = function () { + this.hasCompleted = true; + if (this.active === 0 && this.buffer.length === 0) { this.destination.complete(); } - }; - return DelayWhenSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); -var SubscriptionDelayObservable = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelayObservable, _super); - function SubscriptionDelayObservable(source, subscriptionDelay) { - var _this = _super.call(this) || this; - _this.source = source; - _this.subscriptionDelay = subscriptionDelay; - return _this; - } - SubscriptionDelayObservable.prototype._subscribe = function (subscriber) { - this.subscriptionDelay.subscribe(new SubscriptionDelaySubscriber(subscriber, this.source)); - }; - return SubscriptionDelayObservable; -}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"])); -var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelaySubscriber, _super); - function SubscriptionDelaySubscriber(parent, source) { - var _this = _super.call(this) || this; - _this.parent = parent; - _this.source = source; - _this.sourceSubscribed = false; - return _this; - } - SubscriptionDelaySubscriber.prototype._next = function (unused) { - this.subscribeToSource(); - }; - SubscriptionDelaySubscriber.prototype._error = function (err) { this.unsubscribe(); - this.parent.error(err); }; - SubscriptionDelaySubscriber.prototype._complete = function () { - this.unsubscribe(); - this.subscribeToSource(); + MergeMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.destination.next(innerValue); }; - SubscriptionDelaySubscriber.prototype.subscribeToSource = function () { - if (!this.sourceSubscribed) { - this.sourceSubscribed = true; - this.unsubscribe(); - this.source.subscribe(this.parent); + MergeMapSubscriber.prototype.notifyComplete = function (innerSub) { + var buffer = this.buffer; + this.remove(innerSub); + this.active--; + if (buffer.length > 0) { + this._next(buffer.shift()); + } + else if (this.active === 0 && this.hasCompleted) { + this.destination.complete(); } }; - return SubscriptionDelaySubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=delayWhen.js.map + return MergeMapSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); + +//# sourceMappingURL=mergeMap.js.map /***/ }), -/* 245 */ +/* 243 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return dematerialize; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return from; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232); +/* harmony import */ var _scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(244); +/** PURE_IMPORTS_START _Observable,_util_subscribeTo,_scheduled_scheduled PURE_IMPORTS_END */ -function dematerialize() { - return function dematerializeOperatorFunction(source) { - return source.lift(new DeMaterializeOperator()); - }; -} -var DeMaterializeOperator = /*@__PURE__*/ (function () { - function DeMaterializeOperator() { + +function from(input, scheduler) { + if (!scheduler) { + if (input instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) { + return input; + } + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(input)); } - DeMaterializeOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new DeMaterializeSubscriber(subscriber)); - }; - return DeMaterializeOperator; -}()); -var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DeMaterializeSubscriber, _super); - function DeMaterializeSubscriber(destination) { - return _super.call(this, destination) || this; + else { + return Object(_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_2__["scheduled"])(input, scheduler); } - DeMaterializeSubscriber.prototype._next = function (value) { - value.observe(this.destination); - }; - return DeMaterializeSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=dematerialize.js.map +} +//# sourceMappingURL=from.js.map /***/ }), -/* 246 */ +/* 244 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return distinct; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DistinctSubscriber", function() { return DistinctSubscriber; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return scheduled; }); +/* harmony import */ var _scheduleObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(245); +/* harmony import */ var _schedulePromise__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(246); +/* harmony import */ var _scheduleArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(208); +/* harmony import */ var _scheduleIterable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(247); +/* harmony import */ var _util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(248); +/* harmony import */ var _util_isPromise__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(238); +/* harmony import */ var _util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(237); +/* harmony import */ var _util_isIterable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(249); +/** PURE_IMPORTS_START _scheduleObservable,_schedulePromise,_scheduleArray,_scheduleIterable,_util_isInteropObservable,_util_isPromise,_util_isArrayLike,_util_isIterable PURE_IMPORTS_END */ -function distinct(keySelector, flushes) { - return function (source) { return source.lift(new DistinctOperator(keySelector, flushes)); }; -} -var DistinctOperator = /*@__PURE__*/ (function () { - function DistinctOperator(keySelector, flushes) { - this.keySelector = keySelector; - this.flushes = flushes; - } - DistinctOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new DistinctSubscriber(subscriber, this.keySelector, this.flushes)); - }; - return DistinctOperator; -}()); -var DistinctSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctSubscriber, _super); - function DistinctSubscriber(destination, keySelector, flushes) { - var _this = _super.call(this, destination) || this; - _this.keySelector = keySelector; - _this.values = new Set(); - if (flushes) { - _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, flushes)); - } - return _this; - } - DistinctSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.values.clear(); - }; - DistinctSubscriber.prototype.notifyError = function (error, innerSub) { - this._error(error); - }; - DistinctSubscriber.prototype._next = function (value) { - if (this.keySelector) { - this._useKeySelector(value); - } - else { - this._finalizeNext(value, value); + + + + + +function scheduled(input, scheduler) { + if (input != null) { + if (Object(_util_isInteropObservable__WEBPACK_IMPORTED_MODULE_4__["isInteropObservable"])(input)) { + return Object(_scheduleObservable__WEBPACK_IMPORTED_MODULE_0__["scheduleObservable"])(input, scheduler); } - }; - DistinctSubscriber.prototype._useKeySelector = function (value) { - var key; - var destination = this.destination; - try { - key = this.keySelector(value); + else if (Object(_util_isPromise__WEBPACK_IMPORTED_MODULE_5__["isPromise"])(input)) { + return Object(_schedulePromise__WEBPACK_IMPORTED_MODULE_1__["schedulePromise"])(input, scheduler); } - catch (err) { - destination.error(err); - return; + else if (Object(_util_isArrayLike__WEBPACK_IMPORTED_MODULE_6__["isArrayLike"])(input)) { + return Object(_scheduleArray__WEBPACK_IMPORTED_MODULE_2__["scheduleArray"])(input, scheduler); } - this._finalizeNext(key, value); - }; - DistinctSubscriber.prototype._finalizeNext = function (key, value) { - var values = this.values; - if (!values.has(key)) { - values.add(key); - this.destination.next(value); + else if (Object(_util_isIterable__WEBPACK_IMPORTED_MODULE_7__["isIterable"])(input) || typeof input === 'string') { + return Object(_scheduleIterable__WEBPACK_IMPORTED_MODULE_3__["scheduleIterable"])(input, scheduler); } - }; - return DistinctSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); - -//# sourceMappingURL=distinct.js.map + } + throw new TypeError((input !== null && typeof input || input) + ' is not observable'); +} +//# sourceMappingURL=scheduled.js.map /***/ }), -/* 247 */ +/* 245 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return distinctUntilChanged; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleObservable", function() { return scheduleObservable; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183); +/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable PURE_IMPORTS_END */ -function distinctUntilChanged(compare, keySelector) { - return function (source) { return source.lift(new DistinctUntilChangedOperator(compare, keySelector)); }; + +function scheduleObservable(input, scheduler) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + sub.add(scheduler.schedule(function () { + var observable = input[_symbol_observable__WEBPACK_IMPORTED_MODULE_2__["observable"]](); + sub.add(observable.subscribe({ + next: function (value) { sub.add(scheduler.schedule(function () { return subscriber.next(value); })); }, + error: function (err) { sub.add(scheduler.schedule(function () { return subscriber.error(err); })); }, + complete: function () { sub.add(scheduler.schedule(function () { return subscriber.complete(); })); }, + })); + })); + return sub; + }); } -var DistinctUntilChangedOperator = /*@__PURE__*/ (function () { - function DistinctUntilChangedOperator(compare, keySelector) { - this.compare = compare; - this.keySelector = keySelector; - } - DistinctUntilChangedOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new DistinctUntilChangedSubscriber(subscriber, this.compare, this.keySelector)); - }; - return DistinctUntilChangedOperator; -}()); -var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctUntilChangedSubscriber, _super); - function DistinctUntilChangedSubscriber(destination, compare, keySelector) { - var _this = _super.call(this, destination) || this; - _this.keySelector = keySelector; - _this.hasKey = false; - if (typeof compare === 'function') { - _this.compare = compare; - } - return _this; - } - DistinctUntilChangedSubscriber.prototype.compare = function (x, y) { - return x === y; - }; - DistinctUntilChangedSubscriber.prototype._next = function (value) { - var key; - try { - var keySelector = this.keySelector; - key = keySelector ? keySelector(value) : value; - } - catch (err) { - return this.destination.error(err); - } - var result = false; - if (this.hasKey) { - try { - var compare = this.compare; - result = compare(this.key, key); - } - catch (err) { - return this.destination.error(err); - } - } - else { - this.hasKey = true; - } - if (!result) { - this.key = key; - this.destination.next(value); - } - }; - return DistinctUntilChangedSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=distinctUntilChanged.js.map +//# sourceMappingURL=scheduleObservable.js.map /***/ }), -/* 248 */ +/* 246 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return distinctUntilKeyChanged; }); -/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(247); -/** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "schedulePromise", function() { return schedulePromise; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); +/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */ -function distinctUntilKeyChanged(key, compare) { - return Object(_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__["distinctUntilChanged"])(function (x, y) { return compare ? compare(x[key], y[key]) : x[key] === y[key]; }); + +function schedulePromise(input, scheduler) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + sub.add(scheduler.schedule(function () { + return input.then(function (value) { + sub.add(scheduler.schedule(function () { + subscriber.next(value); + sub.add(scheduler.schedule(function () { return subscriber.complete(); })); + })); + }, function (err) { + sub.add(scheduler.schedule(function () { return subscriber.error(err); })); + }); + })); + return sub; + }); } -//# sourceMappingURL=distinctUntilKeyChanged.js.map +//# sourceMappingURL=schedulePromise.js.map /***/ }), -/* 249 */ +/* 247 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return elementAt; }); -/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(250); -/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(251); -/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(252); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(238); -/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(254); -/** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */ - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scheduleIterable", function() { return scheduleIterable; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); +/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(235); +/** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator PURE_IMPORTS_END */ -function elementAt(index, defaultValue) { - if (index < 0) { - throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"](); +function scheduleIterable(input, scheduler) { + if (!input) { + throw new Error('Iterable cannot be null'); } - var hasDefaultValue = arguments.length >= 2; - return function (source) { - return source.pipe(Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return i === index; }), Object(_take__WEBPACK_IMPORTED_MODULE_4__["take"])(1), hasDefaultValue - ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue) - : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__["throwIfEmpty"])(function () { return new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"](); })); - }; + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var sub = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + var iterator; + sub.add(function () { + if (iterator && typeof iterator.return === 'function') { + iterator.return(); + } + }); + sub.add(scheduler.schedule(function () { + iterator = input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_2__["iterator"]](); + sub.add(scheduler.schedule(function () { + if (subscriber.closed) { + return; + } + var value; + var done; + try { + var result = iterator.next(); + value = result.value; + done = result.done; + } + catch (err) { + subscriber.error(err); + return; + } + if (done) { + subscriber.complete(); + } + else { + subscriber.next(value); + this.schedule(); + } + })); + })); + return sub; + }); } -//# sourceMappingURL=elementAt.js.map +//# sourceMappingURL=scheduleIterable.js.map /***/ }), -/* 250 */ +/* 248 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return ArgumentOutOfRangeError; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var ArgumentOutOfRangeErrorImpl = /*@__PURE__*/ (function () { - function ArgumentOutOfRangeErrorImpl() { - Error.call(this); - this.message = 'argument out of range'; - this.name = 'ArgumentOutOfRangeError'; - return this; - } - ArgumentOutOfRangeErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); - return ArgumentOutOfRangeErrorImpl; -})(); -var ArgumentOutOfRangeError = ArgumentOutOfRangeErrorImpl; -//# sourceMappingURL=ArgumentOutOfRangeError.js.map +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isInteropObservable", function() { return isInteropObservable; }); +/* harmony import */ var _symbol_observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(183); +/** PURE_IMPORTS_START _symbol_observable PURE_IMPORTS_END */ + +function isInteropObservable(input) { + return input && typeof input[_symbol_observable__WEBPACK_IMPORTED_MODULE_0__["observable"]] === 'function'; +} +//# sourceMappingURL=isInteropObservable.js.map /***/ }), -/* 251 */ +/* 249 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return filter; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isIterable", function() { return isIterable; }); +/* harmony import */ var _symbol_iterator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(235); +/** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */ -function filter(predicate, thisArg) { - return function filterOperatorFunction(source) { - return source.lift(new FilterOperator(predicate, thisArg)); - }; +function isIterable(input) { + return input && typeof input[_symbol_iterator__WEBPACK_IMPORTED_MODULE_0__["iterator"]] === 'function'; } -var FilterOperator = /*@__PURE__*/ (function () { - function FilterOperator(predicate, thisArg) { - this.predicate = predicate; - this.thisArg = thisArg; - } - FilterOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new FilterSubscriber(subscriber, this.predicate, this.thisArg)); - }; - return FilterOperator; -}()); -var FilterSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FilterSubscriber, _super); - function FilterSubscriber(destination, predicate, thisArg) { - var _this = _super.call(this, destination) || this; - _this.predicate = predicate; - _this.thisArg = thisArg; - _this.count = 0; - return _this; - } - FilterSubscriber.prototype._next = function (value) { - var result; +//# sourceMappingURL=isIterable.js.map + + +/***/ }), +/* 250 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return defer; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(243); +/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(203); +/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */ + + + +function defer(observableFactory) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var input; try { - result = this.predicate.call(this.thisArg, value, this.count++); + input = observableFactory(); } catch (err) { - this.destination.error(err); + subscriber.error(err); + return undefined; + } + var source = input ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(input) : Object(_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(); + return source.subscribe(subscriber); + }); +} +//# sourceMappingURL=defer.js.map + + +/***/ }), +/* 251 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return forkJoin; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(226); +/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(179); +/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(243); +/** PURE_IMPORTS_START _Observable,_util_isArray,_operators_map,_util_isObject,_from PURE_IMPORTS_END */ + + + + + +function forkJoin() { + var sources = []; + for (var _i = 0; _i < arguments.length; _i++) { + sources[_i] = arguments[_i]; + } + if (sources.length === 1) { + var first_1 = sources[0]; + if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(first_1)) { + return forkJoinInternal(first_1, null); + } + if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_3__["isObject"])(first_1) && Object.getPrototypeOf(first_1) === Object.prototype) { + var keys = Object.keys(first_1); + return forkJoinInternal(keys.map(function (key) { return first_1[key]; }), keys); + } + } + if (typeof sources[sources.length - 1] === 'function') { + var resultSelector_1 = sources.pop(); + sources = (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(sources[0])) ? sources[0] : sources; + return forkJoinInternal(sources, null).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return resultSelector_1.apply(void 0, args); })); + } + return forkJoinInternal(sources, null); +} +function forkJoinInternal(sources, keys) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var len = sources.length; + if (len === 0) { + subscriber.complete(); return; } - if (result) { - this.destination.next(value); + var values = new Array(len); + var completed = 0; + var emitted = 0; + var _loop_1 = function (i) { + var source = Object(_from__WEBPACK_IMPORTED_MODULE_4__["from"])(sources[i]); + var hasValue = false; + subscriber.add(source.subscribe({ + next: function (value) { + if (!hasValue) { + hasValue = true; + emitted++; + } + values[i] = value; + }, + error: function (err) { return subscriber.error(err); }, + complete: function () { + completed++; + if (completed === len || !hasValue) { + if (emitted === len) { + subscriber.next(keys ? + keys.reduce(function (result, key, i) { return (result[key] = values[i], result); }, {}) : + values); + } + subscriber.complete(); + } + } + })); + }; + for (var i = 0; i < len; i++) { + _loop_1(i); } - }; - return FilterSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=filter.js.map + }); +} +//# sourceMappingURL=forkJoin.js.map /***/ }), @@ -26273,64 +26272,74 @@ var FilterSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return throwIfEmpty; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(253); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_util_EmptyError,_Subscriber PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return fromEvent; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178); +/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(173); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(226); +/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */ -function throwIfEmpty(errorFactory) { - if (errorFactory === void 0) { - errorFactory = defaultErrorFactory; - } - return function (source) { - return source.lift(new ThrowIfEmptyOperator(errorFactory)); - }; -} -var ThrowIfEmptyOperator = /*@__PURE__*/ (function () { - function ThrowIfEmptyOperator(errorFactory) { - this.errorFactory = errorFactory; + +var toString = /*@__PURE__*/ (function () { return Object.prototype.toString; })(); +function fromEvent(target, eventName, options, resultSelector) { + if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(options)) { + resultSelector = options; + options = undefined; } - ThrowIfEmptyOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ThrowIfEmptySubscriber(subscriber, this.errorFactory)); - }; - return ThrowIfEmptyOperator; -}()); -var ThrowIfEmptySubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrowIfEmptySubscriber, _super); - function ThrowIfEmptySubscriber(destination, errorFactory) { - var _this = _super.call(this, destination) || this; - _this.errorFactory = errorFactory; - _this.hasValue = false; - return _this; + if (resultSelector) { + return fromEvent(target, eventName, options).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); } - ThrowIfEmptySubscriber.prototype._next = function (value) { - this.hasValue = true; - this.destination.next(value); - }; - ThrowIfEmptySubscriber.prototype._complete = function () { - if (!this.hasValue) { - var err = void 0; - try { - err = this.errorFactory(); + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + function handler(e) { + if (arguments.length > 1) { + subscriber.next(Array.prototype.slice.call(arguments)); } - catch (e) { - err = e; + else { + subscriber.next(e); } - this.destination.error(err); } - else { - return this.destination.complete(); + setupSubscription(target, eventName, handler, subscriber, options); + }); +} +function setupSubscription(sourceObj, eventName, handler, subscriber, options) { + var unsubscribe; + if (isEventTarget(sourceObj)) { + var source_1 = sourceObj; + sourceObj.addEventListener(eventName, handler, options); + unsubscribe = function () { return source_1.removeEventListener(eventName, handler, options); }; + } + else if (isJQueryStyleEventEmitter(sourceObj)) { + var source_2 = sourceObj; + sourceObj.on(eventName, handler); + unsubscribe = function () { return source_2.off(eventName, handler); }; + } + else if (isNodeStyleEventEmitter(sourceObj)) { + var source_3 = sourceObj; + sourceObj.addListener(eventName, handler); + unsubscribe = function () { return source_3.removeListener(eventName, handler); }; + } + else if (sourceObj && sourceObj.length) { + for (var i = 0, len = sourceObj.length; i < len; i++) { + setupSubscription(sourceObj[i], eventName, handler, subscriber, options); } - }; - return ThrowIfEmptySubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"])); -function defaultErrorFactory() { - return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__["EmptyError"](); + } + else { + throw new TypeError('Invalid event target'); + } + subscriber.add(unsubscribe); } -//# sourceMappingURL=throwIfEmpty.js.map +function isNodeStyleEventEmitter(sourceObj) { + return sourceObj && typeof sourceObj.addListener === 'function' && typeof sourceObj.removeListener === 'function'; +} +function isJQueryStyleEventEmitter(sourceObj) { + return sourceObj && typeof sourceObj.on === 'function' && typeof sourceObj.off === 'function'; +} +function isEventTarget(sourceObj) { + return sourceObj && typeof sourceObj.addEventListener === 'function' && typeof sourceObj.removeEventListener === 'function'; +} +//# sourceMappingURL=fromEvent.js.map /***/ }), @@ -26339,20 +26348,43 @@ function defaultErrorFactory() { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return EmptyError; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var EmptyErrorImpl = /*@__PURE__*/ (function () { - function EmptyErrorImpl() { - Error.call(this); - this.message = 'no elements in sequence'; - this.name = 'EmptyError'; - return this; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return fromEventPattern; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178); +/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(173); +/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(226); +/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */ + + + + +function fromEventPattern(addHandler, removeHandler, resultSelector) { + if (resultSelector) { + return fromEventPattern(addHandler, removeHandler).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); } - EmptyErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); - return EmptyErrorImpl; -})(); -var EmptyError = EmptyErrorImpl; -//# sourceMappingURL=EmptyError.js.map + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var handler = function () { + var e = []; + for (var _i = 0; _i < arguments.length; _i++) { + e[_i] = arguments[_i]; + } + return subscriber.next(e.length === 1 ? e[0] : e); + }; + var retValue; + try { + retValue = addHandler(handler); + } + catch (err) { + subscriber.error(err); + return undefined; + } + if (!Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(removeHandler)) { + return undefined; + } + return function () { return removeHandler(handler, retValue); }; + }); +} +//# sourceMappingURL=fromEventPattern.js.map /***/ }), @@ -26361,60 +26393,135 @@ var EmptyError = EmptyErrorImpl; "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "take", function() { return take; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(242); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return generate; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(220); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205); +/** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */ -function take(count) { - return function (source) { - if (count === 0) { - return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])(); - } - else { - return source.lift(new TakeOperator(count)); +function generate(initialStateOrOptions, condition, iterate, resultSelectorOrObservable, scheduler) { + var resultSelector; + var initialState; + if (arguments.length == 1) { + var options = initialStateOrOptions; + initialState = options.initialState; + condition = options.condition; + iterate = options.iterate; + resultSelector = options.resultSelector || _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]; + scheduler = options.scheduler; + } + else if (resultSelectorOrObservable === undefined || Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__["isScheduler"])(resultSelectorOrObservable)) { + initialState = initialStateOrOptions; + resultSelector = _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]; + scheduler = resultSelectorOrObservable; + } + else { + initialState = initialStateOrOptions; + resultSelector = resultSelectorOrObservable; + } + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var state = initialState; + if (scheduler) { + return scheduler.schedule(dispatch, 0, { + subscriber: subscriber, + iterate: iterate, + condition: condition, + resultSelector: resultSelector, + state: state + }); } - }; + do { + if (condition) { + var conditionResult = void 0; + try { + conditionResult = condition(state); + } + catch (err) { + subscriber.error(err); + return undefined; + } + if (!conditionResult) { + subscriber.complete(); + break; + } + } + var value = void 0; + try { + value = resultSelector(state); + } + catch (err) { + subscriber.error(err); + return undefined; + } + subscriber.next(value); + if (subscriber.closed) { + break; + } + try { + state = iterate(state); + } + catch (err) { + subscriber.error(err); + return undefined; + } + } while (true); + return undefined; + }); } -var TakeOperator = /*@__PURE__*/ (function () { - function TakeOperator(total) { - this.total = total; - if (this.total < 0) { - throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"]; +function dispatch(state) { + var subscriber = state.subscriber, condition = state.condition; + if (subscriber.closed) { + return undefined; + } + if (state.needIterate) { + try { + state.state = state.iterate(state.state); + } + catch (err) { + subscriber.error(err); + return undefined; } } - TakeOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new TakeSubscriber(subscriber, this.total)); - }; - return TakeOperator; -}()); -var TakeSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeSubscriber, _super); - function TakeSubscriber(destination, total) { - var _this = _super.call(this, destination) || this; - _this.total = total; - _this.count = 0; - return _this; + else { + state.needIterate = true; } - TakeSubscriber.prototype._next = function (value) { - var total = this.total; - var count = ++this.count; - if (count <= total) { - this.destination.next(value); - if (count === total) { - this.destination.complete(); - this.unsubscribe(); - } + if (condition) { + var conditionResult = void 0; + try { + conditionResult = condition(state.state); } - }; - return TakeSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=take.js.map + catch (err) { + subscriber.error(err); + return undefined; + } + if (!conditionResult) { + subscriber.complete(); + return undefined; + } + if (subscriber.closed) { + return undefined; + } + } + var value; + try { + value = state.resultSelector(state.state); + } + catch (err) { + subscriber.error(err); + return undefined; + } + if (subscriber.closed) { + return undefined; + } + subscriber.next(value); + if (subscriber.closed) { + return undefined; + } + return this.schedule(state); +} +//# sourceMappingURL=generate.js.map /***/ }), @@ -26423,20 +26530,22 @@ var TakeSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return endWith; }); -/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(226); -/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(227); -/** PURE_IMPORTS_START _observable_concat,_observable_of PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return iif; }); +/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(250); +/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(203); +/** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */ -function endWith() { - var array = []; - for (var _i = 0; _i < arguments.length; _i++) { - array[_i] = arguments[_i]; +function iif(condition, trueResult, falseResult) { + if (trueResult === void 0) { + trueResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"]; } - return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(source, _observable_of__WEBPACK_IMPORTED_MODULE_1__["of"].apply(void 0, array)); }; + if (falseResult === void 0) { + falseResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"]; + } + return Object(_defer__WEBPACK_IMPORTED_MODULE_0__["defer"])(function () { return condition() ? trueResult : falseResult; }); } -//# sourceMappingURL=endWith.js.map +//# sourceMappingURL=iif.js.map /***/ }), @@ -26445,60 +26554,38 @@ function endWith() { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "every", function() { return every; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return interval; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215); +/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(257); +/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */ -function every(predicate, thisArg) { - return function (source) { return source.lift(new EveryOperator(predicate, thisArg, source)); }; -} -var EveryOperator = /*@__PURE__*/ (function () { - function EveryOperator(predicate, thisArg, source) { - this.predicate = predicate; - this.thisArg = thisArg; - this.source = source; + +function interval(period, scheduler) { + if (period === void 0) { + period = 0; } - EveryOperator.prototype.call = function (observer, source) { - return source.subscribe(new EverySubscriber(observer, this.predicate, this.thisArg, this.source)); - }; - return EveryOperator; -}()); -var EverySubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](EverySubscriber, _super); - function EverySubscriber(destination, predicate, thisArg, source) { - var _this = _super.call(this, destination) || this; - _this.predicate = predicate; - _this.thisArg = thisArg; - _this.source = source; - _this.index = 0; - _this.thisArg = thisArg || _this; - return _this; + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; } - EverySubscriber.prototype.notifyComplete = function (everyValueMatch) { - this.destination.next(everyValueMatch); - this.destination.complete(); - }; - EverySubscriber.prototype._next = function (value) { - var result = false; - try { - result = this.predicate.call(this.thisArg, value, this.index++, this.source); - } - catch (err) { - this.destination.error(err); - return; - } - if (!result) { - this.notifyComplete(false); - } - }; - EverySubscriber.prototype._complete = function () { - this.notifyComplete(true); - }; - return EverySubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=every.js.map + if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(period) || period < 0) { + period = 0; + } + if (!scheduler || typeof scheduler.schedule !== 'function') { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; + } + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + subscriber.add(scheduler.schedule(dispatch, period, { subscriber: subscriber, counter: 0, period: period })); + return subscriber; + }); +} +function dispatch(state) { + var subscriber = state.subscriber, counter = state.counter, period = state.period; + subscriber.next(counter); + this.schedule({ subscriber: subscriber, counter: counter + 1, period: period }, period); +} +//# sourceMappingURL=interval.js.map /***/ }), @@ -26507,55 +26594,14 @@ var EverySubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return exhaust; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isNumeric", function() { return isNumeric; }); +/* harmony import */ var _isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(178); +/** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */ -function exhaust() { - return function (source) { return source.lift(new SwitchFirstOperator()); }; +function isNumeric(val) { + return !Object(_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(val) && (val - parseFloat(val) + 1) >= 0; } -var SwitchFirstOperator = /*@__PURE__*/ (function () { - function SwitchFirstOperator() { - } - SwitchFirstOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new SwitchFirstSubscriber(subscriber)); - }; - return SwitchFirstOperator; -}()); -var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchFirstSubscriber, _super); - function SwitchFirstSubscriber(destination) { - var _this = _super.call(this, destination) || this; - _this.hasCompleted = false; - _this.hasSubscription = false; - return _this; - } - SwitchFirstSubscriber.prototype._next = function (value) { - if (!this.hasSubscription) { - this.hasSubscription = true; - this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, value)); - } - }; - SwitchFirstSubscriber.prototype._complete = function () { - this.hasCompleted = true; - if (!this.hasSubscription) { - this.destination.complete(); - } - }; - SwitchFirstSubscriber.prototype.notifyComplete = function (innerSub) { - this.remove(innerSub); - this.hasSubscription = false; - if (this.hasCompleted) { - this.destination.complete(); - } - }; - return SwitchFirstSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=exhaust.js.map +//# sourceMappingURL=isNumeric.js.map /***/ }), @@ -26564,95 +26610,39 @@ var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return exhaustMap; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(218); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(205); +/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(241); +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(206); +/** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */ -function exhaustMap(project, resultSelector) { - if (resultSelector) { - return function (source) { return source.pipe(exhaustMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; +function merge() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; } - return function (source) { - return source.lift(new ExhaustMapOperator(project)); - }; -} -var ExhaustMapOperator = /*@__PURE__*/ (function () { - function ExhaustMapOperator(project) { - this.project = project; + var concurrent = Number.POSITIVE_INFINITY; + var scheduler = null; + var last = observables[observables.length - 1]; + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(last)) { + scheduler = observables.pop(); + if (observables.length > 1 && typeof observables[observables.length - 1] === 'number') { + concurrent = observables.pop(); + } } - ExhaustMapOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ExhaustMapSubscriber(subscriber, this.project)); - }; - return ExhaustMapOperator; -}()); -var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExhaustMapSubscriber, _super); - function ExhaustMapSubscriber(destination, project) { - var _this = _super.call(this, destination) || this; - _this.project = project; - _this.hasSubscription = false; - _this.hasCompleted = false; - _this.index = 0; - return _this; + else if (typeof last === 'number') { + concurrent = observables.pop(); } - ExhaustMapSubscriber.prototype._next = function (value) { - if (!this.hasSubscription) { - this.tryNext(value); - } - }; - ExhaustMapSubscriber.prototype.tryNext = function (value) { - var result; - var index = this.index++; - try { - result = this.project(value, index); - } - catch (err) { - this.destination.error(err); - return; - } - this.hasSubscription = true; - this._innerSub(result, value, index); - }; - ExhaustMapSubscriber.prototype._innerSub = function (result, value, index) { - var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined); - var destination = this.destination; - destination.add(innerSubscriber); - Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, value, index, innerSubscriber); - }; - ExhaustMapSubscriber.prototype._complete = function () { - this.hasCompleted = true; - if (!this.hasSubscription) { - this.destination.complete(); - } - this.unsubscribe(); - }; - ExhaustMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.destination.next(innerValue); - }; - ExhaustMapSubscriber.prototype.notifyError = function (err) { - this.destination.error(err); - }; - ExhaustMapSubscriber.prototype.notifyComplete = function (innerSub) { - var destination = this.destination; - destination.remove(innerSub); - this.hasSubscription = false; - if (this.hasCompleted) { - this.destination.complete(); - } - }; - return ExhaustMapSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=exhaustMap.js.map + if (scheduler === null && observables.length === 1 && observables[0] instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) { + return observables[0]; + } + return Object(_operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__["mergeAll"])(concurrent)(Object(_fromArray__WEBPACK_IMPORTED_MODULE_3__["fromArray"])(observables, scheduler)); +} +//# sourceMappingURL=merge.js.map /***/ }), @@ -26661,117 +26651,18 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return expand; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandOperator", function() { return ExpandOperator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandSubscriber", function() { return ExpandSubscriber; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return NEVER; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "never", function() { return never; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(185); +/** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */ -function expand(project, concurrent, scheduler) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; - } - if (scheduler === void 0) { - scheduler = undefined; - } - concurrent = (concurrent || 0) < 1 ? Number.POSITIVE_INFINITY : concurrent; - return function (source) { return source.lift(new ExpandOperator(project, concurrent, scheduler)); }; +var NEVER = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](_util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"]); +function never() { + return NEVER; } -var ExpandOperator = /*@__PURE__*/ (function () { - function ExpandOperator(project, concurrent, scheduler) { - this.project = project; - this.concurrent = concurrent; - this.scheduler = scheduler; - } - ExpandOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ExpandSubscriber(subscriber, this.project, this.concurrent, this.scheduler)); - }; - return ExpandOperator; -}()); - -var ExpandSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExpandSubscriber, _super); - function ExpandSubscriber(destination, project, concurrent, scheduler) { - var _this = _super.call(this, destination) || this; - _this.project = project; - _this.concurrent = concurrent; - _this.scheduler = scheduler; - _this.index = 0; - _this.active = 0; - _this.hasCompleted = false; - if (concurrent < Number.POSITIVE_INFINITY) { - _this.buffer = []; - } - return _this; - } - ExpandSubscriber.dispatch = function (arg) { - var subscriber = arg.subscriber, result = arg.result, value = arg.value, index = arg.index; - subscriber.subscribeToProjection(result, value, index); - }; - ExpandSubscriber.prototype._next = function (value) { - var destination = this.destination; - if (destination.closed) { - this._complete(); - return; - } - var index = this.index++; - if (this.active < this.concurrent) { - destination.next(value); - try { - var project = this.project; - var result = project(value, index); - if (!this.scheduler) { - this.subscribeToProjection(result, value, index); - } - else { - var state = { subscriber: this, result: result, value: value, index: index }; - var destination_1 = this.destination; - destination_1.add(this.scheduler.schedule(ExpandSubscriber.dispatch, 0, state)); - } - } - catch (e) { - destination.error(e); - } - } - else { - this.buffer.push(value); - } - }; - ExpandSubscriber.prototype.subscribeToProjection = function (result, value, index) { - this.active++; - var destination = this.destination; - destination.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result, value, index)); - }; - ExpandSubscriber.prototype._complete = function () { - this.hasCompleted = true; - if (this.hasCompleted && this.active === 0) { - this.destination.complete(); - } - this.unsubscribe(); - }; - ExpandSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this._next(innerValue); - }; - ExpandSubscriber.prototype.notifyComplete = function (innerSub) { - var buffer = this.buffer; - var destination = this.destination; - destination.remove(innerSub); - this.active--; - if (buffer && buffer.length > 0) { - this._next(buffer.shift()); - } - if (this.hasCompleted && this.active === 0) { - this.destination.complete(); - } - }; - return ExpandSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); - -//# sourceMappingURL=expand.js.map +//# sourceMappingURL=never.js.map /***/ }), @@ -26780,36 +26671,38 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return finalize; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177); -/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(243); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178); +/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(203); +/** PURE_IMPORTS_START _Observable,_from,_util_isArray,_empty PURE_IMPORTS_END */ -function finalize(callback) { - return function (source) { return source.lift(new FinallyOperator(callback)); }; -} -var FinallyOperator = /*@__PURE__*/ (function () { - function FinallyOperator(callback) { - this.callback = callback; + +function onErrorResumeNext() { + var sources = []; + for (var _i = 0; _i < arguments.length; _i++) { + sources[_i] = arguments[_i]; } - FinallyOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new FinallySubscriber(subscriber, this.callback)); - }; - return FinallyOperator; -}()); -var FinallySubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FinallySubscriber, _super); - function FinallySubscriber(destination, callback) { - var _this = _super.call(this, destination) || this; - _this.add(new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](callback)); - return _this; + if (sources.length === 0) { + return _empty__WEBPACK_IMPORTED_MODULE_3__["EMPTY"]; } - return FinallySubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=finalize.js.map + var first = sources[0], remainder = sources.slice(1); + if (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(first)) { + return onErrorResumeNext.apply(void 0, first); + } + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var subNext = function () { return subscriber.add(onErrorResumeNext.apply(void 0, remainder).subscribe(subscriber)); }; + return Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(first).subscribe({ + next: function (value) { subscriber.next(value); }, + error: subNext, + complete: subNext, + }); + }); +} +//# sourceMappingURL=onErrorResumeNext.js.map /***/ }), @@ -26818,70 +26711,49 @@ var FinallySubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "find", function() { return find; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FindValueOperator", function() { return FindValueOperator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FindValueSubscriber", function() { return FindValueSubscriber; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return pairs; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dispatch", function() { return dispatch; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); +/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */ -function find(predicate, thisArg) { - if (typeof predicate !== 'function') { - throw new TypeError('predicate is not a function'); - } - return function (source) { return source.lift(new FindValueOperator(predicate, source, false, thisArg)); }; -} -var FindValueOperator = /*@__PURE__*/ (function () { - function FindValueOperator(predicate, source, yieldIndex, thisArg) { - this.predicate = predicate; - this.source = source; - this.yieldIndex = yieldIndex; - this.thisArg = thisArg; +function pairs(obj, scheduler) { + if (!scheduler) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var keys = Object.keys(obj); + for (var i = 0; i < keys.length && !subscriber.closed; i++) { + var key = keys[i]; + if (obj.hasOwnProperty(key)) { + subscriber.next([key, obj[key]]); + } + } + subscriber.complete(); + }); } - FindValueOperator.prototype.call = function (observer, source) { - return source.subscribe(new FindValueSubscriber(observer, this.predicate, this.source, this.yieldIndex, this.thisArg)); - }; - return FindValueOperator; -}()); - -var FindValueSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FindValueSubscriber, _super); - function FindValueSubscriber(destination, predicate, source, yieldIndex, thisArg) { - var _this = _super.call(this, destination) || this; - _this.predicate = predicate; - _this.source = source; - _this.yieldIndex = yieldIndex; - _this.thisArg = thisArg; - _this.index = 0; - return _this; + else { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var keys = Object.keys(obj); + var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + subscription.add(scheduler.schedule(dispatch, 0, { keys: keys, index: 0, subscriber: subscriber, subscription: subscription, obj: obj })); + return subscription; + }); } - FindValueSubscriber.prototype.notifyComplete = function (value) { - var destination = this.destination; - destination.next(value); - destination.complete(); - this.unsubscribe(); - }; - FindValueSubscriber.prototype._next = function (value) { - var _a = this, predicate = _a.predicate, thisArg = _a.thisArg; - var index = this.index++; - try { - var result = predicate.call(thisArg || this, value, index, this.source); - if (result) { - this.notifyComplete(this.yieldIndex ? index : value); - } +} +function dispatch(state) { + var keys = state.keys, index = state.index, subscriber = state.subscriber, subscription = state.subscription, obj = state.obj; + if (!subscriber.closed) { + if (index < keys.length) { + var key = keys[index]; + subscriber.next([key, obj[key]]); + subscription.add(this.schedule({ keys: keys, index: index + 1, subscriber: subscriber, subscription: subscription, obj: obj })); } - catch (err) { - this.destination.error(err); + else { + subscriber.complete(); } - }; - FindValueSubscriber.prototype._complete = function () { - this.notifyComplete(this.yieldIndex ? -1 : undefined); - }; - return FindValueSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); - -//# sourceMappingURL=find.js.map + } +} +//# sourceMappingURL=pairs.js.map /***/ }), @@ -26890,14 +26762,23 @@ var FindValueSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return findIndex; }); -/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(261); -/** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; }); +/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(263); +/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232); +/* harmony import */ var _operators_filter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(264); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(170); +/** PURE_IMPORTS_START _util_not,_util_subscribeTo,_operators_filter,_Observable PURE_IMPORTS_END */ -function findIndex(predicate, thisArg) { - return function (source) { return source.lift(new _operators_find__WEBPACK_IMPORTED_MODULE_0__["FindValueOperator"](predicate, source, true, thisArg)); }; + + + +function partition(source, predicate, thisArg) { + return [ + Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(predicate, thisArg)(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source))), + Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source))) + ]; } -//# sourceMappingURL=findIndex.js.map +//# sourceMappingURL=partition.js.map /***/ }), @@ -26906,25 +26787,17 @@ function findIndex(predicate, thisArg) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "first", function() { return first; }); -/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(253); -/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(251); -/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(254); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(238); -/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(252); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(232); -/** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */ - - - - - - -function first(predicate, defaultValue) { - var hasDefaultValue = arguments.length >= 2; - return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_take__WEBPACK_IMPORTED_MODULE_2__["take"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); }; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "not", function() { return not; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function not(pred, thisArg) { + function notPred() { + return !(notPred.pred.apply(notPred.thisArg, arguments)); + } + notPred.pred = pred; + notPred.thisArg = thisArg; + return notPred; } -//# sourceMappingURL=first.js.map +//# sourceMappingURL=not.js.map /***/ }), @@ -26933,195 +26806,52 @@ function first(predicate, defaultValue) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return groupBy; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return GroupedObservable; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return filter; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(193); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(265); -/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription,_Observable,_Subject PURE_IMPORTS_END */ - - - +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function groupBy(keySelector, elementSelector, durationSelector, subjectSelector) { - return function (source) { - return source.lift(new GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector)); +function filter(predicate, thisArg) { + return function filterOperatorFunction(source) { + return source.lift(new FilterOperator(predicate, thisArg)); }; } -var GroupByOperator = /*@__PURE__*/ (function () { - function GroupByOperator(keySelector, elementSelector, durationSelector, subjectSelector) { - this.keySelector = keySelector; - this.elementSelector = elementSelector; - this.durationSelector = durationSelector; - this.subjectSelector = subjectSelector; +var FilterOperator = /*@__PURE__*/ (function () { + function FilterOperator(predicate, thisArg) { + this.predicate = predicate; + this.thisArg = thisArg; } - GroupByOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new GroupBySubscriber(subscriber, this.keySelector, this.elementSelector, this.durationSelector, this.subjectSelector)); + FilterOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new FilterSubscriber(subscriber, this.predicate, this.thisArg)); }; - return GroupByOperator; + return FilterOperator; }()); -var GroupBySubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupBySubscriber, _super); - function GroupBySubscriber(destination, keySelector, elementSelector, durationSelector, subjectSelector) { +var FilterSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FilterSubscriber, _super); + function FilterSubscriber(destination, predicate, thisArg) { var _this = _super.call(this, destination) || this; - _this.keySelector = keySelector; - _this.elementSelector = elementSelector; - _this.durationSelector = durationSelector; - _this.subjectSelector = subjectSelector; - _this.groups = null; - _this.attemptedToUnsubscribe = false; + _this.predicate = predicate; + _this.thisArg = thisArg; _this.count = 0; return _this; } - GroupBySubscriber.prototype._next = function (value) { - var key; + FilterSubscriber.prototype._next = function (value) { + var result; try { - key = this.keySelector(value); + result = this.predicate.call(this.thisArg, value, this.count++); } catch (err) { - this.error(err); + this.destination.error(err); return; } - this._group(value, key); - }; - GroupBySubscriber.prototype._group = function (value, key) { - var groups = this.groups; - if (!groups) { - groups = this.groups = new Map(); - } - var group = groups.get(key); - var element; - if (this.elementSelector) { - try { - element = this.elementSelector(value); - } - catch (err) { - this.error(err); - } - } - else { - element = value; - } - if (!group) { - group = (this.subjectSelector ? this.subjectSelector() : new _Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]()); - groups.set(key, group); - var groupedObservable = new GroupedObservable(key, group, this); - this.destination.next(groupedObservable); - if (this.durationSelector) { - var duration = void 0; - try { - duration = this.durationSelector(new GroupedObservable(key, group)); - } - catch (err) { - this.error(err); - return; - } - this.add(duration.subscribe(new GroupDurationSubscriber(key, group, this))); - } - } - if (!group.closed) { - group.next(element); - } - }; - GroupBySubscriber.prototype._error = function (err) { - var groups = this.groups; - if (groups) { - groups.forEach(function (group, key) { - group.error(err); - }); - groups.clear(); - } - this.destination.error(err); - }; - GroupBySubscriber.prototype._complete = function () { - var groups = this.groups; - if (groups) { - groups.forEach(function (group, key) { - group.complete(); - }); - groups.clear(); - } - this.destination.complete(); - }; - GroupBySubscriber.prototype.removeGroup = function (key) { - this.groups.delete(key); - }; - GroupBySubscriber.prototype.unsubscribe = function () { - if (!this.closed) { - this.attemptedToUnsubscribe = true; - if (this.count === 0) { - _super.prototype.unsubscribe.call(this); - } - } - }; - return GroupBySubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -var GroupDurationSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupDurationSubscriber, _super); - function GroupDurationSubscriber(key, group, parent) { - var _this = _super.call(this, group) || this; - _this.key = key; - _this.group = group; - _this.parent = parent; - return _this; - } - GroupDurationSubscriber.prototype._next = function (value) { - this.complete(); - }; - GroupDurationSubscriber.prototype._unsubscribe = function () { - var _a = this, parent = _a.parent, key = _a.key; - this.key = this.parent = null; - if (parent) { - parent.removeGroup(key); + if (result) { + this.destination.next(value); } }; - return GroupDurationSubscriber; + return FilterSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -var GroupedObservable = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](GroupedObservable, _super); - function GroupedObservable(key, groupSubject, refCountSubscription) { - var _this = _super.call(this) || this; - _this.key = key; - _this.groupSubject = groupSubject; - _this.refCountSubscription = refCountSubscription; - return _this; - } - GroupedObservable.prototype._subscribe = function (subscriber) { - var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](); - var _a = this, refCountSubscription = _a.refCountSubscription, groupSubject = _a.groupSubject; - if (refCountSubscription && !refCountSubscription.closed) { - subscription.add(new InnerRefCountSubscription(refCountSubscription)); - } - subscription.add(groupSubject.subscribe(subscriber)); - return subscription; - }; - return GroupedObservable; -}(_Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"])); - -var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](InnerRefCountSubscription, _super); - function InnerRefCountSubscription(parent) { - var _this = _super.call(this) || this; - _this.parent = parent; - parent.count++; - return _this; - } - InnerRefCountSubscription.prototype.unsubscribe = function () { - var parent = this.parent; - if (!parent.closed && !this.closed) { - _super.prototype.unsubscribe.call(this); - parent.count -= 1; - if (parent.count === 0 && parent.attemptedToUnsubscribe) { - parent.unsubscribe(); - } - } - }; - return InnerRefCountSubscription; -}(_Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"])); -//# sourceMappingURL=groupBy.js.map +//# sourceMappingURL=filter.js.map /***/ }), @@ -27130,174 +26860,92 @@ var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscriber", function() { return SubjectSubscriber; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return Subject; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnonymousSubject", function() { return AnonymousSubject; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RaceOperator", function() { return RaceOperator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RaceSubscriber", function() { return RaceSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(193); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(177); -/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(266); -/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(267); -/* harmony import */ var _internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(181); -/** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */ - - - +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178); +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(206); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_util_isArray,_fromArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -var SubjectSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscriber, _super); - function SubjectSubscriber(destination) { - var _this = _super.call(this, destination) || this; - _this.destination = destination; - return _this; - } - return SubjectSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"])); -var Subject = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](Subject, _super); - function Subject() { - var _this = _super.call(this) || this; - _this.observers = []; - _this.closed = false; - _this.isStopped = false; - _this.hasError = false; - _this.thrownError = null; - return _this; +function race() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; } - Subject.prototype[_internal_symbol_rxSubscriber__WEBPACK_IMPORTED_MODULE_6__["rxSubscriber"]] = function () { - return new SubjectSubscriber(this); - }; - Subject.prototype.lift = function (operator) { - var subject = new AnonymousSubject(this, this); - subject.operator = operator; - return subject; - }; - Subject.prototype.next = function (value) { - if (this.closed) { - throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); - } - if (!this.isStopped) { - var observers = this.observers; - var len = observers.length; - var copy = observers.slice(); - for (var i = 0; i < len; i++) { - copy[i].next(value); - } - } - }; - Subject.prototype.error = function (err) { - if (this.closed) { - throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); - } - this.hasError = true; - this.thrownError = err; - this.isStopped = true; - var observers = this.observers; - var len = observers.length; - var copy = observers.slice(); - for (var i = 0; i < len; i++) { - copy[i].error(err); - } - this.observers.length = 0; - }; - Subject.prototype.complete = function () { - if (this.closed) { - throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); - } - this.isStopped = true; - var observers = this.observers; - var len = observers.length; - var copy = observers.slice(); - for (var i = 0; i < len; i++) { - copy[i].complete(); - } - this.observers.length = 0; - }; - Subject.prototype.unsubscribe = function () { - this.isStopped = true; - this.closed = true; - this.observers = null; - }; - Subject.prototype._trySubscribe = function (subscriber) { - if (this.closed) { - throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); - } - else { - return _super.prototype._trySubscribe.call(this, subscriber); - } - }; - Subject.prototype._subscribe = function (subscriber) { - if (this.closed) { - throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_4__["ObjectUnsubscribedError"](); - } - else if (this.hasError) { - subscriber.error(this.thrownError); - return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY; - } - else if (this.isStopped) { - subscriber.complete(); - return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY; + if (observables.length === 1) { + if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(observables[0])) { + observables = observables[0]; } else { - this.observers.push(subscriber); - return new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_5__["SubjectSubscription"](this, subscriber); + return observables[0]; } + } + return Object(_fromArray__WEBPACK_IMPORTED_MODULE_2__["fromArray"])(observables, undefined).lift(new RaceOperator()); +} +var RaceOperator = /*@__PURE__*/ (function () { + function RaceOperator() { + } + RaceOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new RaceSubscriber(subscriber)); }; - Subject.prototype.asObservable = function () { - var observable = new _Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"](); - observable.source = this; - return observable; - }; - Subject.create = function (destination, source) { - return new AnonymousSubject(destination, source); - }; - return Subject; -}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"])); + return RaceOperator; +}()); -var AnonymousSubject = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnonymousSubject, _super); - function AnonymousSubject(destination, source) { - var _this = _super.call(this) || this; - _this.destination = destination; - _this.source = source; +var RaceSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RaceSubscriber, _super); + function RaceSubscriber(destination) { + var _this = _super.call(this, destination) || this; + _this.hasFirst = false; + _this.observables = []; + _this.subscriptions = []; return _this; } - AnonymousSubject.prototype.next = function (value) { - var destination = this.destination; - if (destination && destination.next) { - destination.next(value); - } - }; - AnonymousSubject.prototype.error = function (err) { - var destination = this.destination; - if (destination && destination.error) { - this.destination.error(err); - } + RaceSubscriber.prototype._next = function (observable) { + this.observables.push(observable); }; - AnonymousSubject.prototype.complete = function () { - var destination = this.destination; - if (destination && destination.complete) { + RaceSubscriber.prototype._complete = function () { + var observables = this.observables; + var len = observables.length; + if (len === 0) { this.destination.complete(); } - }; - AnonymousSubject.prototype._subscribe = function (subscriber) { - var source = this.source; - if (source) { - return this.source.subscribe(subscriber); - } else { - return _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY; + for (var i = 0; i < len && !this.hasFirst; i++) { + var observable = observables[i]; + var subscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, observable, i); + if (this.subscriptions) { + this.subscriptions.push(subscription); + } + this.add(subscription); + } + this.observables = null; } }; - return AnonymousSubject; -}(Subject)); + RaceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + if (!this.hasFirst) { + this.hasFirst = true; + for (var i = 0; i < this.subscriptions.length; i++) { + if (i !== outerIndex) { + var subscription = this.subscriptions[i]; + subscription.unsubscribe(); + this.remove(subscription); + } + } + this.subscriptions = null; + } + this.destination.next(innerValue); + }; + return RaceSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); -//# sourceMappingURL=Subject.js.map +//# sourceMappingURL=race.js.map /***/ }), @@ -27306,20 +26954,57 @@ var AnonymousSubject = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return ObjectUnsubscribedError; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var ObjectUnsubscribedErrorImpl = /*@__PURE__*/ (function () { - function ObjectUnsubscribedErrorImpl() { - Error.call(this); - this.message = 'object unsubscribed'; - this.name = 'ObjectUnsubscribedError'; - return this; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "range", function() { return range; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dispatch", function() { return dispatch; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ + +function range(start, count, scheduler) { + if (start === void 0) { + start = 0; } - ObjectUnsubscribedErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); - return ObjectUnsubscribedErrorImpl; -})(); -var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl; -//# sourceMappingURL=ObjectUnsubscribedError.js.map + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + if (count === undefined) { + count = start; + start = 0; + } + var index = 0; + var current = start; + if (scheduler) { + return scheduler.schedule(dispatch, 0, { + index: index, count: count, start: start, subscriber: subscriber + }); + } + else { + do { + if (index++ >= count) { + subscriber.complete(); + break; + } + subscriber.next(current++); + if (subscriber.closed) { + break; + } + } while (true); + } + return undefined; + }); +} +function dispatch(state) { + var start = state.start, index = state.index, count = state.count, subscriber = state.subscriber; + if (index >= count) { + subscriber.complete(); + return; + } + subscriber.next(start); + if (subscriber.closed) { + return; + } + state.index = index + 1; + state.start = start + 1; + this.schedule(state); +} +//# sourceMappingURL=range.js.map /***/ }), @@ -27328,41 +27013,52 @@ var ObjectUnsubscribedError = ObjectUnsubscribedErrorImpl; "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubjectSubscription", function() { return SubjectSubscription; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); -/** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return timer; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215); +/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(257); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(205); +/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */ -var SubjectSubscription = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubjectSubscription, _super); - function SubjectSubscription(subject, subscriber) { - var _this = _super.call(this) || this; - _this.subject = subject; - _this.subscriber = subscriber; - _this.closed = false; - return _this; - } - SubjectSubscription.prototype.unsubscribe = function () { - if (this.closed) { - return; - } - this.closed = true; - var subject = this.subject; - var observers = subject.observers; - this.subject = null; - if (!observers || observers.length === 0 || subject.isStopped || subject.closed) { - return; - } - var subscriberIndex = observers.indexOf(this.subscriber); - if (subscriberIndex !== -1) { - observers.splice(subscriberIndex, 1); - } - }; - return SubjectSubscription; -}(_Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"])); -//# sourceMappingURL=SubjectSubscription.js.map + +function timer(dueTime, periodOrScheduler, scheduler) { + if (dueTime === void 0) { + dueTime = 0; + } + var period = -1; + if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(periodOrScheduler)) { + period = Number(periodOrScheduler) < 1 && 1 || Number(periodOrScheduler); + } + else if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(periodOrScheduler)) { + scheduler = periodOrScheduler; + } + if (!Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(scheduler)) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; + } + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var due = Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(dueTime) + ? dueTime + : (+dueTime - scheduler.now()); + return scheduler.schedule(dispatch, due, { + index: 0, period: period, subscriber: subscriber + }); + }); +} +function dispatch(state) { + var index = state.index, period = state.period, subscriber = state.subscriber; + subscriber.next(index); + if (subscriber.closed) { + return; + } + else if (period === -1) { + return subscriber.complete(); + } + state.index = index + 1; + this.schedule(state, period); +} +//# sourceMappingURL=timer.js.map /***/ }), @@ -27371,35 +27067,43 @@ var SubjectSubscription = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return ignoreElements; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "using", function() { return using; }); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(170); +/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(243); +/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(203); +/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */ -function ignoreElements() { - return function ignoreElementsOperatorFunction(source) { - return source.lift(new IgnoreElementsOperator()); - }; + +function using(resourceFactory, observableFactory) { + return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { + var resource; + try { + resource = resourceFactory(); + } + catch (err) { + subscriber.error(err); + return undefined; + } + var result; + try { + result = observableFactory(resource); + } + catch (err) { + subscriber.error(err); + return undefined; + } + var source = result ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(result) : _empty__WEBPACK_IMPORTED_MODULE_2__["EMPTY"]; + var subscription = source.subscribe(subscriber); + return function () { + subscription.unsubscribe(); + if (resource) { + resource.unsubscribe(); + } + }; + }); } -var IgnoreElementsOperator = /*@__PURE__*/ (function () { - function IgnoreElementsOperator() { - } - IgnoreElementsOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new IgnoreElementsSubscriber(subscriber)); - }; - return IgnoreElementsOperator; -}()); -var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IgnoreElementsSubscriber, _super); - function IgnoreElementsSubscriber() { - return _super !== null && _super.apply(this, arguments) || this; - } - IgnoreElementsSubscriber.prototype._next = function (unused) { - }; - return IgnoreElementsSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=ignoreElements.js.map +//# sourceMappingURL=using.js.map /***/ }), @@ -27408,8946 +27112,9248 @@ var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return isEmpty; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipOperator", function() { return ZipOperator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipSubscriber", function() { return ZipSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(206); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(230); +/* harmony import */ var _internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(235); +/** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_OuterSubscriber,_util_subscribeToResult,_.._internal_symbol_iterator PURE_IMPORTS_END */ -function isEmpty() { - return function (source) { return source.lift(new IsEmptyOperator()); }; + + + + + +function zip() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; + } + var resultSelector = observables[observables.length - 1]; + if (typeof resultSelector === 'function') { + observables.pop(); + } + return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(observables, undefined).lift(new ZipOperator(resultSelector)); } -var IsEmptyOperator = /*@__PURE__*/ (function () { - function IsEmptyOperator() { +var ZipOperator = /*@__PURE__*/ (function () { + function ZipOperator(resultSelector) { + this.resultSelector = resultSelector; } - IsEmptyOperator.prototype.call = function (observer, source) { - return source.subscribe(new IsEmptySubscriber(observer)); + ZipOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ZipSubscriber(subscriber, this.resultSelector)); }; - return IsEmptyOperator; + return ZipOperator; }()); -var IsEmptySubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IsEmptySubscriber, _super); - function IsEmptySubscriber(destination) { - return _super.call(this, destination) || this; + +var ZipSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipSubscriber, _super); + function ZipSubscriber(destination, resultSelector, values) { + if (values === void 0) { + values = Object.create(null); + } + var _this = _super.call(this, destination) || this; + _this.iterators = []; + _this.active = 0; + _this.resultSelector = (typeof resultSelector === 'function') ? resultSelector : null; + _this.values = values; + return _this; } - IsEmptySubscriber.prototype.notifyComplete = function (isEmpty) { - var destination = this.destination; - destination.next(isEmpty); - destination.complete(); + ZipSubscriber.prototype._next = function (value) { + var iterators = this.iterators; + if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(value)) { + iterators.push(new StaticArrayIterator(value)); + } + else if (typeof value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] === 'function') { + iterators.push(new StaticIterator(value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]]())); + } + else { + iterators.push(new ZipBufferIterator(this.destination, this, value)); + } }; - IsEmptySubscriber.prototype._next = function (value) { - this.notifyComplete(false); + ZipSubscriber.prototype._complete = function () { + var iterators = this.iterators; + var len = iterators.length; + this.unsubscribe(); + if (len === 0) { + this.destination.complete(); + return; + } + this.active = len; + for (var i = 0; i < len; i++) { + var iterator = iterators[i]; + if (iterator.stillUnsubscribed) { + var destination = this.destination; + destination.add(iterator.subscribe(iterator, i)); + } + else { + this.active--; + } + } }; - IsEmptySubscriber.prototype._complete = function () { - this.notifyComplete(true); + ZipSubscriber.prototype.notifyInactive = function () { + this.active--; + if (this.active === 0) { + this.destination.complete(); + } }; - return IsEmptySubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=isEmpty.js.map - - -/***/ }), -/* 270 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return last; }); -/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(253); -/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(251); -/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(271); -/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(252); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(238); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(232); -/** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */ - - - - - - -function last(predicate, defaultValue) { - var hasDefaultValue = arguments.length >= 2; - return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_takeLast__WEBPACK_IMPORTED_MODULE_2__["takeLast"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); }; -} -//# sourceMappingURL=last.js.map - - -/***/ }), -/* 271 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return takeLast; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(242); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ - - - - -function takeLast(count) { - return function takeLastOperatorFunction(source) { - if (count === 0) { - return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])(); + ZipSubscriber.prototype.checkIterators = function () { + var iterators = this.iterators; + var len = iterators.length; + var destination = this.destination; + for (var i = 0; i < len; i++) { + var iterator = iterators[i]; + if (typeof iterator.hasValue === 'function' && !iterator.hasValue()) { + return; + } + } + var shouldComplete = false; + var args = []; + for (var i = 0; i < len; i++) { + var iterator = iterators[i]; + var result = iterator.next(); + if (iterator.hasCompleted()) { + shouldComplete = true; + } + if (result.done) { + destination.complete(); + return; + } + args.push(result.value); + } + if (this.resultSelector) { + this._tryresultSelector(args); } else { - return source.lift(new TakeLastOperator(count)); + destination.next(args); + } + if (shouldComplete) { + destination.complete(); } }; -} -var TakeLastOperator = /*@__PURE__*/ (function () { - function TakeLastOperator(total) { - this.total = total; - if (this.total < 0) { - throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"]; + ZipSubscriber.prototype._tryresultSelector = function (args) { + var result; + try { + result = this.resultSelector.apply(this, args); + } + catch (err) { + this.destination.error(err); + return; } + this.destination.next(result); + }; + return ZipSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"])); + +var StaticIterator = /*@__PURE__*/ (function () { + function StaticIterator(iterator) { + this.iterator = iterator; + this.nextResult = iterator.next(); } - TakeLastOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new TakeLastSubscriber(subscriber, this.total)); + StaticIterator.prototype.hasValue = function () { + return true; }; - return TakeLastOperator; + StaticIterator.prototype.next = function () { + var result = this.nextResult; + this.nextResult = this.iterator.next(); + return result; + }; + StaticIterator.prototype.hasCompleted = function () { + var nextResult = this.nextResult; + return nextResult && nextResult.done; + }; + return StaticIterator; }()); -var TakeLastSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeLastSubscriber, _super); - function TakeLastSubscriber(destination, total) { +var StaticArrayIterator = /*@__PURE__*/ (function () { + function StaticArrayIterator(array) { + this.array = array; + this.index = 0; + this.length = 0; + this.length = array.length; + } + StaticArrayIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] = function () { + return this; + }; + StaticArrayIterator.prototype.next = function (value) { + var i = this.index++; + var array = this.array; + return i < this.length ? { value: array[i], done: false } : { value: null, done: true }; + }; + StaticArrayIterator.prototype.hasValue = function () { + return this.array.length > this.index; + }; + StaticArrayIterator.prototype.hasCompleted = function () { + return this.array.length === this.index; + }; + return StaticArrayIterator; +}()); +var ZipBufferIterator = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipBufferIterator, _super); + function ZipBufferIterator(destination, parent, observable) { var _this = _super.call(this, destination) || this; - _this.total = total; - _this.ring = new Array(); - _this.count = 0; + _this.parent = parent; + _this.observable = observable; + _this.stillUnsubscribed = true; + _this.buffer = []; + _this.isComplete = false; return _this; } - TakeLastSubscriber.prototype._next = function (value) { - var ring = this.ring; - var total = this.total; - var count = this.count++; - if (ring.length < total) { - ring.push(value); + ZipBufferIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] = function () { + return this; + }; + ZipBufferIterator.prototype.next = function () { + var buffer = this.buffer; + if (buffer.length === 0 && this.isComplete) { + return { value: null, done: true }; } else { - var index = count % total; - ring[index] = value; + return { value: buffer.shift(), done: false }; } }; - TakeLastSubscriber.prototype._complete = function () { - var destination = this.destination; - var count = this.count; - if (count > 0) { - var total = this.count >= this.total ? this.total : this.count; - var ring = this.ring; - for (var i = 0; i < total; i++) { - var idx = (count++) % total; - destination.next(ring[idx]); - } + ZipBufferIterator.prototype.hasValue = function () { + return this.buffer.length > 0; + }; + ZipBufferIterator.prototype.hasCompleted = function () { + return this.buffer.length === 0 && this.isComplete; + }; + ZipBufferIterator.prototype.notifyComplete = function () { + if (this.buffer.length > 0) { + this.isComplete = true; + this.parent.notifyInactive(); + } + else { + this.destination.complete(); } - destination.complete(); }; - return TakeLastSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=takeLast.js.map + ZipBufferIterator.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.buffer.push(innerValue); + this.parent.checkIterators(); + }; + ZipBufferIterator.prototype.subscribe = function (value, index) { + return Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, this.observable, this, index); + }; + return ZipBufferIterator; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"])); +//# sourceMappingURL=zip.js.map /***/ }), -/* 272 */ +/* 270 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return mapTo; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony import */ var _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(271); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return _internal_operators_audit__WEBPACK_IMPORTED_MODULE_0__["audit"]; }); + +/* harmony import */ var _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(272); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return _internal_operators_auditTime__WEBPACK_IMPORTED_MODULE_1__["auditTime"]; }); + +/* harmony import */ var _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(273); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return _internal_operators_buffer__WEBPACK_IMPORTED_MODULE_2__["buffer"]; }); + +/* harmony import */ var _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(274); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return _internal_operators_bufferCount__WEBPACK_IMPORTED_MODULE_3__["bufferCount"]; }); + +/* harmony import */ var _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(275); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return _internal_operators_bufferTime__WEBPACK_IMPORTED_MODULE_4__["bufferTime"]; }); + +/* harmony import */ var _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(276); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return _internal_operators_bufferToggle__WEBPACK_IMPORTED_MODULE_5__["bufferToggle"]; }); + +/* harmony import */ var _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(277); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return _internal_operators_bufferWhen__WEBPACK_IMPORTED_MODULE_6__["bufferWhen"]; }); + +/* harmony import */ var _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(278); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return _internal_operators_catchError__WEBPACK_IMPORTED_MODULE_7__["catchError"]; }); + +/* harmony import */ var _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(279); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return _internal_operators_combineAll__WEBPACK_IMPORTED_MODULE_8__["combineAll"]; }); + +/* harmony import */ var _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(280); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_operators_combineLatest__WEBPACK_IMPORTED_MODULE_9__["combineLatest"]; }); + +/* harmony import */ var _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(281); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_operators_concat__WEBPACK_IMPORTED_MODULE_10__["concat"]; }); + +/* harmony import */ var _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(240); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return _internal_operators_concatAll__WEBPACK_IMPORTED_MODULE_11__["concatAll"]; }); + +/* harmony import */ var _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(282); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return _internal_operators_concatMap__WEBPACK_IMPORTED_MODULE_12__["concatMap"]; }); + +/* harmony import */ var _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(283); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return _internal_operators_concatMapTo__WEBPACK_IMPORTED_MODULE_13__["concatMapTo"]; }); + +/* harmony import */ var _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(284); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "count", function() { return _internal_operators_count__WEBPACK_IMPORTED_MODULE_14__["count"]; }); + +/* harmony import */ var _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(285); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return _internal_operators_debounce__WEBPACK_IMPORTED_MODULE_15__["debounce"]; }); + +/* harmony import */ var _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(286); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return _internal_operators_debounceTime__WEBPACK_IMPORTED_MODULE_16__["debounceTime"]; }); + +/* harmony import */ var _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(287); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return _internal_operators_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_17__["defaultIfEmpty"]; }); + +/* harmony import */ var _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(288); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return _internal_operators_delay__WEBPACK_IMPORTED_MODULE_18__["delay"]; }); + +/* harmony import */ var _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(290); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return _internal_operators_delayWhen__WEBPACK_IMPORTED_MODULE_19__["delayWhen"]; }); + +/* harmony import */ var _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(291); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return _internal_operators_dematerialize__WEBPACK_IMPORTED_MODULE_20__["dematerialize"]; }); + +/* harmony import */ var _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(292); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return _internal_operators_distinct__WEBPACK_IMPORTED_MODULE_21__["distinct"]; }); + +/* harmony import */ var _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(293); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return _internal_operators_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_22__["distinctUntilChanged"]; }); + +/* harmony import */ var _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(294); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return _internal_operators_distinctUntilKeyChanged__WEBPACK_IMPORTED_MODULE_23__["distinctUntilKeyChanged"]; }); + +/* harmony import */ var _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(295); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return _internal_operators_elementAt__WEBPACK_IMPORTED_MODULE_24__["elementAt"]; }); + +/* harmony import */ var _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(298); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return _internal_operators_endWith__WEBPACK_IMPORTED_MODULE_25__["endWith"]; }); + +/* harmony import */ var _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(299); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "every", function() { return _internal_operators_every__WEBPACK_IMPORTED_MODULE_26__["every"]; }); + +/* harmony import */ var _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(300); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return _internal_operators_exhaust__WEBPACK_IMPORTED_MODULE_27__["exhaust"]; }); + +/* harmony import */ var _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(301); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return _internal_operators_exhaustMap__WEBPACK_IMPORTED_MODULE_28__["exhaustMap"]; }); + +/* harmony import */ var _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(302); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return _internal_operators_expand__WEBPACK_IMPORTED_MODULE_29__["expand"]; }); + +/* harmony import */ var _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(264); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return _internal_operators_filter__WEBPACK_IMPORTED_MODULE_30__["filter"]; }); + +/* harmony import */ var _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(303); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return _internal_operators_finalize__WEBPACK_IMPORTED_MODULE_31__["finalize"]; }); + +/* harmony import */ var _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(304); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "find", function() { return _internal_operators_find__WEBPACK_IMPORTED_MODULE_32__["find"]; }); + +/* harmony import */ var _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(305); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return _internal_operators_findIndex__WEBPACK_IMPORTED_MODULE_33__["findIndex"]; }); + +/* harmony import */ var _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(306); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "first", function() { return _internal_operators_first__WEBPACK_IMPORTED_MODULE_34__["first"]; }); + +/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(191); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_35__["groupBy"]; }); + +/* harmony import */ var _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(307); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return _internal_operators_ignoreElements__WEBPACK_IMPORTED_MODULE_36__["ignoreElements"]; }); + +/* harmony import */ var _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(308); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return _internal_operators_isEmpty__WEBPACK_IMPORTED_MODULE_37__["isEmpty"]; }); + +/* harmony import */ var _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(309); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "last", function() { return _internal_operators_last__WEBPACK_IMPORTED_MODULE_38__["last"]; }); + +/* harmony import */ var _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(226); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "map", function() { return _internal_operators_map__WEBPACK_IMPORTED_MODULE_39__["map"]; }); + +/* harmony import */ var _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(311); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return _internal_operators_mapTo__WEBPACK_IMPORTED_MODULE_40__["mapTo"]; }); + +/* harmony import */ var _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(312); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return _internal_operators_materialize__WEBPACK_IMPORTED_MODULE_41__["materialize"]; }); + +/* harmony import */ var _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(313); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "max", function() { return _internal_operators_max__WEBPACK_IMPORTED_MODULE_42__["max"]; }); + +/* harmony import */ var _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(316); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_operators_merge__WEBPACK_IMPORTED_MODULE_43__["merge"]; }); + +/* harmony import */ var _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(241); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return _internal_operators_mergeAll__WEBPACK_IMPORTED_MODULE_44__["mergeAll"]; }); + +/* harmony import */ var _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(242); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; }); + +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return _internal_operators_mergeMap__WEBPACK_IMPORTED_MODULE_45__["mergeMap"]; }); + +/* harmony import */ var _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(317); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return _internal_operators_mergeMapTo__WEBPACK_IMPORTED_MODULE_46__["mergeMapTo"]; }); + +/* harmony import */ var _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(318); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return _internal_operators_mergeScan__WEBPACK_IMPORTED_MODULE_47__["mergeScan"]; }); + +/* harmony import */ var _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(319); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "min", function() { return _internal_operators_min__WEBPACK_IMPORTED_MODULE_48__["min"]; }); + +/* harmony import */ var _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(320); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return _internal_operators_multicast__WEBPACK_IMPORTED_MODULE_49__["multicast"]; }); + +/* harmony import */ var _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(201); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return _internal_operators_observeOn__WEBPACK_IMPORTED_MODULE_50__["observeOn"]; }); + +/* harmony import */ var _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(321); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_operators_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_51__["onErrorResumeNext"]; }); + +/* harmony import */ var _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(322); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return _internal_operators_pairwise__WEBPACK_IMPORTED_MODULE_52__["pairwise"]; }); + +/* harmony import */ var _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(323); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_operators_partition__WEBPACK_IMPORTED_MODULE_53__["partition"]; }); + +/* harmony import */ var _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(324); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return _internal_operators_pluck__WEBPACK_IMPORTED_MODULE_54__["pluck"]; }); + +/* harmony import */ var _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(325); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return _internal_operators_publish__WEBPACK_IMPORTED_MODULE_55__["publish"]; }); + +/* harmony import */ var _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(326); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return _internal_operators_publishBehavior__WEBPACK_IMPORTED_MODULE_56__["publishBehavior"]; }); + +/* harmony import */ var _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(327); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return _internal_operators_publishLast__WEBPACK_IMPORTED_MODULE_57__["publishLast"]; }); + +/* harmony import */ var _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(328); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return _internal_operators_publishReplay__WEBPACK_IMPORTED_MODULE_58__["publishReplay"]; }); + +/* harmony import */ var _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(329); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_operators_race__WEBPACK_IMPORTED_MODULE_59__["race"]; }); + +/* harmony import */ var _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(314); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return _internal_operators_reduce__WEBPACK_IMPORTED_MODULE_60__["reduce"]; }); + +/* harmony import */ var _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(330); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return _internal_operators_repeat__WEBPACK_IMPORTED_MODULE_61__["repeat"]; }); + +/* harmony import */ var _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(331); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return _internal_operators_repeatWhen__WEBPACK_IMPORTED_MODULE_62__["repeatWhen"]; }); + +/* harmony import */ var _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(332); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return _internal_operators_retry__WEBPACK_IMPORTED_MODULE_63__["retry"]; }); + +/* harmony import */ var _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(333); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return _internal_operators_retryWhen__WEBPACK_IMPORTED_MODULE_64__["retryWhen"]; }); + +/* harmony import */ var _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(190); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return _internal_operators_refCount__WEBPACK_IMPORTED_MODULE_65__["refCount"]; }); + +/* harmony import */ var _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(334); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return _internal_operators_sample__WEBPACK_IMPORTED_MODULE_66__["sample"]; }); + +/* harmony import */ var _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(335); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return _internal_operators_sampleTime__WEBPACK_IMPORTED_MODULE_67__["sampleTime"]; }); + +/* harmony import */ var _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(315); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return _internal_operators_scan__WEBPACK_IMPORTED_MODULE_68__["scan"]; }); + +/* harmony import */ var _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(336); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return _internal_operators_sequenceEqual__WEBPACK_IMPORTED_MODULE_69__["sequenceEqual"]; }); + +/* harmony import */ var _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(337); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "share", function() { return _internal_operators_share__WEBPACK_IMPORTED_MODULE_70__["share"]; }); + +/* harmony import */ var _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(338); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return _internal_operators_shareReplay__WEBPACK_IMPORTED_MODULE_71__["shareReplay"]; }); + +/* harmony import */ var _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(339); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "single", function() { return _internal_operators_single__WEBPACK_IMPORTED_MODULE_72__["single"]; }); + +/* harmony import */ var _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(340); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return _internal_operators_skip__WEBPACK_IMPORTED_MODULE_73__["skip"]; }); + +/* harmony import */ var _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(341); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return _internal_operators_skipLast__WEBPACK_IMPORTED_MODULE_74__["skipLast"]; }); + +/* harmony import */ var _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(342); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return _internal_operators_skipUntil__WEBPACK_IMPORTED_MODULE_75__["skipUntil"]; }); + +/* harmony import */ var _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(343); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return _internal_operators_skipWhile__WEBPACK_IMPORTED_MODULE_76__["skipWhile"]; }); + +/* harmony import */ var _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(344); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return _internal_operators_startWith__WEBPACK_IMPORTED_MODULE_77__["startWith"]; }); + +/* harmony import */ var _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(345); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return _internal_operators_subscribeOn__WEBPACK_IMPORTED_MODULE_78__["subscribeOn"]; }); + +/* harmony import */ var _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(347); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return _internal_operators_switchAll__WEBPACK_IMPORTED_MODULE_79__["switchAll"]; }); + +/* harmony import */ var _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(348); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return _internal_operators_switchMap__WEBPACK_IMPORTED_MODULE_80__["switchMap"]; }); + +/* harmony import */ var _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(349); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return _internal_operators_switchMapTo__WEBPACK_IMPORTED_MODULE_81__["switchMapTo"]; }); + +/* harmony import */ var _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(297); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "take", function() { return _internal_operators_take__WEBPACK_IMPORTED_MODULE_82__["take"]; }); + +/* harmony import */ var _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(310); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return _internal_operators_takeLast__WEBPACK_IMPORTED_MODULE_83__["takeLast"]; }); + +/* harmony import */ var _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(350); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return _internal_operators_takeUntil__WEBPACK_IMPORTED_MODULE_84__["takeUntil"]; }); + +/* harmony import */ var _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__ = __webpack_require__(351); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return _internal_operators_takeWhile__WEBPACK_IMPORTED_MODULE_85__["takeWhile"]; }); + +/* harmony import */ var _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__ = __webpack_require__(352); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return _internal_operators_tap__WEBPACK_IMPORTED_MODULE_86__["tap"]; }); + +/* harmony import */ var _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__ = __webpack_require__(353); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return _internal_operators_throttle__WEBPACK_IMPORTED_MODULE_87__["throttle"]; }); + +/* harmony import */ var _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__ = __webpack_require__(354); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return _internal_operators_throttleTime__WEBPACK_IMPORTED_MODULE_88__["throttleTime"]; }); + +/* harmony import */ var _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__ = __webpack_require__(296); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return _internal_operators_throwIfEmpty__WEBPACK_IMPORTED_MODULE_89__["throwIfEmpty"]; }); + +/* harmony import */ var _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__ = __webpack_require__(355); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return _internal_operators_timeInterval__WEBPACK_IMPORTED_MODULE_90__["timeInterval"]; }); + +/* harmony import */ var _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__ = __webpack_require__(356); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return _internal_operators_timeout__WEBPACK_IMPORTED_MODULE_91__["timeout"]; }); + +/* harmony import */ var _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__ = __webpack_require__(357); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return _internal_operators_timeoutWith__WEBPACK_IMPORTED_MODULE_92__["timeoutWith"]; }); + +/* harmony import */ var _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__ = __webpack_require__(358); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return _internal_operators_timestamp__WEBPACK_IMPORTED_MODULE_93__["timestamp"]; }); + +/* harmony import */ var _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__ = __webpack_require__(359); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return _internal_operators_toArray__WEBPACK_IMPORTED_MODULE_94__["toArray"]; }); + +/* harmony import */ var _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__ = __webpack_require__(360); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "window", function() { return _internal_operators_window__WEBPACK_IMPORTED_MODULE_95__["window"]; }); + +/* harmony import */ var _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__ = __webpack_require__(361); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return _internal_operators_windowCount__WEBPACK_IMPORTED_MODULE_96__["windowCount"]; }); + +/* harmony import */ var _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__ = __webpack_require__(362); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return _internal_operators_windowTime__WEBPACK_IMPORTED_MODULE_97__["windowTime"]; }); + +/* harmony import */ var _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__ = __webpack_require__(363); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return _internal_operators_windowToggle__WEBPACK_IMPORTED_MODULE_98__["windowToggle"]; }); + +/* harmony import */ var _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__ = __webpack_require__(364); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return _internal_operators_windowWhen__WEBPACK_IMPORTED_MODULE_99__["windowWhen"]; }); + +/* harmony import */ var _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__ = __webpack_require__(365); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return _internal_operators_withLatestFrom__WEBPACK_IMPORTED_MODULE_100__["withLatestFrom"]; }); + +/* harmony import */ var _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__ = __webpack_require__(366); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_operators_zip__WEBPACK_IMPORTED_MODULE_101__["zip"]; }); + +/* harmony import */ var _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__ = __webpack_require__(367); +/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return _internal_operators_zipAll__WEBPACK_IMPORTED_MODULE_102__["zipAll"]; }); + +/** PURE_IMPORTS_START PURE_IMPORTS_END */ + + + + + + + + + + + + + + + + + + + + -function mapTo(value) { - return function (source) { return source.lift(new MapToOperator(value)); }; -} -var MapToOperator = /*@__PURE__*/ (function () { - function MapToOperator(value) { - this.value = value; - } - MapToOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new MapToSubscriber(subscriber, this.value)); - }; - return MapToOperator; -}()); -var MapToSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MapToSubscriber, _super); - function MapToSubscriber(destination, value) { - var _this = _super.call(this, destination) || this; - _this.value = value; - return _this; - } - MapToSubscriber.prototype._next = function (x) { - this.destination.next(this.value); - }; - return MapToSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=mapTo.js.map -/***/ }), -/* 273 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return materialize; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(241); -/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */ -function materialize() { - return function materializeOperatorFunction(source) { - return source.lift(new MaterializeOperator()); - }; -} -var MaterializeOperator = /*@__PURE__*/ (function () { - function MaterializeOperator() { - } - MaterializeOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new MaterializeSubscriber(subscriber)); - }; - return MaterializeOperator; -}()); -var MaterializeSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MaterializeSubscriber, _super); - function MaterializeSubscriber(destination) { - return _super.call(this, destination) || this; - } - MaterializeSubscriber.prototype._next = function (value) { - this.destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value)); - }; - MaterializeSubscriber.prototype._error = function (err) { - var destination = this.destination; - destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err)); - destination.complete(); - }; - MaterializeSubscriber.prototype._complete = function () { - var destination = this.destination; - destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete()); - destination.complete(); - }; - return MaterializeSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=materialize.js.map -/***/ }), -/* 274 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "max", function() { return max; }); -/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(275); -/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ -function max(comparer) { - var max = (typeof comparer === 'function') - ? function (x, y) { return comparer(x, y) > 0 ? x : y; } - : function (x, y) { return x > y ? x : y; }; - return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(max); -} -//# sourceMappingURL=max.js.map -/***/ }), -/* 275 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return reduce; }); -/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(276); -/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(271); -/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(238); -/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(196); -/** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */ -function reduce(accumulator, seed) { - if (arguments.length >= 2) { - return function reduceOperatorFunctionWithSeed(source) { - return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(accumulator, seed), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1), Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__["defaultIfEmpty"])(seed))(source); - }; - } - return function reduceOperatorFunction(source) { - return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(function (acc, value, index) { return accumulator(acc, value, index + 1); }), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1))(source); - }; -} -//# sourceMappingURL=reduce.js.map -/***/ }), -/* 276 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return scan; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function scan(accumulator, seed) { - var hasSeed = false; - if (arguments.length >= 2) { - hasSeed = true; - } - return function scanOperatorFunction(source) { - return source.lift(new ScanOperator(accumulator, seed, hasSeed)); - }; -} -var ScanOperator = /*@__PURE__*/ (function () { - function ScanOperator(accumulator, seed, hasSeed) { - if (hasSeed === void 0) { - hasSeed = false; - } - this.accumulator = accumulator; - this.seed = seed; - this.hasSeed = hasSeed; - } - ScanOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ScanSubscriber(subscriber, this.accumulator, this.seed, this.hasSeed)); - }; - return ScanOperator; -}()); -var ScanSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ScanSubscriber, _super); - function ScanSubscriber(destination, accumulator, _seed, hasSeed) { - var _this = _super.call(this, destination) || this; - _this.accumulator = accumulator; - _this._seed = _seed; - _this.hasSeed = hasSeed; - _this.index = 0; - return _this; - } - Object.defineProperty(ScanSubscriber.prototype, "seed", { - get: function () { - return this._seed; - }, - set: function (value) { - this.hasSeed = true; - this._seed = value; - }, - enumerable: true, - configurable: true - }); - ScanSubscriber.prototype._next = function (value) { - if (!this.hasSeed) { - this.seed = value; - this.destination.next(value); - } - else { - return this._tryNext(value); - } - }; - ScanSubscriber.prototype._tryNext = function (value) { - var index = this.index++; - var result; - try { - result = this.accumulator(this.seed, value, index); - } - catch (err) { - this.destination.error(err); - } - this.seed = result; - this.destination.next(result); - }; - return ScanSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=scan.js.map -/***/ }), -/* 277 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; }); -/* harmony import */ var _observable_merge__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(278); -/** PURE_IMPORTS_START _observable_merge PURE_IMPORTS_END */ -function merge() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - return function (source) { return source.lift.call(_observable_merge__WEBPACK_IMPORTED_MODULE_0__["merge"].apply(void 0, [source].concat(observables))); }; -} -//# sourceMappingURL=merge.js.map -/***/ }), -/* 278 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(206); -/* harmony import */ var _operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(229); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(215); -/** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */ -function merge() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - var concurrent = Number.POSITIVE_INFINITY; - var scheduler = null; - var last = observables[observables.length - 1]; - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(last)) { - scheduler = observables.pop(); - if (observables.length > 1 && typeof observables[observables.length - 1] === 'number') { - concurrent = observables.pop(); - } - } - else if (typeof last === 'number') { - concurrent = observables.pop(); - } - if (scheduler === null && observables.length === 1 && observables[0] instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]) { - return observables[0]; - } - return Object(_operators_mergeAll__WEBPACK_IMPORTED_MODULE_2__["mergeAll"])(concurrent)(Object(_fromArray__WEBPACK_IMPORTED_MODULE_3__["fromArray"])(observables, scheduler)); -} -//# sourceMappingURL=merge.js.map -/***/ }), -/* 279 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return mergeMapTo; }); -/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(230); -/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */ -function mergeMapTo(innerObservable, resultSelector, concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; - } - if (typeof resultSelector === 'function') { - return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, resultSelector, concurrent); - } - if (typeof resultSelector === 'number') { - concurrent = resultSelector; - } - return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, concurrent); -} -//# sourceMappingURL=mergeMapTo.js.map + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +//# sourceMappingURL=index.js.map /***/ }), -/* 280 */ +/* 271 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return mergeScan; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanOperator", function() { return MergeScanOperator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanSubscriber", function() { return MergeScanSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return audit; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(182); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171); -/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(183); -/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber PURE_IMPORTS_END */ - +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function mergeScan(accumulator, seed, concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; - } - return function (source) { return source.lift(new MergeScanOperator(accumulator, seed, concurrent)); }; +function audit(durationSelector) { + return function auditOperatorFunction(source) { + return source.lift(new AuditOperator(durationSelector)); + }; } -var MergeScanOperator = /*@__PURE__*/ (function () { - function MergeScanOperator(accumulator, seed, concurrent) { - this.accumulator = accumulator; - this.seed = seed; - this.concurrent = concurrent; +var AuditOperator = /*@__PURE__*/ (function () { + function AuditOperator(durationSelector) { + this.durationSelector = durationSelector; } - MergeScanOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new MergeScanSubscriber(subscriber, this.accumulator, this.seed, this.concurrent)); + AuditOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new AuditSubscriber(subscriber, this.durationSelector)); }; - return MergeScanOperator; + return AuditOperator; }()); - -var MergeScanSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeScanSubscriber, _super); - function MergeScanSubscriber(destination, accumulator, acc, concurrent) { +var AuditSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AuditSubscriber, _super); + function AuditSubscriber(destination, durationSelector) { var _this = _super.call(this, destination) || this; - _this.accumulator = accumulator; - _this.acc = acc; - _this.concurrent = concurrent; + _this.durationSelector = durationSelector; _this.hasValue = false; - _this.hasCompleted = false; - _this.buffer = []; - _this.active = 0; - _this.index = 0; return _this; } - MergeScanSubscriber.prototype._next = function (value) { - if (this.active < this.concurrent) { - var index = this.index++; - var destination = this.destination; - var ish = void 0; + AuditSubscriber.prototype._next = function (value) { + this.value = value; + this.hasValue = true; + if (!this.throttled) { + var duration = void 0; try { - var accumulator = this.accumulator; - ish = accumulator(this.acc, value, index); + var durationSelector = this.durationSelector; + duration = durationSelector(value); } - catch (e) { - return destination.error(e); + catch (err) { + return this.destination.error(err); } - this.active++; - this._innerSub(ish, value, index); - } - else { - this.buffer.push(value); - } - }; - MergeScanSubscriber.prototype._innerSub = function (ish, value, index) { - var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__["InnerSubscriber"](this, undefined, undefined); - var destination = this.destination; - destination.add(innerSubscriber); - Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index, innerSubscriber); - }; - MergeScanSubscriber.prototype._complete = function () { - this.hasCompleted = true; - if (this.active === 0 && this.buffer.length === 0) { - if (this.hasValue === false) { - this.destination.next(this.acc); + var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration); + if (!innerSubscription || innerSubscription.closed) { + this.clearThrottle(); + } + else { + this.add(this.throttled = innerSubscription); } - this.destination.complete(); } - this.unsubscribe(); - }; - MergeScanSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - var destination = this.destination; - this.acc = innerValue; - this.hasValue = true; - destination.next(innerValue); }; - MergeScanSubscriber.prototype.notifyComplete = function (innerSub) { - var buffer = this.buffer; - var destination = this.destination; - destination.remove(innerSub); - this.active--; - if (buffer.length > 0) { - this._next(buffer.shift()); + AuditSubscriber.prototype.clearThrottle = function () { + var _a = this, value = _a.value, hasValue = _a.hasValue, throttled = _a.throttled; + if (throttled) { + this.remove(throttled); + this.throttled = null; + throttled.unsubscribe(); } - else if (this.active === 0 && this.hasCompleted) { - if (this.hasValue === false) { - this.destination.next(this.acc); - } - this.destination.complete(); + if (hasValue) { + this.value = null; + this.hasValue = false; + this.destination.next(value); } }; - return MergeScanSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); - -//# sourceMappingURL=mergeScan.js.map + AuditSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex) { + this.clearThrottle(); + }; + AuditSubscriber.prototype.notifyComplete = function () { + this.clearThrottle(); + }; + return AuditSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=audit.js.map /***/ }), -/* 281 */ +/* 272 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return min; }); -/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(275); -/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return auditTime; }); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(215); +/* harmony import */ var _audit__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(271); +/* harmony import */ var _observable_timer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(267); +/** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */ -function min(comparer) { - var min = (typeof comparer === 'function') - ? function (x, y) { return comparer(x, y) < 0 ? x : y; } - : function (x, y) { return x < y ? x : y; }; - return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(min); -} -//# sourceMappingURL=min.js.map -/***/ }), -/* 282 */ +function auditTime(duration, scheduler) { + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"]; + } + return Object(_audit__WEBPACK_IMPORTED_MODULE_1__["audit"])(function () { return Object(_observable_timer__WEBPACK_IMPORTED_MODULE_2__["timer"])(duration, scheduler); }); +} +//# sourceMappingURL=auditTime.js.map + + +/***/ }), +/* 273 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return multicast; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MulticastOperator", function() { return MulticastOperator; }); -/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(283); -/** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return buffer; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function multicast(subjectOrSubjectFactory, selector) { - return function multicastOperatorFunction(source) { - var subjectFactory; - if (typeof subjectOrSubjectFactory === 'function') { - subjectFactory = subjectOrSubjectFactory; - } - else { - subjectFactory = function subjectFactory() { - return subjectOrSubjectFactory; - }; - } - if (typeof selector === 'function') { - return source.lift(new MulticastOperator(subjectFactory, selector)); - } - var connectable = Object.create(source, _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__["connectableObservableDescriptor"]); - connectable.source = source; - connectable.subjectFactory = subjectFactory; - return connectable; + + +function buffer(closingNotifier) { + return function bufferOperatorFunction(source) { + return source.lift(new BufferOperator(closingNotifier)); }; } -var MulticastOperator = /*@__PURE__*/ (function () { - function MulticastOperator(subjectFactory, selector) { - this.subjectFactory = subjectFactory; - this.selector = selector; +var BufferOperator = /*@__PURE__*/ (function () { + function BufferOperator(closingNotifier) { + this.closingNotifier = closingNotifier; } - MulticastOperator.prototype.call = function (subscriber, source) { - var selector = this.selector; - var subject = this.subjectFactory(); - var subscription = selector(subject).subscribe(subscriber); - subscription.add(source.subscribe(subject)); - return subscription; + BufferOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new BufferSubscriber(subscriber, this.closingNotifier)); }; - return MulticastOperator; + return BufferOperator; }()); - -//# sourceMappingURL=multicast.js.map +var BufferSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSubscriber, _super); + function BufferSubscriber(destination, closingNotifier) { + var _this = _super.call(this, destination) || this; + _this.buffer = []; + _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, closingNotifier)); + return _this; + } + BufferSubscriber.prototype._next = function (value) { + this.buffer.push(value); + }; + BufferSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + var buffer = this.buffer; + this.buffer = []; + this.destination.next(buffer); + }; + return BufferSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=buffer.js.map /***/ }), -/* 283 */ +/* 274 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return ConnectableObservable; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "connectableObservableDescriptor", function() { return connectableObservableDescriptor; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return bufferCount; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(193); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(177); -/* harmony import */ var _operators_refCount__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(284); -/** PURE_IMPORTS_START tslib,_Subject,_Observable,_Subscriber,_Subscription,_operators_refCount PURE_IMPORTS_END */ - - - - +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -var ConnectableObservable = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableObservable, _super); - function ConnectableObservable(source, subjectFactory) { - var _this = _super.call(this) || this; - _this.source = source; - _this.subjectFactory = subjectFactory; - _this._refCount = 0; - _this._isComplete = false; - return _this; +function bufferCount(bufferSize, startBufferEvery) { + if (startBufferEvery === void 0) { + startBufferEvery = null; } - ConnectableObservable.prototype._subscribe = function (subscriber) { - return this.getSubject().subscribe(subscriber); + return function bufferCountOperatorFunction(source) { + return source.lift(new BufferCountOperator(bufferSize, startBufferEvery)); }; - ConnectableObservable.prototype.getSubject = function () { - var subject = this._subject; - if (!subject || subject.isStopped) { - this._subject = this.subjectFactory(); +} +var BufferCountOperator = /*@__PURE__*/ (function () { + function BufferCountOperator(bufferSize, startBufferEvery) { + this.bufferSize = bufferSize; + this.startBufferEvery = startBufferEvery; + if (!startBufferEvery || bufferSize === startBufferEvery) { + this.subscriberClass = BufferCountSubscriber; } - return this._subject; - }; - ConnectableObservable.prototype.connect = function () { - var connection = this._connection; - if (!connection) { - this._isComplete = false; - connection = this._connection = new _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"](); - connection.add(this.source - .subscribe(new ConnectableSubscriber(this.getSubject(), this))); - if (connection.closed) { - this._connection = null; - connection = _Subscription__WEBPACK_IMPORTED_MODULE_4__["Subscription"].EMPTY; - } + else { + this.subscriberClass = BufferSkipCountSubscriber; } - return connection; - }; - ConnectableObservable.prototype.refCount = function () { - return Object(_operators_refCount__WEBPACK_IMPORTED_MODULE_5__["refCount"])()(this); - }; - return ConnectableObservable; -}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"])); - -var connectableObservableDescriptor = /*@__PURE__*/ (function () { - var connectableProto = ConnectableObservable.prototype; - return { - operator: { value: null }, - _refCount: { value: 0, writable: true }, - _subject: { value: null, writable: true }, - _connection: { value: null, writable: true }, - _subscribe: { value: connectableProto._subscribe }, - _isComplete: { value: connectableProto._isComplete, writable: true }, - getSubject: { value: connectableProto.getSubject }, - connect: { value: connectableProto.connect }, - refCount: { value: connectableProto.refCount } + } + BufferCountOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new this.subscriberClass(subscriber, this.bufferSize, this.startBufferEvery)); }; -})(); -var ConnectableSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ConnectableSubscriber, _super); - function ConnectableSubscriber(destination, connectable) { + return BufferCountOperator; +}()); +var BufferCountSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferCountSubscriber, _super); + function BufferCountSubscriber(destination, bufferSize) { var _this = _super.call(this, destination) || this; - _this.connectable = connectable; + _this.bufferSize = bufferSize; + _this.buffer = []; return _this; } - ConnectableSubscriber.prototype._error = function (err) { - this._unsubscribe(); - _super.prototype._error.call(this, err); - }; - ConnectableSubscriber.prototype._complete = function () { - this.connectable._isComplete = true; - this._unsubscribe(); - _super.prototype._complete.call(this); - }; - ConnectableSubscriber.prototype._unsubscribe = function () { - var connectable = this.connectable; - if (connectable) { - this.connectable = null; - var connection = connectable._connection; - connectable._refCount = 0; - connectable._subject = null; - connectable._connection = null; - if (connection) { - connection.unsubscribe(); - } + BufferCountSubscriber.prototype._next = function (value) { + var buffer = this.buffer; + buffer.push(value); + if (buffer.length == this.bufferSize) { + this.destination.next(buffer); + this.buffer = []; } }; - return ConnectableSubscriber; -}(_Subject__WEBPACK_IMPORTED_MODULE_1__["SubjectSubscriber"])); -var RefCountOperator = /*@__PURE__*/ (function () { - function RefCountOperator(connectable) { - this.connectable = connectable; - } - RefCountOperator.prototype.call = function (subscriber, source) { - var connectable = this.connectable; - connectable._refCount++; - var refCounter = new RefCountSubscriber(subscriber, connectable); - var subscription = source.subscribe(refCounter); - if (!refCounter.closed) { - refCounter.connection = connectable.connect(); + BufferCountSubscriber.prototype._complete = function () { + var buffer = this.buffer; + if (buffer.length > 0) { + this.destination.next(buffer); } - return subscription; + _super.prototype._complete.call(this); }; - return RefCountOperator; -}()); -var RefCountSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super); - function RefCountSubscriber(destination, connectable) { + return BufferCountSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferSkipCountSubscriber, _super); + function BufferSkipCountSubscriber(destination, bufferSize, startBufferEvery) { var _this = _super.call(this, destination) || this; - _this.connectable = connectable; + _this.bufferSize = bufferSize; + _this.startBufferEvery = startBufferEvery; + _this.buffers = []; + _this.count = 0; return _this; } - RefCountSubscriber.prototype._unsubscribe = function () { - var connectable = this.connectable; - if (!connectable) { - this.connection = null; - return; - } - this.connectable = null; - var refCount = connectable._refCount; - if (refCount <= 0) { - this.connection = null; - return; + BufferSkipCountSubscriber.prototype._next = function (value) { + var _a = this, bufferSize = _a.bufferSize, startBufferEvery = _a.startBufferEvery, buffers = _a.buffers, count = _a.count; + this.count++; + if (count % startBufferEvery === 0) { + buffers.push([]); } - connectable._refCount = refCount - 1; - if (refCount > 1) { - this.connection = null; - return; + for (var i = buffers.length; i--;) { + var buffer = buffers[i]; + buffer.push(value); + if (buffer.length === bufferSize) { + buffers.splice(i, 1); + this.destination.next(buffer); + } } - var connection = this.connection; - var sharedConnection = connectable._connection; - this.connection = null; - if (sharedConnection && (!connection || sharedConnection === connection)) { - sharedConnection.unsubscribe(); + }; + BufferSkipCountSubscriber.prototype._complete = function () { + var _a = this, buffers = _a.buffers, destination = _a.destination; + while (buffers.length > 0) { + var buffer = buffers.shift(); + if (buffer.length > 0) { + destination.next(buffer); + } } + _super.prototype._complete.call(this); }; - return RefCountSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"])); -//# sourceMappingURL=ConnectableObservable.js.map + return BufferSkipCountSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=bufferCount.js.map /***/ }), -/* 284 */ +/* 275 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return refCount; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return bufferTime; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(205); +/** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */ -function refCount() { - return function refCountOperatorFunction(source) { - return source.lift(new RefCountOperator(source)); + + +function bufferTime(bufferTimeSpan) { + var length = arguments.length; + var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_3__["isScheduler"])(arguments[arguments.length - 1])) { + scheduler = arguments[arguments.length - 1]; + length--; + } + var bufferCreationInterval = null; + if (length >= 2) { + bufferCreationInterval = arguments[1]; + } + var maxBufferSize = Number.POSITIVE_INFINITY; + if (length >= 3) { + maxBufferSize = arguments[2]; + } + return function bufferTimeOperatorFunction(source) { + return source.lift(new BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler)); }; } -var RefCountOperator = /*@__PURE__*/ (function () { - function RefCountOperator(connectable) { - this.connectable = connectable; +var BufferTimeOperator = /*@__PURE__*/ (function () { + function BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) { + this.bufferTimeSpan = bufferTimeSpan; + this.bufferCreationInterval = bufferCreationInterval; + this.maxBufferSize = maxBufferSize; + this.scheduler = scheduler; } - RefCountOperator.prototype.call = function (subscriber, source) { - var connectable = this.connectable; - connectable._refCount++; - var refCounter = new RefCountSubscriber(subscriber, connectable); - var subscription = source.subscribe(refCounter); - if (!refCounter.closed) { - refCounter.connection = connectable.connect(); - } - return subscription; + BufferTimeOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new BufferTimeSubscriber(subscriber, this.bufferTimeSpan, this.bufferCreationInterval, this.maxBufferSize, this.scheduler)); }; - return RefCountOperator; + return BufferTimeOperator; }()); -var RefCountSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RefCountSubscriber, _super); - function RefCountSubscriber(destination, connectable) { +var Context = /*@__PURE__*/ (function () { + function Context() { + this.buffer = []; + } + return Context; +}()); +var BufferTimeSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferTimeSubscriber, _super); + function BufferTimeSubscriber(destination, bufferTimeSpan, bufferCreationInterval, maxBufferSize, scheduler) { var _this = _super.call(this, destination) || this; - _this.connectable = connectable; + _this.bufferTimeSpan = bufferTimeSpan; + _this.bufferCreationInterval = bufferCreationInterval; + _this.maxBufferSize = maxBufferSize; + _this.scheduler = scheduler; + _this.contexts = []; + var context = _this.openContext(); + _this.timespanOnly = bufferCreationInterval == null || bufferCreationInterval < 0; + if (_this.timespanOnly) { + var timeSpanOnlyState = { subscriber: _this, context: context, bufferTimeSpan: bufferTimeSpan }; + _this.add(context.closeAction = scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState)); + } + else { + var closeState = { subscriber: _this, context: context }; + var creationState = { bufferTimeSpan: bufferTimeSpan, bufferCreationInterval: bufferCreationInterval, subscriber: _this, scheduler: scheduler }; + _this.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, closeState)); + _this.add(scheduler.schedule(dispatchBufferCreation, bufferCreationInterval, creationState)); + } return _this; } - RefCountSubscriber.prototype._unsubscribe = function () { - var connectable = this.connectable; - if (!connectable) { - this.connection = null; - return; + BufferTimeSubscriber.prototype._next = function (value) { + var contexts = this.contexts; + var len = contexts.length; + var filledBufferContext; + for (var i = 0; i < len; i++) { + var context_1 = contexts[i]; + var buffer = context_1.buffer; + buffer.push(value); + if (buffer.length == this.maxBufferSize) { + filledBufferContext = context_1; + } } - this.connectable = null; - var refCount = connectable._refCount; - if (refCount <= 0) { - this.connection = null; - return; + if (filledBufferContext) { + this.onBufferFull(filledBufferContext); } - connectable._refCount = refCount - 1; - if (refCount > 1) { - this.connection = null; - return; + }; + BufferTimeSubscriber.prototype._error = function (err) { + this.contexts.length = 0; + _super.prototype._error.call(this, err); + }; + BufferTimeSubscriber.prototype._complete = function () { + var _a = this, contexts = _a.contexts, destination = _a.destination; + while (contexts.length > 0) { + var context_2 = contexts.shift(); + destination.next(context_2.buffer); } - var connection = this.connection; - var sharedConnection = connectable._connection; - this.connection = null; - if (sharedConnection && (!connection || sharedConnection === connection)) { - sharedConnection.unsubscribe(); + _super.prototype._complete.call(this); + }; + BufferTimeSubscriber.prototype._unsubscribe = function () { + this.contexts = null; + }; + BufferTimeSubscriber.prototype.onBufferFull = function (context) { + this.closeContext(context); + var closeAction = context.closeAction; + closeAction.unsubscribe(); + this.remove(closeAction); + if (!this.closed && this.timespanOnly) { + context = this.openContext(); + var bufferTimeSpan = this.bufferTimeSpan; + var timeSpanOnlyState = { subscriber: this, context: context, bufferTimeSpan: bufferTimeSpan }; + this.add(context.closeAction = this.scheduler.schedule(dispatchBufferTimeSpanOnly, bufferTimeSpan, timeSpanOnlyState)); } }; - return RefCountSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=refCount.js.map + BufferTimeSubscriber.prototype.openContext = function () { + var context = new Context(); + this.contexts.push(context); + return context; + }; + BufferTimeSubscriber.prototype.closeContext = function (context) { + this.destination.next(context.buffer); + var contexts = this.contexts; + var spliceIndex = contexts ? contexts.indexOf(context) : -1; + if (spliceIndex >= 0) { + contexts.splice(contexts.indexOf(context), 1); + } + }; + return BufferTimeSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"])); +function dispatchBufferTimeSpanOnly(state) { + var subscriber = state.subscriber; + var prevContext = state.context; + if (prevContext) { + subscriber.closeContext(prevContext); + } + if (!subscriber.closed) { + state.context = subscriber.openContext(); + state.context.closeAction = this.schedule(state, state.bufferTimeSpan); + } +} +function dispatchBufferCreation(state) { + var bufferCreationInterval = state.bufferCreationInterval, bufferTimeSpan = state.bufferTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler; + var context = subscriber.openContext(); + var action = this; + if (!subscriber.closed) { + subscriber.add(context.closeAction = scheduler.schedule(dispatchBufferClose, bufferTimeSpan, { subscriber: subscriber, context: context })); + action.schedule(state, bufferCreationInterval); + } +} +function dispatchBufferClose(arg) { + var subscriber = arg.subscriber, context = arg.context; + subscriber.closeContext(context); +} +//# sourceMappingURL=bufferTime.js.map /***/ }), -/* 285 */ +/* 276 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return observeOn; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnOperator", function() { return ObserveOnOperator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnSubscriber", function() { return ObserveOnSubscriber; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ObserveOnMessage", function() { return ObserveOnMessage; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return bufferToggle; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(241); -/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */ +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(229); +/** PURE_IMPORTS_START tslib,_Subscription,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */ -function observeOn(scheduler, delay) { - if (delay === void 0) { - delay = 0; - } - return function observeOnOperatorFunction(source) { - return source.lift(new ObserveOnOperator(scheduler, delay)); + +function bufferToggle(openings, closingSelector) { + return function bufferToggleOperatorFunction(source) { + return source.lift(new BufferToggleOperator(openings, closingSelector)); }; } -var ObserveOnOperator = /*@__PURE__*/ (function () { - function ObserveOnOperator(scheduler, delay) { - if (delay === void 0) { - delay = 0; - } - this.scheduler = scheduler; - this.delay = delay; +var BufferToggleOperator = /*@__PURE__*/ (function () { + function BufferToggleOperator(openings, closingSelector) { + this.openings = openings; + this.closingSelector = closingSelector; } - ObserveOnOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ObserveOnSubscriber(subscriber, this.scheduler, this.delay)); + BufferToggleOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new BufferToggleSubscriber(subscriber, this.openings, this.closingSelector)); }; - return ObserveOnOperator; + return BufferToggleOperator; }()); - -var ObserveOnSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ObserveOnSubscriber, _super); - function ObserveOnSubscriber(destination, scheduler, delay) { - if (delay === void 0) { - delay = 0; - } +var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferToggleSubscriber, _super); + function BufferToggleSubscriber(destination, openings, closingSelector) { var _this = _super.call(this, destination) || this; - _this.scheduler = scheduler; - _this.delay = delay; - return _this; - } - ObserveOnSubscriber.dispatch = function (arg) { - var notification = arg.notification, destination = arg.destination; - notification.observe(destination); - this.unsubscribe(); + _this.openings = openings; + _this.closingSelector = closingSelector; + _this.contexts = []; + _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, openings)); + return _this; + } + BufferToggleSubscriber.prototype._next = function (value) { + var contexts = this.contexts; + var len = contexts.length; + for (var i = 0; i < len; i++) { + contexts[i].buffer.push(value); + } }; - ObserveOnSubscriber.prototype.scheduleMessage = function (notification) { - var destination = this.destination; - destination.add(this.scheduler.schedule(ObserveOnSubscriber.dispatch, this.delay, new ObserveOnMessage(notification, this.destination))); + BufferToggleSubscriber.prototype._error = function (err) { + var contexts = this.contexts; + while (contexts.length > 0) { + var context_1 = contexts.shift(); + context_1.subscription.unsubscribe(); + context_1.buffer = null; + context_1.subscription = null; + } + this.contexts = null; + _super.prototype._error.call(this, err); }; - ObserveOnSubscriber.prototype._next = function (value) { - this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value)); + BufferToggleSubscriber.prototype._complete = function () { + var contexts = this.contexts; + while (contexts.length > 0) { + var context_2 = contexts.shift(); + this.destination.next(context_2.buffer); + context_2.subscription.unsubscribe(); + context_2.buffer = null; + context_2.subscription = null; + } + this.contexts = null; + _super.prototype._complete.call(this); }; - ObserveOnSubscriber.prototype._error = function (err) { - this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err)); - this.unsubscribe(); + BufferToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + outerValue ? this.closeBuffer(outerValue) : this.openBuffer(innerValue); }; - ObserveOnSubscriber.prototype._complete = function () { - this.scheduleMessage(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete()); - this.unsubscribe(); + BufferToggleSubscriber.prototype.notifyComplete = function (innerSub) { + this.closeBuffer(innerSub.context); }; - return ObserveOnSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); - -var ObserveOnMessage = /*@__PURE__*/ (function () { - function ObserveOnMessage(notification, destination) { - this.notification = notification; - this.destination = destination; - } - return ObserveOnMessage; -}()); - -//# sourceMappingURL=observeOn.js.map + BufferToggleSubscriber.prototype.openBuffer = function (value) { + try { + var closingSelector = this.closingSelector; + var closingNotifier = closingSelector.call(this, value); + if (closingNotifier) { + this.trySubscribe(closingNotifier); + } + } + catch (err) { + this._error(err); + } + }; + BufferToggleSubscriber.prototype.closeBuffer = function (context) { + var contexts = this.contexts; + if (contexts && context) { + var buffer = context.buffer, subscription = context.subscription; + this.destination.next(buffer); + contexts.splice(contexts.indexOf(context), 1); + this.remove(subscription); + subscription.unsubscribe(); + } + }; + BufferToggleSubscriber.prototype.trySubscribe = function (closingNotifier) { + var contexts = this.contexts; + var buffer = []; + var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + var context = { buffer: buffer, subscription: subscription }; + contexts.push(context); + var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, closingNotifier, context); + if (!innerSubscription || innerSubscription.closed) { + this.closeBuffer(context); + } + else { + innerSubscription.context = context; + this.add(innerSubscription); + subscription.add(innerSubscription); + } + }; + return BufferToggleSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); +//# sourceMappingURL=bufferToggle.js.map /***/ }), -/* 286 */ +/* 277 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNextStatic", function() { return onErrorResumeNextStatic; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return bufferWhen; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171); -/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(183); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function onErrorResumeNext() { - var nextSources = []; - for (var _i = 0; _i < arguments.length; _i++) { - nextSources[_i] = arguments[_i]; - } - if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) { - nextSources = nextSources[0]; - } - return function (source) { return source.lift(new OnErrorResumeNextOperator(nextSources)); }; -} -function onErrorResumeNextStatic() { - var nextSources = []; - for (var _i = 0; _i < arguments.length; _i++) { - nextSources[_i] = arguments[_i]; - } - var source = null; - if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) { - nextSources = nextSources[0]; - } - source = nextSources.shift(); - return Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__["from"])(source, null).lift(new OnErrorResumeNextOperator(nextSources)); +function bufferWhen(closingSelector) { + return function (source) { + return source.lift(new BufferWhenOperator(closingSelector)); + }; } -var OnErrorResumeNextOperator = /*@__PURE__*/ (function () { - function OnErrorResumeNextOperator(nextSources) { - this.nextSources = nextSources; +var BufferWhenOperator = /*@__PURE__*/ (function () { + function BufferWhenOperator(closingSelector) { + this.closingSelector = closingSelector; } - OnErrorResumeNextOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new OnErrorResumeNextSubscriber(subscriber, this.nextSources)); + BufferWhenOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new BufferWhenSubscriber(subscriber, this.closingSelector)); }; - return OnErrorResumeNextOperator; + return BufferWhenOperator; }()); -var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OnErrorResumeNextSubscriber, _super); - function OnErrorResumeNextSubscriber(destination, nextSources) { +var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BufferWhenSubscriber, _super); + function BufferWhenSubscriber(destination, closingSelector) { var _this = _super.call(this, destination) || this; - _this.destination = destination; - _this.nextSources = nextSources; + _this.closingSelector = closingSelector; + _this.subscribing = false; + _this.openBuffer(); return _this; } - OnErrorResumeNextSubscriber.prototype.notifyError = function (error, innerSub) { - this.subscribeToNextSource(); + BufferWhenSubscriber.prototype._next = function (value) { + this.buffer.push(value); }; - OnErrorResumeNextSubscriber.prototype.notifyComplete = function (innerSub) { - this.subscribeToNextSource(); + BufferWhenSubscriber.prototype._complete = function () { + var buffer = this.buffer; + if (buffer) { + this.destination.next(buffer); + } + _super.prototype._complete.call(this); }; - OnErrorResumeNextSubscriber.prototype._error = function (err) { - this.subscribeToNextSource(); - this.unsubscribe(); + BufferWhenSubscriber.prototype._unsubscribe = function () { + this.buffer = null; + this.subscribing = false; }; - OnErrorResumeNextSubscriber.prototype._complete = function () { - this.subscribeToNextSource(); - this.unsubscribe(); + BufferWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.openBuffer(); }; - OnErrorResumeNextSubscriber.prototype.subscribeToNextSource = function () { - var next = this.nextSources.shift(); - if (!!next) { - var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_4__["InnerSubscriber"](this, undefined, undefined); - var destination = this.destination; - destination.add(innerSubscriber); - Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, next, undefined, undefined, innerSubscriber); + BufferWhenSubscriber.prototype.notifyComplete = function () { + if (this.subscribing) { + this.complete(); } else { - this.destination.complete(); + this.openBuffer(); } }; - return OnErrorResumeNextSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); -//# sourceMappingURL=onErrorResumeNext.js.map + BufferWhenSubscriber.prototype.openBuffer = function () { + var closingSubscription = this.closingSubscription; + if (closingSubscription) { + this.remove(closingSubscription); + closingSubscription.unsubscribe(); + } + var buffer = this.buffer; + if (this.buffer) { + this.destination.next(buffer); + } + this.buffer = []; + var closingNotifier; + try { + var closingSelector = this.closingSelector; + closingNotifier = closingSelector(); + } + catch (err) { + return this.error(err); + } + closingSubscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); + this.closingSubscription = closingSubscription; + this.add(closingSubscription); + this.subscribing = true; + closingSubscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, closingNotifier)); + this.subscribing = false; + }; + return BufferWhenSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); +//# sourceMappingURL=bufferWhen.js.map /***/ }), -/* 287 */ +/* 278 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return pairwise; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return catchError; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function pairwise() { - return function (source) { return source.lift(new PairwiseOperator()); }; + + +function catchError(selector) { + return function catchErrorOperatorFunction(source) { + var operator = new CatchOperator(selector); + var caught = source.lift(operator); + return (operator.caught = caught); + }; } -var PairwiseOperator = /*@__PURE__*/ (function () { - function PairwiseOperator() { +var CatchOperator = /*@__PURE__*/ (function () { + function CatchOperator(selector) { + this.selector = selector; } - PairwiseOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new PairwiseSubscriber(subscriber)); + CatchOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new CatchSubscriber(subscriber, this.selector, this.caught)); }; - return PairwiseOperator; + return CatchOperator; }()); -var PairwiseSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](PairwiseSubscriber, _super); - function PairwiseSubscriber(destination) { +var CatchSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CatchSubscriber, _super); + function CatchSubscriber(destination, selector, caught) { var _this = _super.call(this, destination) || this; - _this.hasPrev = false; + _this.selector = selector; + _this.caught = caught; return _this; } - PairwiseSubscriber.prototype._next = function (value) { - var pair; - if (this.hasPrev) { - pair = [this.prev, value]; - } - else { - this.hasPrev = true; - } - this.prev = value; - if (pair) { - this.destination.next(pair); + CatchSubscriber.prototype.error = function (err) { + if (!this.isStopped) { + var result = void 0; + try { + result = this.selector(err, this.caught); + } + catch (err2) { + _super.prototype.error.call(this, err2); + return; + } + this._unsubscribeAndRecycle(); + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined); + this.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, undefined, undefined, innerSubscriber); } }; - return PairwiseSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=pairwise.js.map + return CatchSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=catchError.js.map /***/ }), -/* 288 */ +/* 279 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; }); -/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(289); -/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(251); -/** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return combineAll; }); +/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(228); +/** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */ -function partition(predicate, thisArg) { - return function (source) { - return [ - Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(predicate, thisArg)(source), - Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(source) - ]; - }; +function combineAll(project) { + return function (source) { return source.lift(new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_0__["CombineLatestOperator"](project)); }; } -//# sourceMappingURL=partition.js.map +//# sourceMappingURL=combineAll.js.map /***/ }), -/* 289 */ +/* 280 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "not", function() { return not; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function not(pred, thisArg) { - function notPred() { - return !(notPred.pred.apply(notPred.thisArg, arguments)); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return combineLatest; }); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(178); +/* harmony import */ var _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(228); +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(243); +/** PURE_IMPORTS_START _util_isArray,_observable_combineLatest,_observable_from PURE_IMPORTS_END */ + + + +var none = {}; +function combineLatest() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; } - notPred.pred = pred; - notPred.thisArg = thisArg; - return notPred; + var project = null; + if (typeof observables[observables.length - 1] === 'function') { + project = observables.pop(); + } + if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) { + observables = observables[0].slice(); + } + return function (source) { return source.lift.call(Object(_observable_from__WEBPACK_IMPORTED_MODULE_2__["from"])([source].concat(observables)), new _observable_combineLatest__WEBPACK_IMPORTED_MODULE_1__["CombineLatestOperator"](project)); }; } -//# sourceMappingURL=not.js.map +//# sourceMappingURL=combineLatest.js.map /***/ }), -/* 290 */ +/* 281 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return pluck; }); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(231); -/** PURE_IMPORTS_START _map PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return concat; }); +/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(239); +/** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */ -function pluck() { - var properties = []; +function concat() { + var observables = []; for (var _i = 0; _i < arguments.length; _i++) { - properties[_i] = arguments[_i]; - } - var length = properties.length; - if (length === 0) { - throw new Error('list of properties cannot be empty.'); + observables[_i] = arguments[_i]; } - return function (source) { return Object(_map__WEBPACK_IMPORTED_MODULE_0__["map"])(plucker(properties, length))(source); }; -} -function plucker(props, length) { - var mapper = function (x) { - var currentProp = x; - for (var i = 0; i < length; i++) { - var p = currentProp[props[i]]; - if (typeof p !== 'undefined') { - currentProp = p; - } - else { - return undefined; - } - } - return currentProp; - }; - return mapper; + return function (source) { return source.lift.call(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"].apply(void 0, [source].concat(observables))); }; } -//# sourceMappingURL=pluck.js.map +//# sourceMappingURL=concat.js.map /***/ }), -/* 291 */ +/* 282 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return publish; }); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(265); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(282); -/** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return concatMap; }); +/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(242); +/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */ -function publish(selector) { - return selector ? - Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"](); }, selector) : - Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]()); +function concatMap(project, resultSelector) { + return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(project, resultSelector, 1); } -//# sourceMappingURL=publish.js.map +//# sourceMappingURL=concatMap.js.map /***/ }), -/* 292 */ +/* 283 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return publishBehavior; }); -/* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(293); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(282); -/** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return concatMapTo; }); +/* harmony import */ var _concatMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(282); +/** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */ -function publishBehavior(value) { - return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__["BehaviorSubject"](value))(source); }; +function concatMapTo(innerObservable, resultSelector) { + return Object(_concatMap__WEBPACK_IMPORTED_MODULE_0__["concatMap"])(function () { return innerObservable; }, resultSelector); } -//# sourceMappingURL=publishBehavior.js.map +//# sourceMappingURL=concatMapTo.js.map /***/ }), -/* 293 */ +/* 284 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return BehaviorSubject; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "count", function() { return count; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(266); -/** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */ - +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -var BehaviorSubject = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](BehaviorSubject, _super); - function BehaviorSubject(_value) { - var _this = _super.call(this) || this; - _this._value = _value; +function count(predicate) { + return function (source) { return source.lift(new CountOperator(predicate, source)); }; +} +var CountOperator = /*@__PURE__*/ (function () { + function CountOperator(predicate, source) { + this.predicate = predicate; + this.source = source; + } + CountOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new CountSubscriber(subscriber, this.predicate, this.source)); + }; + return CountOperator; +}()); +var CountSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountSubscriber, _super); + function CountSubscriber(destination, predicate, source) { + var _this = _super.call(this, destination) || this; + _this.predicate = predicate; + _this.source = source; + _this.count = 0; + _this.index = 0; return _this; } - Object.defineProperty(BehaviorSubject.prototype, "value", { - get: function () { - return this.getValue(); - }, - enumerable: true, - configurable: true - }); - BehaviorSubject.prototype._subscribe = function (subscriber) { - var subscription = _super.prototype._subscribe.call(this, subscriber); - if (subscription && !subscription.closed) { - subscriber.next(this._value); + CountSubscriber.prototype._next = function (value) { + if (this.predicate) { + this._tryPredicate(value); + } + else { + this.count++; } - return subscription; }; - BehaviorSubject.prototype.getValue = function () { - if (this.hasError) { - throw this.thrownError; + CountSubscriber.prototype._tryPredicate = function (value) { + var result; + try { + result = this.predicate(value, this.index++, this.source); } - else if (this.closed) { - throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_2__["ObjectUnsubscribedError"](); + catch (err) { + this.destination.error(err); + return; } - else { - return this._value; + if (result) { + this.count++; } }; - BehaviorSubject.prototype.next = function (value) { - _super.prototype.next.call(this, this._value = value); + CountSubscriber.prototype._complete = function () { + this.destination.next(this.count); + this.destination.complete(); }; - return BehaviorSubject; -}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"])); - -//# sourceMappingURL=BehaviorSubject.js.map + return CountSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=count.js.map /***/ }), -/* 294 */ +/* 285 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return publishLast; }); -/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(295); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(282); -/** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */ - - -function publishLast() { - return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__["AsyncSubject"]())(source); }; -} -//# sourceMappingURL=publishLast.js.map +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return debounce; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -/***/ }), -/* 295 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return AsyncSubject; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177); -/** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */ - - - -var AsyncSubject = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsyncSubject, _super); - function AsyncSubject() { - var _this = _super !== null && _super.apply(this, arguments) || this; - _this.value = null; - _this.hasNext = false; - _this.hasCompleted = false; +function debounce(durationSelector) { + return function (source) { return source.lift(new DebounceOperator(durationSelector)); }; +} +var DebounceOperator = /*@__PURE__*/ (function () { + function DebounceOperator(durationSelector) { + this.durationSelector = durationSelector; + } + DebounceOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new DebounceSubscriber(subscriber, this.durationSelector)); + }; + return DebounceOperator; +}()); +var DebounceSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceSubscriber, _super); + function DebounceSubscriber(destination, durationSelector) { + var _this = _super.call(this, destination) || this; + _this.durationSelector = durationSelector; + _this.hasValue = false; + _this.durationSubscription = null; return _this; } - AsyncSubject.prototype._subscribe = function (subscriber) { - if (this.hasError) { - subscriber.error(this.thrownError); - return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY; + DebounceSubscriber.prototype._next = function (value) { + try { + var result = this.durationSelector.call(this, value); + if (result) { + this._tryNext(value, result); + } } - else if (this.hasCompleted && this.hasNext) { - subscriber.next(this.value); - subscriber.complete(); - return _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"].EMPTY; + catch (err) { + this.destination.error(err); } - return _super.prototype._subscribe.call(this, subscriber); }; - AsyncSubject.prototype.next = function (value) { - if (!this.hasCompleted) { - this.value = value; - this.hasNext = true; - } + DebounceSubscriber.prototype._complete = function () { + this.emitValue(); + this.destination.complete(); }; - AsyncSubject.prototype.error = function (error) { - if (!this.hasCompleted) { - _super.prototype.error.call(this, error); + DebounceSubscriber.prototype._tryNext = function (value, duration) { + var subscription = this.durationSubscription; + this.value = value; + this.hasValue = true; + if (subscription) { + subscription.unsubscribe(); + this.remove(subscription); + } + subscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration); + if (subscription && !subscription.closed) { + this.add(this.durationSubscription = subscription); } }; - AsyncSubject.prototype.complete = function () { - this.hasCompleted = true; - if (this.hasNext) { - _super.prototype.next.call(this, this.value); + DebounceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.emitValue(); + }; + DebounceSubscriber.prototype.notifyComplete = function () { + this.emitValue(); + }; + DebounceSubscriber.prototype.emitValue = function () { + if (this.hasValue) { + var value = this.value; + var subscription = this.durationSubscription; + if (subscription) { + this.durationSubscription = null; + subscription.unsubscribe(); + this.remove(subscription); + } + this.value = null; + this.hasValue = false; + _super.prototype._next.call(this, value); } - _super.prototype.complete.call(this); }; - return AsyncSubject; -}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"])); - -//# sourceMappingURL=AsyncSubject.js.map - - -/***/ }), -/* 296 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return publishReplay; }); -/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(297); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(282); -/** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */ - - -function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) { - if (selectorOrScheduler && typeof selectorOrScheduler !== 'function') { - scheduler = selectorOrScheduler; - } - var selector = typeof selectorOrScheduler === 'function' ? selectorOrScheduler : undefined; - var subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler); - return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return subject; }, selector)(source); }; -} -//# sourceMappingURL=publishReplay.js.map + return DebounceSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=debounce.js.map /***/ }), -/* 297 */ +/* 286 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return ReplaySubject; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return debounceTime; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(298); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(177); -/* harmony import */ var _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(285); -/* harmony import */ var _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(266); -/* harmony import */ var _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(267); -/** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */ - - - - +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(215); +/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */ -var ReplaySubject = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ReplaySubject, _super); - function ReplaySubject(bufferSize, windowTime, scheduler) { - if (bufferSize === void 0) { - bufferSize = Number.POSITIVE_INFINITY; - } - if (windowTime === void 0) { - windowTime = Number.POSITIVE_INFINITY; - } - var _this = _super.call(this) || this; +function debounceTime(dueTime, scheduler) { + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"]; + } + return function (source) { return source.lift(new DebounceTimeOperator(dueTime, scheduler)); }; +} +var DebounceTimeOperator = /*@__PURE__*/ (function () { + function DebounceTimeOperator(dueTime, scheduler) { + this.dueTime = dueTime; + this.scheduler = scheduler; + } + DebounceTimeOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new DebounceTimeSubscriber(subscriber, this.dueTime, this.scheduler)); + }; + return DebounceTimeOperator; +}()); +var DebounceTimeSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DebounceTimeSubscriber, _super); + function DebounceTimeSubscriber(destination, dueTime, scheduler) { + var _this = _super.call(this, destination) || this; + _this.dueTime = dueTime; _this.scheduler = scheduler; - _this._events = []; - _this._infiniteTimeWindow = false; - _this._bufferSize = bufferSize < 1 ? 1 : bufferSize; - _this._windowTime = windowTime < 1 ? 1 : windowTime; - if (windowTime === Number.POSITIVE_INFINITY) { - _this._infiniteTimeWindow = true; - _this.next = _this.nextInfiniteTimeWindow; - } - else { - _this.next = _this.nextTimeWindow; - } + _this.debouncedSubscription = null; + _this.lastValue = null; + _this.hasValue = false; return _this; } - ReplaySubject.prototype.nextInfiniteTimeWindow = function (value) { - var _events = this._events; - _events.push(value); - if (_events.length > this._bufferSize) { - _events.shift(); - } - _super.prototype.next.call(this, value); + DebounceTimeSubscriber.prototype._next = function (value) { + this.clearDebounce(); + this.lastValue = value; + this.hasValue = true; + this.add(this.debouncedSubscription = this.scheduler.schedule(dispatchNext, this.dueTime, this)); }; - ReplaySubject.prototype.nextTimeWindow = function (value) { - this._events.push(new ReplayEvent(this._getNow(), value)); - this._trimBufferThenGetEvents(); - _super.prototype.next.call(this, value); + DebounceTimeSubscriber.prototype._complete = function () { + this.debouncedNext(); + this.destination.complete(); }; - ReplaySubject.prototype._subscribe = function (subscriber) { - var _infiniteTimeWindow = this._infiniteTimeWindow; - var _events = _infiniteTimeWindow ? this._events : this._trimBufferThenGetEvents(); - var scheduler = this.scheduler; - var len = _events.length; - var subscription; - if (this.closed) { - throw new _util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_5__["ObjectUnsubscribedError"](); - } - else if (this.isStopped || this.hasError) { - subscription = _Subscription__WEBPACK_IMPORTED_MODULE_3__["Subscription"].EMPTY; - } - else { - this.observers.push(subscriber); - subscription = new _SubjectSubscription__WEBPACK_IMPORTED_MODULE_6__["SubjectSubscription"](this, subscriber); - } - if (scheduler) { - subscriber.add(subscriber = new _operators_observeOn__WEBPACK_IMPORTED_MODULE_4__["ObserveOnSubscriber"](subscriber, scheduler)); - } - if (_infiniteTimeWindow) { - for (var i = 0; i < len && !subscriber.closed; i++) { - subscriber.next(_events[i]); - } - } - else { - for (var i = 0; i < len && !subscriber.closed; i++) { - subscriber.next(_events[i].value); - } - } - if (this.hasError) { - subscriber.error(this.thrownError); - } - else if (this.isStopped) { - subscriber.complete(); + DebounceTimeSubscriber.prototype.debouncedNext = function () { + this.clearDebounce(); + if (this.hasValue) { + var lastValue = this.lastValue; + this.lastValue = null; + this.hasValue = false; + this.destination.next(lastValue); } - return subscription; - }; - ReplaySubject.prototype._getNow = function () { - return (this.scheduler || _scheduler_queue__WEBPACK_IMPORTED_MODULE_2__["queue"]).now(); }; - ReplaySubject.prototype._trimBufferThenGetEvents = function () { - var now = this._getNow(); - var _bufferSize = this._bufferSize; - var _windowTime = this._windowTime; - var _events = this._events; - var eventsCount = _events.length; - var spliceCount = 0; - while (spliceCount < eventsCount) { - if ((now - _events[spliceCount].time) < _windowTime) { - break; - } - spliceCount++; - } - if (eventsCount > _bufferSize) { - spliceCount = Math.max(spliceCount, eventsCount - _bufferSize); - } - if (spliceCount > 0) { - _events.splice(0, spliceCount); + DebounceTimeSubscriber.prototype.clearDebounce = function () { + var debouncedSubscription = this.debouncedSubscription; + if (debouncedSubscription !== null) { + this.remove(debouncedSubscription); + debouncedSubscription.unsubscribe(); + this.debouncedSubscription = null; } - return _events; }; - return ReplaySubject; -}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"])); - -var ReplayEvent = /*@__PURE__*/ (function () { - function ReplayEvent(time, value) { - this.time = time; - this.value = value; - } - return ReplayEvent; -}()); -//# sourceMappingURL=ReplaySubject.js.map + return DebounceTimeSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +function dispatchNext(subscriber) { + subscriber.debouncedNext(); +} +//# sourceMappingURL=debounceTime.js.map /***/ }), -/* 298 */ +/* 287 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "queue", function() { return queue; }); -/* harmony import */ var _QueueAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(299); -/* harmony import */ var _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(300); -/** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return defaultIfEmpty; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -var queue = /*@__PURE__*/ new _QueueScheduler__WEBPACK_IMPORTED_MODULE_1__["QueueScheduler"](_QueueAction__WEBPACK_IMPORTED_MODULE_0__["QueueAction"]); -//# sourceMappingURL=queue.js.map +function defaultIfEmpty(defaultValue) { + if (defaultValue === void 0) { + defaultValue = null; + } + return function (source) { return source.lift(new DefaultIfEmptyOperator(defaultValue)); }; +} +var DefaultIfEmptyOperator = /*@__PURE__*/ (function () { + function DefaultIfEmptyOperator(defaultValue) { + this.defaultValue = defaultValue; + } + DefaultIfEmptyOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new DefaultIfEmptySubscriber(subscriber, this.defaultValue)); + }; + return DefaultIfEmptyOperator; +}()); +var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DefaultIfEmptySubscriber, _super); + function DefaultIfEmptySubscriber(destination, defaultValue) { + var _this = _super.call(this, destination) || this; + _this.defaultValue = defaultValue; + _this.isEmpty = true; + return _this; + } + DefaultIfEmptySubscriber.prototype._next = function (value) { + this.isEmpty = false; + this.destination.next(value); + }; + DefaultIfEmptySubscriber.prototype._complete = function () { + if (this.isEmpty) { + this.destination.next(this.defaultValue); + } + this.destination.complete(); + }; + return DefaultIfEmptySubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=defaultIfEmpty.js.map /***/ }), -/* 299 */ +/* 288 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueAction", function() { return QueueAction; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return delay; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(200); -/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */ +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215); +/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(289); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172); +/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(202); +/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */ -var QueueAction = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueAction, _super); - function QueueAction(scheduler, work) { - var _this = _super.call(this, scheduler, work) || this; + + + +function delay(delay, scheduler) { + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; + } + var absoluteDelay = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(delay); + var delayFor = absoluteDelay ? (+delay - scheduler.now()) : Math.abs(delay); + return function (source) { return source.lift(new DelayOperator(delayFor, scheduler)); }; +} +var DelayOperator = /*@__PURE__*/ (function () { + function DelayOperator(delay, scheduler) { + this.delay = delay; + this.scheduler = scheduler; + } + DelayOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new DelaySubscriber(subscriber, this.delay, this.scheduler)); + }; + return DelayOperator; +}()); +var DelaySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelaySubscriber, _super); + function DelaySubscriber(destination, delay, scheduler) { + var _this = _super.call(this, destination) || this; + _this.delay = delay; _this.scheduler = scheduler; - _this.work = work; + _this.queue = []; + _this.active = false; + _this.errored = false; return _this; } - QueueAction.prototype.schedule = function (state, delay) { - if (delay === void 0) { - delay = 0; + DelaySubscriber.dispatch = function (state) { + var source = state.source; + var queue = source.queue; + var scheduler = state.scheduler; + var destination = state.destination; + while (queue.length > 0 && (queue[0].time - scheduler.now()) <= 0) { + queue.shift().notification.observe(destination); } - if (delay > 0) { - return _super.prototype.schedule.call(this, state, delay); + if (queue.length > 0) { + var delay_1 = Math.max(0, queue[0].time - scheduler.now()); + this.schedule(state, delay_1); + } + else { + this.unsubscribe(); + source.active = false; } - this.delay = delay; - this.state = state; - this.scheduler.flush(this); - return this; }; - QueueAction.prototype.execute = function (state, delay) { - return (delay > 0 || this.closed) ? - _super.prototype.execute.call(this, state, delay) : - this._execute(state, delay); + DelaySubscriber.prototype._schedule = function (scheduler) { + this.active = true; + var destination = this.destination; + destination.add(scheduler.schedule(DelaySubscriber.dispatch, this.delay, { + source: this, destination: this.destination, scheduler: scheduler + })); }; - QueueAction.prototype.requestAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; + DelaySubscriber.prototype.scheduleNotification = function (notification) { + if (this.errored === true) { + return; } - if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) { - return _super.prototype.requestAsyncId.call(this, scheduler, id, delay); + var scheduler = this.scheduler; + var message = new DelayMessage(scheduler.now() + this.delay, notification); + this.queue.push(message); + if (this.active === false) { + this._schedule(scheduler); } - return scheduler.flush(this); }; - return QueueAction; -}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"])); - -//# sourceMappingURL=QueueAction.js.map - - -/***/ }), -/* 300 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueueScheduler", function() { return QueueScheduler; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(202); -/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ - - -var QueueScheduler = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](QueueScheduler, _super); - function QueueScheduler() { - return _super !== null && _super.apply(this, arguments) || this; + DelaySubscriber.prototype._next = function (value) { + this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createNext(value)); + }; + DelaySubscriber.prototype._error = function (err) { + this.errored = true; + this.queue = []; + this.destination.error(err); + this.unsubscribe(); + }; + DelaySubscriber.prototype._complete = function () { + this.scheduleNotification(_Notification__WEBPACK_IMPORTED_MODULE_4__["Notification"].createComplete()); + this.unsubscribe(); + }; + return DelaySubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"])); +var DelayMessage = /*@__PURE__*/ (function () { + function DelayMessage(time, notification) { + this.time = time; + this.notification = notification; } - return QueueScheduler; -}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"])); - -//# sourceMappingURL=QueueScheduler.js.map + return DelayMessage; +}()); +//# sourceMappingURL=delay.js.map /***/ }), -/* 301 */ +/* 289 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; }); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(178); -/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(302); -/** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */ - - -function race() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - return function raceOperatorFunction(source) { - if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) { - observables = observables[0]; - } - return source.lift.call(_observable_race__WEBPACK_IMPORTED_MODULE_1__["race"].apply(void 0, [source].concat(observables))); - }; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isDate", function() { return isDate; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function isDate(value) { + return value instanceof Date && !isNaN(+value); } -//# sourceMappingURL=race.js.map +//# sourceMappingURL=isDate.js.map /***/ }), -/* 302 */ +/* 290 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RaceOperator", function() { return RaceOperator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RaceSubscriber", function() { return RaceSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return delayWhen; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(215); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_util_isArray,_fromArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(170); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function race() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; +function delayWhen(delayDurationSelector, subscriptionDelay) { + if (subscriptionDelay) { + return function (source) { + return new SubscriptionDelayObservable(source, subscriptionDelay) + .lift(new DelayWhenOperator(delayDurationSelector)); + }; } - if (observables.length === 1) { - if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(observables[0])) { - observables = observables[0]; - } - else { - return observables[0]; - } - } - return Object(_fromArray__WEBPACK_IMPORTED_MODULE_2__["fromArray"])(observables, undefined).lift(new RaceOperator()); + return function (source) { return source.lift(new DelayWhenOperator(delayDurationSelector)); }; } -var RaceOperator = /*@__PURE__*/ (function () { - function RaceOperator() { +var DelayWhenOperator = /*@__PURE__*/ (function () { + function DelayWhenOperator(delayDurationSelector) { + this.delayDurationSelector = delayDurationSelector; } - RaceOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new RaceSubscriber(subscriber)); + DelayWhenOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new DelayWhenSubscriber(subscriber, this.delayDurationSelector)); }; - return RaceOperator; + return DelayWhenOperator; }()); - -var RaceSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RaceSubscriber, _super); - function RaceSubscriber(destination) { +var DelayWhenSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DelayWhenSubscriber, _super); + function DelayWhenSubscriber(destination, delayDurationSelector) { var _this = _super.call(this, destination) || this; - _this.hasFirst = false; - _this.observables = []; - _this.subscriptions = []; + _this.delayDurationSelector = delayDurationSelector; + _this.completed = false; + _this.delayNotifierSubscriptions = []; + _this.index = 0; return _this; } - RaceSubscriber.prototype._next = function (observable) { - this.observables.push(observable); + DelayWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.destination.next(outerValue); + this.removeSubscription(innerSub); + this.tryComplete(); }; - RaceSubscriber.prototype._complete = function () { - var observables = this.observables; - var len = observables.length; - if (len === 0) { - this.destination.complete(); + DelayWhenSubscriber.prototype.notifyError = function (error, innerSub) { + this._error(error); + }; + DelayWhenSubscriber.prototype.notifyComplete = function (innerSub) { + var value = this.removeSubscription(innerSub); + if (value) { + this.destination.next(value); } - else { - for (var i = 0; i < len && !this.hasFirst; i++) { - var observable = observables[i]; - var subscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, observable, observable, i); - if (this.subscriptions) { - this.subscriptions.push(subscription); - } - this.add(subscription); + this.tryComplete(); + }; + DelayWhenSubscriber.prototype._next = function (value) { + var index = this.index++; + try { + var delayNotifier = this.delayDurationSelector(value, index); + if (delayNotifier) { + this.tryDelay(delayNotifier, value); } - this.observables = null; + } + catch (err) { + this.destination.error(err); } }; - RaceSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - if (!this.hasFirst) { - this.hasFirst = true; - for (var i = 0; i < this.subscriptions.length; i++) { - if (i !== outerIndex) { - var subscription = this.subscriptions[i]; - subscription.unsubscribe(); - this.remove(subscription); - } - } - this.subscriptions = null; + DelayWhenSubscriber.prototype._complete = function () { + this.completed = true; + this.tryComplete(); + this.unsubscribe(); + }; + DelayWhenSubscriber.prototype.removeSubscription = function (subscription) { + subscription.unsubscribe(); + var subscriptionIdx = this.delayNotifierSubscriptions.indexOf(subscription); + if (subscriptionIdx !== -1) { + this.delayNotifierSubscriptions.splice(subscriptionIdx, 1); } - this.destination.next(innerValue); + return subscription.outerValue; }; - return RaceSubscriber; + DelayWhenSubscriber.prototype.tryDelay = function (delayNotifier, value) { + var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, delayNotifier, value); + if (notifierSubscription && !notifierSubscription.closed) { + var destination = this.destination; + destination.add(notifierSubscription); + this.delayNotifierSubscriptions.push(notifierSubscription); + } + }; + DelayWhenSubscriber.prototype.tryComplete = function () { + if (this.completed && this.delayNotifierSubscriptions.length === 0) { + this.destination.complete(); + } + }; + return DelayWhenSubscriber; }(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); - -//# sourceMappingURL=race.js.map +var SubscriptionDelayObservable = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelayObservable, _super); + function SubscriptionDelayObservable(source, subscriptionDelay) { + var _this = _super.call(this) || this; + _this.source = source; + _this.subscriptionDelay = subscriptionDelay; + return _this; + } + SubscriptionDelayObservable.prototype._subscribe = function (subscriber) { + this.subscriptionDelay.subscribe(new SubscriptionDelaySubscriber(subscriber, this.source)); + }; + return SubscriptionDelayObservable; +}(_Observable__WEBPACK_IMPORTED_MODULE_2__["Observable"])); +var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscriptionDelaySubscriber, _super); + function SubscriptionDelaySubscriber(parent, source) { + var _this = _super.call(this) || this; + _this.parent = parent; + _this.source = source; + _this.sourceSubscribed = false; + return _this; + } + SubscriptionDelaySubscriber.prototype._next = function (unused) { + this.subscribeToSource(); + }; + SubscriptionDelaySubscriber.prototype._error = function (err) { + this.unsubscribe(); + this.parent.error(err); + }; + SubscriptionDelaySubscriber.prototype._complete = function () { + this.unsubscribe(); + this.subscribeToSource(); + }; + SubscriptionDelaySubscriber.prototype.subscribeToSource = function () { + if (!this.sourceSubscribed) { + this.sourceSubscribed = true; + this.unsubscribe(); + this.source.subscribe(this.parent); + } + }; + return SubscriptionDelaySubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=delayWhen.js.map /***/ }), -/* 303 */ +/* 291 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return repeat; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return dematerialize; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(242); -/** PURE_IMPORTS_START tslib,_Subscriber,_observable_empty PURE_IMPORTS_END */ - +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function repeat(count) { - if (count === void 0) { - count = -1; - } - return function (source) { - if (count === 0) { - return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(); - } - else if (count < 0) { - return source.lift(new RepeatOperator(-1, source)); - } - else { - return source.lift(new RepeatOperator(count - 1, source)); - } +function dematerialize() { + return function dematerializeOperatorFunction(source) { + return source.lift(new DeMaterializeOperator()); }; } -var RepeatOperator = /*@__PURE__*/ (function () { - function RepeatOperator(count, source) { - this.count = count; - this.source = source; +var DeMaterializeOperator = /*@__PURE__*/ (function () { + function DeMaterializeOperator() { } - RepeatOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new RepeatSubscriber(subscriber, this.count, this.source)); + DeMaterializeOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new DeMaterializeSubscriber(subscriber)); }; - return RepeatOperator; + return DeMaterializeOperator; }()); -var RepeatSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatSubscriber, _super); - function RepeatSubscriber(destination, count, source) { - var _this = _super.call(this, destination) || this; - _this.count = count; - _this.source = source; - return _this; +var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DeMaterializeSubscriber, _super); + function DeMaterializeSubscriber(destination) { + return _super.call(this, destination) || this; } - RepeatSubscriber.prototype.complete = function () { - if (!this.isStopped) { - var _a = this, source = _a.source, count = _a.count; - if (count === 0) { - return _super.prototype.complete.call(this); - } - else if (count > -1) { - this.count = count - 1; - } - source.subscribe(this._unsubscribeAndRecycle()); - } + DeMaterializeSubscriber.prototype._next = function (value) { + value.observe(this.destination); }; - return RepeatSubscriber; + return DeMaterializeSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=repeat.js.map +//# sourceMappingURL=dematerialize.js.map /***/ }), -/* 304 */ +/* 292 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return repeatWhen; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return distinct; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DistinctSubscriber", function() { return DistinctSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function repeatWhen(notifier) { - return function (source) { return source.lift(new RepeatWhenOperator(notifier)); }; +function distinct(keySelector, flushes) { + return function (source) { return source.lift(new DistinctOperator(keySelector, flushes)); }; } -var RepeatWhenOperator = /*@__PURE__*/ (function () { - function RepeatWhenOperator(notifier) { - this.notifier = notifier; +var DistinctOperator = /*@__PURE__*/ (function () { + function DistinctOperator(keySelector, flushes) { + this.keySelector = keySelector; + this.flushes = flushes; } - RepeatWhenOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new RepeatWhenSubscriber(subscriber, this.notifier, source)); + DistinctOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new DistinctSubscriber(subscriber, this.keySelector, this.flushes)); }; - return RepeatWhenOperator; + return DistinctOperator; }()); -var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatWhenSubscriber, _super); - function RepeatWhenSubscriber(destination, notifier, source) { +var DistinctSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctSubscriber, _super); + function DistinctSubscriber(destination, keySelector, flushes) { var _this = _super.call(this, destination) || this; - _this.notifier = notifier; - _this.source = source; - _this.sourceIsBeingSubscribedTo = true; + _this.keySelector = keySelector; + _this.values = new Set(); + if (flushes) { + _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, flushes)); + } return _this; } - RepeatWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.sourceIsBeingSubscribedTo = true; - this.source.subscribe(this); - }; - RepeatWhenSubscriber.prototype.notifyComplete = function (innerSub) { - if (this.sourceIsBeingSubscribedTo === false) { - return _super.prototype.complete.call(this); - } + DistinctSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.values.clear(); }; - RepeatWhenSubscriber.prototype.complete = function () { - this.sourceIsBeingSubscribedTo = false; - if (!this.isStopped) { - if (!this.retries) { - this.subscribeToRetries(); - } - if (!this.retriesSubscription || this.retriesSubscription.closed) { - return _super.prototype.complete.call(this); - } - this._unsubscribeAndRecycle(); - this.notifications.next(); - } + DistinctSubscriber.prototype.notifyError = function (error, innerSub) { + this._error(error); }; - RepeatWhenSubscriber.prototype._unsubscribe = function () { - var _a = this, notifications = _a.notifications, retriesSubscription = _a.retriesSubscription; - if (notifications) { - notifications.unsubscribe(); - this.notifications = null; + DistinctSubscriber.prototype._next = function (value) { + if (this.keySelector) { + this._useKeySelector(value); } - if (retriesSubscription) { - retriesSubscription.unsubscribe(); - this.retriesSubscription = null; + else { + this._finalizeNext(value, value); } - this.retries = null; - }; - RepeatWhenSubscriber.prototype._unsubscribeAndRecycle = function () { - var _unsubscribe = this._unsubscribe; - this._unsubscribe = null; - _super.prototype._unsubscribeAndRecycle.call(this); - this._unsubscribe = _unsubscribe; - return this; }; - RepeatWhenSubscriber.prototype.subscribeToRetries = function () { - this.notifications = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); - var retries; + DistinctSubscriber.prototype._useKeySelector = function (value) { + var key; + var destination = this.destination; try { - var notifier = this.notifier; - retries = notifier(this.notifications); + key = this.keySelector(value); } - catch (e) { - return _super.prototype.complete.call(this); + catch (err) { + destination.error(err); + return; } - this.retries = retries; - this.retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries); + this._finalizeNext(key, value); }; - return RepeatWhenSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); -//# sourceMappingURL=repeatWhen.js.map + DistinctSubscriber.prototype._finalizeNext = function (key, value) { + var values = this.values; + if (!values.has(key)) { + values.add(key); + this.destination.next(value); + } + }; + return DistinctSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); + +//# sourceMappingURL=distinct.js.map /***/ }), -/* 305 */ +/* 293 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return retry; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return distinctUntilChanged; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function retry(count) { - if (count === void 0) { - count = -1; - } - return function (source) { return source.lift(new RetryOperator(count, source)); }; +function distinctUntilChanged(compare, keySelector) { + return function (source) { return source.lift(new DistinctUntilChangedOperator(compare, keySelector)); }; } -var RetryOperator = /*@__PURE__*/ (function () { - function RetryOperator(count, source) { - this.count = count; - this.source = source; +var DistinctUntilChangedOperator = /*@__PURE__*/ (function () { + function DistinctUntilChangedOperator(compare, keySelector) { + this.compare = compare; + this.keySelector = keySelector; } - RetryOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new RetrySubscriber(subscriber, this.count, this.source)); + DistinctUntilChangedOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new DistinctUntilChangedSubscriber(subscriber, this.compare, this.keySelector)); }; - return RetryOperator; + return DistinctUntilChangedOperator; }()); -var RetrySubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetrySubscriber, _super); - function RetrySubscriber(destination, count, source) { +var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](DistinctUntilChangedSubscriber, _super); + function DistinctUntilChangedSubscriber(destination, compare, keySelector) { var _this = _super.call(this, destination) || this; - _this.count = count; - _this.source = source; + _this.keySelector = keySelector; + _this.hasKey = false; + if (typeof compare === 'function') { + _this.compare = compare; + } return _this; } - RetrySubscriber.prototype.error = function (err) { - if (!this.isStopped) { - var _a = this, source = _a.source, count = _a.count; - if (count === 0) { - return _super.prototype.error.call(this, err); + DistinctUntilChangedSubscriber.prototype.compare = function (x, y) { + return x === y; + }; + DistinctUntilChangedSubscriber.prototype._next = function (value) { + var key; + try { + var keySelector = this.keySelector; + key = keySelector ? keySelector(value) : value; + } + catch (err) { + return this.destination.error(err); + } + var result = false; + if (this.hasKey) { + try { + var compare = this.compare; + result = compare(this.key, key); } - else if (count > -1) { - this.count = count - 1; + catch (err) { + return this.destination.error(err); } - source.subscribe(this._unsubscribeAndRecycle()); + } + else { + this.hasKey = true; + } + if (!result) { + this.key = key; + this.destination.next(value); } }; - return RetrySubscriber; + return DistinctUntilChangedSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=retry.js.map +//# sourceMappingURL=distinctUntilChanged.js.map /***/ }), -/* 306 */ +/* 294 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return retryWhen; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return distinctUntilKeyChanged; }); +/* harmony import */ var _distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(293); +/** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */ + +function distinctUntilKeyChanged(key, compare) { + return Object(_distinctUntilChanged__WEBPACK_IMPORTED_MODULE_0__["distinctUntilChanged"])(function (x, y) { return compare ? compare(x[key], y[key]) : x[key] === y[key]; }); +} +//# sourceMappingURL=distinctUntilKeyChanged.js.map +/***/ }), +/* 295 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return elementAt; }); +/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(222); +/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(264); +/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(296); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(287); +/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(297); +/** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */ -function retryWhen(notifier) { - return function (source) { return source.lift(new RetryWhenOperator(notifier, source)); }; -} -var RetryWhenOperator = /*@__PURE__*/ (function () { - function RetryWhenOperator(notifier, source) { - this.notifier = notifier; - this.source = source; - } - RetryWhenOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new RetryWhenSubscriber(subscriber, this.notifier, this.source)); - }; - return RetryWhenOperator; -}()); -var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetryWhenSubscriber, _super); - function RetryWhenSubscriber(destination, notifier, source) { - var _this = _super.call(this, destination) || this; - _this.notifier = notifier; - _this.source = source; - return _this; + + + + +function elementAt(index, defaultValue) { + if (index < 0) { + throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"](); } - RetryWhenSubscriber.prototype.error = function (err) { - if (!this.isStopped) { - var errors = this.errors; - var retries = this.retries; - var retriesSubscription = this.retriesSubscription; - if (!retries) { - errors = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); - try { - var notifier = this.notifier; - retries = notifier(errors); - } - catch (e) { - return _super.prototype.error.call(this, e); - } - retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries); - } - else { - this.errors = null; - this.retriesSubscription = null; - } - this._unsubscribeAndRecycle(); - this.errors = errors; - this.retries = retries; - this.retriesSubscription = retriesSubscription; - errors.next(err); - } - }; - RetryWhenSubscriber.prototype._unsubscribe = function () { - var _a = this, errors = _a.errors, retriesSubscription = _a.retriesSubscription; - if (errors) { - errors.unsubscribe(); - this.errors = null; - } - if (retriesSubscription) { - retriesSubscription.unsubscribe(); - this.retriesSubscription = null; - } - this.retries = null; - }; - RetryWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - var _unsubscribe = this._unsubscribe; - this._unsubscribe = null; - this._unsubscribeAndRecycle(); - this._unsubscribe = _unsubscribe; - this.source.subscribe(this); + var hasDefaultValue = arguments.length >= 2; + return function (source) { + return source.pipe(Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return i === index; }), Object(_take__WEBPACK_IMPORTED_MODULE_4__["take"])(1), hasDefaultValue + ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue) + : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_2__["throwIfEmpty"])(function () { return new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_0__["ArgumentOutOfRangeError"](); })); }; - return RetryWhenSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); -//# sourceMappingURL=retryWhen.js.map +} +//# sourceMappingURL=elementAt.js.map /***/ }), -/* 307 */ +/* 296 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return sample; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return throwIfEmpty; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(223); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_util_EmptyError,_Subscriber PURE_IMPORTS_END */ -function sample(notifier) { - return function (source) { return source.lift(new SampleOperator(notifier)); }; -} -var SampleOperator = /*@__PURE__*/ (function () { - function SampleOperator(notifier) { - this.notifier = notifier; - } - SampleOperator.prototype.call = function (subscriber, source) { - var sampleSubscriber = new SampleSubscriber(subscriber); - var subscription = source.subscribe(sampleSubscriber); - subscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(sampleSubscriber, this.notifier)); - return subscription; - }; - return SampleOperator; -}()); -var SampleSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleSubscriber, _super); - function SampleSubscriber() { - var _this = _super !== null && _super.apply(this, arguments) || this; - _this.hasValue = false; - return _this; +function throwIfEmpty(errorFactory) { + if (errorFactory === void 0) { + errorFactory = defaultErrorFactory; } - SampleSubscriber.prototype._next = function (value) { - this.value = value; - this.hasValue = true; - }; - SampleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.emitValue(); - }; - SampleSubscriber.prototype.notifyComplete = function () { - this.emitValue(); - }; - SampleSubscriber.prototype.emitValue = function () { - if (this.hasValue) { - this.hasValue = false; - this.destination.next(this.value); - } + return function (source) { + return source.lift(new ThrowIfEmptyOperator(errorFactory)); }; - return SampleSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=sample.js.map - - -/***/ }), -/* 308 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return sampleTime; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(199); -/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */ - - - -function sampleTime(period, scheduler) { - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"]; - } - return function (source) { return source.lift(new SampleTimeOperator(period, scheduler)); }; } -var SampleTimeOperator = /*@__PURE__*/ (function () { - function SampleTimeOperator(period, scheduler) { - this.period = period; - this.scheduler = scheduler; +var ThrowIfEmptyOperator = /*@__PURE__*/ (function () { + function ThrowIfEmptyOperator(errorFactory) { + this.errorFactory = errorFactory; } - SampleTimeOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new SampleTimeSubscriber(subscriber, this.period, this.scheduler)); + ThrowIfEmptyOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ThrowIfEmptySubscriber(subscriber, this.errorFactory)); }; - return SampleTimeOperator; + return ThrowIfEmptyOperator; }()); -var SampleTimeSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleTimeSubscriber, _super); - function SampleTimeSubscriber(destination, period, scheduler) { +var ThrowIfEmptySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrowIfEmptySubscriber, _super); + function ThrowIfEmptySubscriber(destination, errorFactory) { var _this = _super.call(this, destination) || this; - _this.period = period; - _this.scheduler = scheduler; + _this.errorFactory = errorFactory; _this.hasValue = false; - _this.add(scheduler.schedule(dispatchNotification, period, { subscriber: _this, period: period })); return _this; } - SampleTimeSubscriber.prototype._next = function (value) { - this.lastValue = value; + ThrowIfEmptySubscriber.prototype._next = function (value) { this.hasValue = true; + this.destination.next(value); }; - SampleTimeSubscriber.prototype.notifyNext = function () { - if (this.hasValue) { - this.hasValue = false; - this.destination.next(this.lastValue); + ThrowIfEmptySubscriber.prototype._complete = function () { + if (!this.hasValue) { + var err = void 0; + try { + err = this.errorFactory(); + } + catch (e) { + err = e; + } + this.destination.error(err); + } + else { + return this.destination.complete(); } }; - return SampleTimeSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -function dispatchNotification(state) { - var subscriber = state.subscriber, period = state.period; - subscriber.notifyNext(); - this.schedule(state, period); + return ThrowIfEmptySubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_2__["Subscriber"])); +function defaultErrorFactory() { + return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_1__["EmptyError"](); } -//# sourceMappingURL=sampleTime.js.map +//# sourceMappingURL=throwIfEmpty.js.map /***/ }), -/* 309 */ +/* 297 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return sequenceEqual; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceEqualOperator", function() { return SequenceEqualOperator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceEqualSubscriber", function() { return SequenceEqualSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "take", function() { return take; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(222); +/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(203); +/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ -function sequenceEqual(compareTo, comparator) { - return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparator)); }; -} -var SequenceEqualOperator = /*@__PURE__*/ (function () { - function SequenceEqualOperator(compareTo, comparator) { - this.compareTo = compareTo; - this.comparator = comparator; - } - SequenceEqualOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparator)); - }; - return SequenceEqualOperator; -}()); -var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualSubscriber, _super); - function SequenceEqualSubscriber(destination, compareTo, comparator) { - var _this = _super.call(this, destination) || this; - _this.compareTo = compareTo; - _this.comparator = comparator; - _this._a = []; - _this._b = []; - _this._oneComplete = false; - _this.destination.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this))); - return _this; - } - SequenceEqualSubscriber.prototype._next = function (value) { - if (this._oneComplete && this._b.length === 0) { - this.emit(false); - } - else { - this._a.push(value); - this.checkValues(); - } - }; - SequenceEqualSubscriber.prototype._complete = function () { - if (this._oneComplete) { - this.emit(this._a.length === 0 && this._b.length === 0); - } - else { - this._oneComplete = true; - } - this.unsubscribe(); - }; - SequenceEqualSubscriber.prototype.checkValues = function () { - var _c = this, _a = _c._a, _b = _c._b, comparator = _c.comparator; - while (_a.length > 0 && _b.length > 0) { - var a = _a.shift(); - var b = _b.shift(); - var areEqual = false; - try { - areEqual = comparator ? comparator(a, b) : a === b; - } - catch (e) { - this.destination.error(e); - } - if (!areEqual) { - this.emit(false); - } - } - }; - SequenceEqualSubscriber.prototype.emit = function (value) { - var destination = this.destination; - destination.next(value); - destination.complete(); - }; - SequenceEqualSubscriber.prototype.nextB = function (value) { - if (this._oneComplete && this._a.length === 0) { - this.emit(false); + +function take(count) { + return function (source) { + if (count === 0) { + return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])(); } else { - this._b.push(value); - this.checkValues(); + return source.lift(new TakeOperator(count)); } }; - SequenceEqualSubscriber.prototype.completeB = function () { - if (this._oneComplete) { - this.emit(this._a.length === 0 && this._b.length === 0); - } - else { - this._oneComplete = true; +} +var TakeOperator = /*@__PURE__*/ (function () { + function TakeOperator(total) { + this.total = total; + if (this.total < 0) { + throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"]; } + } + TakeOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new TakeSubscriber(subscriber, this.total)); }; - return SequenceEqualSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); - -var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualCompareToSubscriber, _super); - function SequenceEqualCompareToSubscriber(destination, parent) { + return TakeOperator; +}()); +var TakeSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeSubscriber, _super); + function TakeSubscriber(destination, total) { var _this = _super.call(this, destination) || this; - _this.parent = parent; + _this.total = total; + _this.count = 0; return _this; } - SequenceEqualCompareToSubscriber.prototype._next = function (value) { - this.parent.nextB(value); - }; - SequenceEqualCompareToSubscriber.prototype._error = function (err) { - this.parent.error(err); - this.unsubscribe(); - }; - SequenceEqualCompareToSubscriber.prototype._complete = function () { - this.parent.completeB(); - this.unsubscribe(); + TakeSubscriber.prototype._next = function (value) { + var total = this.total; + var count = ++this.count; + if (count <= total) { + this.destination.next(value); + if (count === total) { + this.destination.complete(); + this.unsubscribe(); + } + } }; - return SequenceEqualCompareToSubscriber; + return TakeSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=sequenceEqual.js.map +//# sourceMappingURL=take.js.map /***/ }), -/* 310 */ +/* 298 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "share", function() { return share; }); -/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(282); -/* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(284); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(265); -/** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */ - - - -function shareSubjectFactory() { - return new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"](); -} -function share() { - return function (source) { return Object(_refCount__WEBPACK_IMPORTED_MODULE_1__["refCount"])()(Object(_multicast__WEBPACK_IMPORTED_MODULE_0__["multicast"])(shareSubjectFactory)(source)); }; -} -//# sourceMappingURL=share.js.map - - -/***/ }), -/* 311 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return endWith; }); +/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(239); +/* harmony import */ var _observable_of__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(204); +/** PURE_IMPORTS_START _observable_concat,_observable_of PURE_IMPORTS_END */ -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return shareReplay; }); -/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(297); -/** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */ -function shareReplay(configOrBufferSize, windowTime, scheduler) { - var config; - if (configOrBufferSize && typeof configOrBufferSize === 'object') { - config = configOrBufferSize; - } - else { - config = { - bufferSize: configOrBufferSize, - windowTime: windowTime, - refCount: false, - scheduler: scheduler - }; +function endWith() { + var array = []; + for (var _i = 0; _i < arguments.length; _i++) { + array[_i] = arguments[_i]; } - return function (source) { return source.lift(shareReplayOperator(config)); }; -} -function shareReplayOperator(_a) { - var _b = _a.bufferSize, bufferSize = _b === void 0 ? Number.POSITIVE_INFINITY : _b, _c = _a.windowTime, windowTime = _c === void 0 ? Number.POSITIVE_INFINITY : _c, useRefCount = _a.refCount, scheduler = _a.scheduler; - var subject; - var refCount = 0; - var subscription; - var hasError = false; - var isComplete = false; - return function shareReplayOperation(source) { - refCount++; - if (!subject || hasError) { - hasError = false; - subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler); - subscription = source.subscribe({ - next: function (value) { subject.next(value); }, - error: function (err) { - hasError = true; - subject.error(err); - }, - complete: function () { - isComplete = true; - subject.complete(); - }, - }); - } - var innerSub = subject.subscribe(this); - this.add(function () { - refCount--; - innerSub.unsubscribe(); - if (subscription && !isComplete && useRefCount && refCount === 0) { - subscription.unsubscribe(); - subscription = undefined; - subject = undefined; - } - }); - }; + return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(source, _observable_of__WEBPACK_IMPORTED_MODULE_1__["of"].apply(void 0, array)); }; } -//# sourceMappingURL=shareReplay.js.map +//# sourceMappingURL=endWith.js.map /***/ }), -/* 312 */ +/* 299 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "single", function() { return single; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "every", function() { return every; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(253); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_EmptyError PURE_IMPORTS_END */ - +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function single(predicate) { - return function (source) { return source.lift(new SingleOperator(predicate, source)); }; +function every(predicate, thisArg) { + return function (source) { return source.lift(new EveryOperator(predicate, thisArg, source)); }; } -var SingleOperator = /*@__PURE__*/ (function () { - function SingleOperator(predicate, source) { +var EveryOperator = /*@__PURE__*/ (function () { + function EveryOperator(predicate, thisArg, source) { this.predicate = predicate; + this.thisArg = thisArg; this.source = source; } - SingleOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new SingleSubscriber(subscriber, this.predicate, this.source)); + EveryOperator.prototype.call = function (observer, source) { + return source.subscribe(new EverySubscriber(observer, this.predicate, this.thisArg, this.source)); }; - return SingleOperator; + return EveryOperator; }()); -var SingleSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SingleSubscriber, _super); - function SingleSubscriber(destination, predicate, source) { +var EverySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](EverySubscriber, _super); + function EverySubscriber(destination, predicate, thisArg, source) { var _this = _super.call(this, destination) || this; _this.predicate = predicate; + _this.thisArg = thisArg; _this.source = source; - _this.seenValue = false; _this.index = 0; + _this.thisArg = thisArg || _this; return _this; } - SingleSubscriber.prototype.applySingleValue = function (value) { - if (this.seenValue) { - this.destination.error('Sequence contains more than one element'); - } - else { - this.seenValue = true; - this.singleValue = value; - } - }; - SingleSubscriber.prototype._next = function (value) { - var index = this.index++; - if (this.predicate) { - this.tryNext(value, index); - } - else { - this.applySingleValue(value); - } + EverySubscriber.prototype.notifyComplete = function (everyValueMatch) { + this.destination.next(everyValueMatch); + this.destination.complete(); }; - SingleSubscriber.prototype.tryNext = function (value, index) { + EverySubscriber.prototype._next = function (value) { + var result = false; try { - if (this.predicate(value, index, this.source)) { - this.applySingleValue(value); - } + result = this.predicate.call(this.thisArg, value, this.index++, this.source); } catch (err) { this.destination.error(err); + return; } - }; - SingleSubscriber.prototype._complete = function () { - var destination = this.destination; - if (this.index > 0) { - destination.next(this.seenValue ? this.singleValue : undefined); - destination.complete(); - } - else { - destination.error(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__["EmptyError"]); + if (!result) { + this.notifyComplete(false); } }; - return SingleSubscriber; + EverySubscriber.prototype._complete = function () { + this.notifyComplete(true); + }; + return EverySubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=single.js.map +//# sourceMappingURL=every.js.map /***/ }), -/* 313 */ +/* 300 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return skip; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return exhaust; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function skip(count) { - return function (source) { return source.lift(new SkipOperator(count)); }; + +function exhaust() { + return function (source) { return source.lift(new SwitchFirstOperator()); }; } -var SkipOperator = /*@__PURE__*/ (function () { - function SkipOperator(total) { - this.total = total; +var SwitchFirstOperator = /*@__PURE__*/ (function () { + function SwitchFirstOperator() { } - SkipOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new SkipSubscriber(subscriber, this.total)); + SwitchFirstOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new SwitchFirstSubscriber(subscriber)); }; - return SkipOperator; + return SwitchFirstOperator; }()); -var SkipSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipSubscriber, _super); - function SkipSubscriber(destination, total) { +var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchFirstSubscriber, _super); + function SwitchFirstSubscriber(destination) { var _this = _super.call(this, destination) || this; - _this.total = total; - _this.count = 0; + _this.hasCompleted = false; + _this.hasSubscription = false; return _this; } - SkipSubscriber.prototype._next = function (x) { - if (++this.count > this.total) { - this.destination.next(x); + SwitchFirstSubscriber.prototype._next = function (value) { + if (!this.hasSubscription) { + this.hasSubscription = true; + this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, value)); } }; - return SkipSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=skip.js.map + SwitchFirstSubscriber.prototype._complete = function () { + this.hasCompleted = true; + if (!this.hasSubscription) { + this.destination.complete(); + } + }; + SwitchFirstSubscriber.prototype.notifyComplete = function (innerSub) { + this.remove(innerSub); + this.hasSubscription = false; + if (this.hasCompleted) { + this.destination.complete(); + } + }; + return SwitchFirstSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=exhaust.js.map /***/ }), -/* 314 */ +/* 301 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return skipLast; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return exhaustMap; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError PURE_IMPORTS_END */ +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(230); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(226); +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(243); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ -function skipLast(count) { - return function (source) { return source.lift(new SkipLastOperator(count)); }; -} -var SkipLastOperator = /*@__PURE__*/ (function () { - function SkipLastOperator(_skipCount) { - this._skipCount = _skipCount; - if (this._skipCount < 0) { - throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"]; - } + + + +function exhaustMap(project, resultSelector) { + if (resultSelector) { + return function (source) { return source.pipe(exhaustMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; } - SkipLastOperator.prototype.call = function (subscriber, source) { - if (this._skipCount === 0) { - return source.subscribe(new _Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"](subscriber)); - } - else { - return source.subscribe(new SkipLastSubscriber(subscriber, this._skipCount)); - } + return function (source) { + return source.lift(new ExhaustMapOperator(project)); }; - return SkipLastOperator; -}()); -var SkipLastSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipLastSubscriber, _super); - function SkipLastSubscriber(destination, _skipCount) { +} +var ExhaustMapOperator = /*@__PURE__*/ (function () { + function ExhaustMapOperator(project) { + this.project = project; + } + ExhaustMapOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ExhaustMapSubscriber(subscriber, this.project)); + }; + return ExhaustMapOperator; +}()); +var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExhaustMapSubscriber, _super); + function ExhaustMapSubscriber(destination, project) { var _this = _super.call(this, destination) || this; - _this._skipCount = _skipCount; - _this._count = 0; - _this._ring = new Array(_skipCount); + _this.project = project; + _this.hasSubscription = false; + _this.hasCompleted = false; + _this.index = 0; return _this; } - SkipLastSubscriber.prototype._next = function (value) { - var skipCount = this._skipCount; - var count = this._count++; - if (count < skipCount) { - this._ring[count] = value; + ExhaustMapSubscriber.prototype._next = function (value) { + if (!this.hasSubscription) { + this.tryNext(value); } - else { - var currentIndex = count % skipCount; - var ring = this._ring; - var oldValue = ring[currentIndex]; - ring[currentIndex] = value; - this.destination.next(oldValue); + }; + ExhaustMapSubscriber.prototype.tryNext = function (value) { + var result; + var index = this.index++; + try { + result = this.project(value, index); + } + catch (err) { + this.destination.error(err); + return; } + this.hasSubscription = true; + this._innerSub(result, value, index); }; - return SkipLastSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=skipLast.js.map + ExhaustMapSubscriber.prototype._innerSub = function (result, value, index) { + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined); + var destination = this.destination; + destination.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, value, index, innerSubscriber); + }; + ExhaustMapSubscriber.prototype._complete = function () { + this.hasCompleted = true; + if (!this.hasSubscription) { + this.destination.complete(); + } + this.unsubscribe(); + }; + ExhaustMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.destination.next(innerValue); + }; + ExhaustMapSubscriber.prototype.notifyError = function (err) { + this.destination.error(err); + }; + ExhaustMapSubscriber.prototype.notifyComplete = function (innerSub) { + var destination = this.destination; + destination.remove(innerSub); + this.hasSubscription = false; + if (this.hasCompleted) { + this.destination.complete(); + } + }; + return ExhaustMapSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=exhaustMap.js.map /***/ }), -/* 315 */ +/* 302 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return skipUntil; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return expand; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandOperator", function() { return ExpandOperator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ExpandSubscriber", function() { return ExpandSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function skipUntil(notifier) { - return function (source) { return source.lift(new SkipUntilOperator(notifier)); }; +function expand(project, concurrent, scheduler) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; + } + if (scheduler === void 0) { + scheduler = undefined; + } + concurrent = (concurrent || 0) < 1 ? Number.POSITIVE_INFINITY : concurrent; + return function (source) { return source.lift(new ExpandOperator(project, concurrent, scheduler)); }; } -var SkipUntilOperator = /*@__PURE__*/ (function () { - function SkipUntilOperator(notifier) { - this.notifier = notifier; +var ExpandOperator = /*@__PURE__*/ (function () { + function ExpandOperator(project, concurrent, scheduler) { + this.project = project; + this.concurrent = concurrent; + this.scheduler = scheduler; } - SkipUntilOperator.prototype.call = function (destination, source) { - return source.subscribe(new SkipUntilSubscriber(destination, this.notifier)); + ExpandOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ExpandSubscriber(subscriber, this.project, this.concurrent, this.scheduler)); }; - return SkipUntilOperator; + return ExpandOperator; }()); -var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipUntilSubscriber, _super); - function SkipUntilSubscriber(destination, notifier) { + +var ExpandSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ExpandSubscriber, _super); + function ExpandSubscriber(destination, project, concurrent, scheduler) { var _this = _super.call(this, destination) || this; - _this.hasValue = false; - var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](_this, undefined, undefined); - _this.add(innerSubscriber); - _this.innerSubscription = innerSubscriber; - Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(_this, notifier, undefined, undefined, innerSubscriber); + _this.project = project; + _this.concurrent = concurrent; + _this.scheduler = scheduler; + _this.index = 0; + _this.active = 0; + _this.hasCompleted = false; + if (concurrent < Number.POSITIVE_INFINITY) { + _this.buffer = []; + } return _this; } - SkipUntilSubscriber.prototype._next = function (value) { - if (this.hasValue) { - _super.prototype._next.call(this, value); + ExpandSubscriber.dispatch = function (arg) { + var subscriber = arg.subscriber, result = arg.result, value = arg.value, index = arg.index; + subscriber.subscribeToProjection(result, value, index); + }; + ExpandSubscriber.prototype._next = function (value) { + var destination = this.destination; + if (destination.closed) { + this._complete(); + return; + } + var index = this.index++; + if (this.active < this.concurrent) { + destination.next(value); + try { + var project = this.project; + var result = project(value, index); + if (!this.scheduler) { + this.subscribeToProjection(result, value, index); + } + else { + var state = { subscriber: this, result: result, value: value, index: index }; + var destination_1 = this.destination; + destination_1.add(this.scheduler.schedule(ExpandSubscriber.dispatch, 0, state)); + } + } + catch (e) { + destination.error(e); + } + } + else { + this.buffer.push(value); } }; - SkipUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.hasValue = true; - if (this.innerSubscription) { - this.innerSubscription.unsubscribe(); + ExpandSubscriber.prototype.subscribeToProjection = function (result, value, index) { + this.active++; + var destination = this.destination; + destination.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, result, value, index)); + }; + ExpandSubscriber.prototype._complete = function () { + this.hasCompleted = true; + if (this.hasCompleted && this.active === 0) { + this.destination.complete(); } + this.unsubscribe(); }; - SkipUntilSubscriber.prototype.notifyComplete = function () { + ExpandSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this._next(innerValue); }; - return SkipUntilSubscriber; + ExpandSubscriber.prototype.notifyComplete = function (innerSub) { + var buffer = this.buffer; + var destination = this.destination; + destination.remove(innerSub); + this.active--; + if (buffer && buffer.length > 0) { + this._next(buffer.shift()); + } + if (this.hasCompleted && this.active === 0) { + this.destination.complete(); + } + }; + return ExpandSubscriber; }(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=skipUntil.js.map + +//# sourceMappingURL=expand.js.map /***/ }), -/* 316 */ +/* 303 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return skipWhile; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return finalize; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177); +/** PURE_IMPORTS_START tslib,_Subscriber,_Subscription PURE_IMPORTS_END */ + + + +function finalize(callback) { + return function (source) { return source.lift(new FinallyOperator(callback)); }; +} +var FinallyOperator = /*@__PURE__*/ (function () { + function FinallyOperator(callback) { + this.callback = callback; + } + FinallyOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new FinallySubscriber(subscriber, this.callback)); + }; + return FinallyOperator; +}()); +var FinallySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FinallySubscriber, _super); + function FinallySubscriber(destination, callback) { + var _this = _super.call(this, destination) || this; + _this.add(new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](callback)); + return _this; + } + return FinallySubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=finalize.js.map + + +/***/ }), +/* 304 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "find", function() { return find; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FindValueOperator", function() { return FindValueOperator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FindValueSubscriber", function() { return FindValueSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function skipWhile(predicate) { - return function (source) { return source.lift(new SkipWhileOperator(predicate)); }; +function find(predicate, thisArg) { + if (typeof predicate !== 'function') { + throw new TypeError('predicate is not a function'); + } + return function (source) { return source.lift(new FindValueOperator(predicate, source, false, thisArg)); }; } -var SkipWhileOperator = /*@__PURE__*/ (function () { - function SkipWhileOperator(predicate) { +var FindValueOperator = /*@__PURE__*/ (function () { + function FindValueOperator(predicate, source, yieldIndex, thisArg) { this.predicate = predicate; + this.source = source; + this.yieldIndex = yieldIndex; + this.thisArg = thisArg; } - SkipWhileOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new SkipWhileSubscriber(subscriber, this.predicate)); + FindValueOperator.prototype.call = function (observer, source) { + return source.subscribe(new FindValueSubscriber(observer, this.predicate, this.source, this.yieldIndex, this.thisArg)); }; - return SkipWhileOperator; + return FindValueOperator; }()); -var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipWhileSubscriber, _super); - function SkipWhileSubscriber(destination, predicate) { + +var FindValueSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](FindValueSubscriber, _super); + function FindValueSubscriber(destination, predicate, source, yieldIndex, thisArg) { var _this = _super.call(this, destination) || this; _this.predicate = predicate; - _this.skipping = true; + _this.source = source; + _this.yieldIndex = yieldIndex; + _this.thisArg = thisArg; _this.index = 0; return _this; } - SkipWhileSubscriber.prototype._next = function (value) { + FindValueSubscriber.prototype.notifyComplete = function (value) { var destination = this.destination; - if (this.skipping) { - this.tryCallPredicate(value); - } - if (!this.skipping) { - destination.next(value); - } + destination.next(value); + destination.complete(); + this.unsubscribe(); }; - SkipWhileSubscriber.prototype.tryCallPredicate = function (value) { + FindValueSubscriber.prototype._next = function (value) { + var _a = this, predicate = _a.predicate, thisArg = _a.thisArg; + var index = this.index++; try { - var result = this.predicate(value, this.index++); - this.skipping = Boolean(result); + var result = predicate.call(thisArg || this, value, index, this.source); + if (result) { + this.notifyComplete(this.yieldIndex ? index : value); + } } catch (err) { this.destination.error(err); } }; - return SkipWhileSubscriber; + FindValueSubscriber.prototype._complete = function () { + this.notifyComplete(this.yieldIndex ? -1 : undefined); + }; + return FindValueSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=skipWhile.js.map + +//# sourceMappingURL=find.js.map /***/ }), -/* 317 */ +/* 305 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return startWith; }); -/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(226); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(206); -/** PURE_IMPORTS_START _observable_concat,_util_isScheduler PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return findIndex; }); +/* harmony import */ var _operators_find__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(304); +/** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */ +function findIndex(predicate, thisArg) { + return function (source) { return source.lift(new _operators_find__WEBPACK_IMPORTED_MODULE_0__["FindValueOperator"](predicate, source, true, thisArg)); }; +} +//# sourceMappingURL=findIndex.js.map -function startWith() { - var array = []; - for (var _i = 0; _i < arguments.length; _i++) { - array[_i] = arguments[_i]; - } - var scheduler = array[array.length - 1]; - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(scheduler)) { - array.pop(); - return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source, scheduler); }; - } - else { - return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source); }; - } + +/***/ }), +/* 306 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "first", function() { return first; }); +/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(223); +/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(264); +/* harmony import */ var _take__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(297); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(287); +/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(296); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(220); +/** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */ + + + + + + +function first(predicate, defaultValue) { + var hasDefaultValue = arguments.length >= 2; + return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_take__WEBPACK_IMPORTED_MODULE_2__["take"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_3__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_4__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); }; } -//# sourceMappingURL=startWith.js.map +//# sourceMappingURL=first.js.map /***/ }), -/* 318 */ +/* 307 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return subscribeOn; }); -/* harmony import */ var _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(319); -/** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return ignoreElements; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function subscribeOn(scheduler, delay) { - if (delay === void 0) { - delay = 0; - } - return function subscribeOnOperatorFunction(source) { - return source.lift(new SubscribeOnOperator(scheduler, delay)); + +function ignoreElements() { + return function ignoreElementsOperatorFunction(source) { + return source.lift(new IgnoreElementsOperator()); }; } -var SubscribeOnOperator = /*@__PURE__*/ (function () { - function SubscribeOnOperator(scheduler, delay) { - this.scheduler = scheduler; - this.delay = delay; +var IgnoreElementsOperator = /*@__PURE__*/ (function () { + function IgnoreElementsOperator() { } - SubscribeOnOperator.prototype.call = function (subscriber, source) { - return new _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__["SubscribeOnObservable"](source, this.delay, this.scheduler).subscribe(subscriber); + IgnoreElementsOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new IgnoreElementsSubscriber(subscriber)); }; - return SubscribeOnOperator; + return IgnoreElementsOperator; }()); -//# sourceMappingURL=subscribeOn.js.map +var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IgnoreElementsSubscriber, _super); + function IgnoreElementsSubscriber() { + return _super !== null && _super.apply(this, arguments) || this; + } + IgnoreElementsSubscriber.prototype._next = function (unused) { + }; + return IgnoreElementsSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=ignoreElements.js.map /***/ }), -/* 319 */ +/* 308 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubscribeOnObservable", function() { return SubscribeOnObservable; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return isEmpty; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(193); -/* harmony import */ var _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(320); -/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(205); -/** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */ - - +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -var SubscribeOnObservable = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscribeOnObservable, _super); - function SubscribeOnObservable(source, delayTime, scheduler) { - if (delayTime === void 0) { - delayTime = 0; - } - if (scheduler === void 0) { - scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"]; - } - var _this = _super.call(this) || this; - _this.source = source; - _this.delayTime = delayTime; - _this.scheduler = scheduler; - if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_3__["isNumeric"])(delayTime) || delayTime < 0) { - _this.delayTime = 0; - } - if (!scheduler || typeof scheduler.schedule !== 'function') { - _this.scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"]; - } - return _this; +function isEmpty() { + return function (source) { return source.lift(new IsEmptyOperator()); }; +} +var IsEmptyOperator = /*@__PURE__*/ (function () { + function IsEmptyOperator() { } - SubscribeOnObservable.create = function (source, delay, scheduler) { - if (delay === void 0) { - delay = 0; - } - if (scheduler === void 0) { - scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"]; - } - return new SubscribeOnObservable(source, delay, scheduler); + IsEmptyOperator.prototype.call = function (observer, source) { + return source.subscribe(new IsEmptySubscriber(observer)); }; - SubscribeOnObservable.dispatch = function (arg) { - var source = arg.source, subscriber = arg.subscriber; - return this.add(source.subscribe(subscriber)); + return IsEmptyOperator; +}()); +var IsEmptySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](IsEmptySubscriber, _super); + function IsEmptySubscriber(destination) { + return _super.call(this, destination) || this; + } + IsEmptySubscriber.prototype.notifyComplete = function (isEmpty) { + var destination = this.destination; + destination.next(isEmpty); + destination.complete(); }; - SubscribeOnObservable.prototype._subscribe = function (subscriber) { - var delay = this.delayTime; - var source = this.source; - var scheduler = this.scheduler; - return scheduler.schedule(SubscribeOnObservable.dispatch, delay, { - source: source, subscriber: subscriber - }); + IsEmptySubscriber.prototype._next = function (value) { + this.notifyComplete(false); }; - return SubscribeOnObservable; -}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"])); - -//# sourceMappingURL=SubscribeOnObservable.js.map + IsEmptySubscriber.prototype._complete = function () { + this.notifyComplete(true); + }; + return IsEmptySubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=isEmpty.js.map /***/ }), -/* 320 */ +/* 309 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "asap", function() { return asap; }); -/* harmony import */ var _AsapAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(321); -/* harmony import */ var _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(323); -/** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return last; }); +/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(223); +/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(264); +/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(310); +/* harmony import */ var _throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(296); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(287); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(220); +/** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */ -var asap = /*@__PURE__*/ new _AsapScheduler__WEBPACK_IMPORTED_MODULE_1__["AsapScheduler"](_AsapAction__WEBPACK_IMPORTED_MODULE_0__["AsapAction"]); -//# sourceMappingURL=asap.js.map + + + + +function last(predicate, defaultValue) { + var hasDefaultValue = arguments.length >= 2; + return function (source) { return source.pipe(predicate ? Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(function (v, i) { return predicate(v, i, source); }) : _util_identity__WEBPACK_IMPORTED_MODULE_5__["identity"], Object(_takeLast__WEBPACK_IMPORTED_MODULE_2__["takeLast"])(1), hasDefaultValue ? Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_4__["defaultIfEmpty"])(defaultValue) : Object(_throwIfEmpty__WEBPACK_IMPORTED_MODULE_3__["throwIfEmpty"])(function () { return new _util_EmptyError__WEBPACK_IMPORTED_MODULE_0__["EmptyError"](); })); }; +} +//# sourceMappingURL=last.js.map /***/ }), -/* 321 */ +/* 310 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapAction", function() { return AsapAction; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return takeLast; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _util_Immediate__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(322); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(200); -/** PURE_IMPORTS_START tslib,_util_Immediate,_AsyncAction PURE_IMPORTS_END */ +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(222); +/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(203); +/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ -var AsapAction = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapAction, _super); - function AsapAction(scheduler, work) { - var _this = _super.call(this, scheduler, work) || this; - _this.scheduler = scheduler; - _this.work = work; - return _this; - } - AsapAction.prototype.requestAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; + +function takeLast(count) { + return function takeLastOperatorFunction(source) { + if (count === 0) { + return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_3__["empty"])(); } - if (delay !== null && delay > 0) { - return _super.prototype.requestAsyncId.call(this, scheduler, id, delay); + else { + return source.lift(new TakeLastOperator(count)); } - scheduler.actions.push(this); - return scheduler.scheduled || (scheduler.scheduled = _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].setImmediate(scheduler.flush.bind(scheduler, null))); }; - AsapAction.prototype.recycleAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; +} +var TakeLastOperator = /*@__PURE__*/ (function () { + function TakeLastOperator(total) { + this.total = total; + if (this.total < 0) { + throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"]; } - if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) { - return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay); + } + TakeLastOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new TakeLastSubscriber(subscriber, this.total)); + }; + return TakeLastOperator; +}()); +var TakeLastSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeLastSubscriber, _super); + function TakeLastSubscriber(destination, total) { + var _this = _super.call(this, destination) || this; + _this.total = total; + _this.ring = new Array(); + _this.count = 0; + return _this; + } + TakeLastSubscriber.prototype._next = function (value) { + var ring = this.ring; + var total = this.total; + var count = this.count++; + if (ring.length < total) { + ring.push(value); } - if (scheduler.actions.length === 0) { - _util_Immediate__WEBPACK_IMPORTED_MODULE_1__["Immediate"].clearImmediate(id); - scheduler.scheduled = undefined; + else { + var index = count % total; + ring[index] = value; } - return undefined; }; - return AsapAction; -}(_AsyncAction__WEBPACK_IMPORTED_MODULE_2__["AsyncAction"])); - -//# sourceMappingURL=AsapAction.js.map + TakeLastSubscriber.prototype._complete = function () { + var destination = this.destination; + var count = this.count; + if (count > 0) { + var total = this.count >= this.total ? this.total : this.count; + var ring = this.ring; + for (var i = 0; i < total; i++) { + var idx = (count++) % total; + destination.next(ring[idx]); + } + } + destination.complete(); + }; + return TakeLastSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=takeLast.js.map /***/ }), -/* 322 */ +/* 311 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Immediate", function() { return Immediate; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var nextHandle = 1; -var tasksByHandle = {}; -function runIfPresent(handle) { - var cb = tasksByHandle[handle]; - if (cb) { - cb(); - } +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return mapTo; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ + + +function mapTo(value) { + return function (source) { return source.lift(new MapToOperator(value)); }; } -var Immediate = { - setImmediate: function (cb) { - var handle = nextHandle++; - tasksByHandle[handle] = cb; - Promise.resolve().then(function () { return runIfPresent(handle); }); - return handle; - }, - clearImmediate: function (handle) { - delete tasksByHandle[handle]; - }, -}; -//# sourceMappingURL=Immediate.js.map +var MapToOperator = /*@__PURE__*/ (function () { + function MapToOperator(value) { + this.value = value; + } + MapToOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new MapToSubscriber(subscriber, this.value)); + }; + return MapToOperator; +}()); +var MapToSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MapToSubscriber, _super); + function MapToSubscriber(destination, value) { + var _this = _super.call(this, destination) || this; + _this.value = value; + return _this; + } + MapToSubscriber.prototype._next = function (x) { + this.destination.next(this.value); + }; + return MapToSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=mapTo.js.map /***/ }), -/* 323 */ +/* 312 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AsapScheduler", function() { return AsapScheduler; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return materialize; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(202); -/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _Notification__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(202); +/** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */ -var AsapScheduler = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AsapScheduler, _super); - function AsapScheduler() { - return _super !== null && _super.apply(this, arguments) || this; + +function materialize() { + return function materializeOperatorFunction(source) { + return source.lift(new MaterializeOperator()); + }; +} +var MaterializeOperator = /*@__PURE__*/ (function () { + function MaterializeOperator() { } - AsapScheduler.prototype.flush = function (action) { - this.active = true; - this.scheduled = undefined; - var actions = this.actions; - var error; - var index = -1; - var count = actions.length; - action = action || actions.shift(); - do { - if (error = action.execute(action.state, action.delay)) { - break; - } - } while (++index < count && (action = actions.shift())); - this.active = false; - if (error) { - while (++index < count && (action = actions.shift())) { - action.unsubscribe(); - } - throw error; - } + MaterializeOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new MaterializeSubscriber(subscriber)); }; - return AsapScheduler; -}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"])); - -//# sourceMappingURL=AsapScheduler.js.map + return MaterializeOperator; +}()); +var MaterializeSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MaterializeSubscriber, _super); + function MaterializeSubscriber(destination) { + return _super.call(this, destination) || this; + } + MaterializeSubscriber.prototype._next = function (value) { + this.destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createNext(value)); + }; + MaterializeSubscriber.prototype._error = function (err) { + var destination = this.destination; + destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createError(err)); + destination.complete(); + }; + MaterializeSubscriber.prototype._complete = function () { + var destination = this.destination; + destination.next(_Notification__WEBPACK_IMPORTED_MODULE_2__["Notification"].createComplete()); + destination.complete(); + }; + return MaterializeSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=materialize.js.map /***/ }), -/* 324 */ +/* 313 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return switchAll; }); -/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(325); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232); -/** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */ - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "max", function() { return max; }); +/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(314); +/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ -function switchAll() { - return Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]); +function max(comparer) { + var max = (typeof comparer === 'function') + ? function (x, y) { return comparer(x, y) > 0 ? x : y; } + : function (x, y) { return x > y ? x : y; }; + return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(max); } -//# sourceMappingURL=switchAll.js.map +//# sourceMappingURL=max.js.map /***/ }), -/* 325 */ +/* 314 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return switchMap; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(183); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231); -/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(218); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return reduce; }); +/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(315); +/* harmony import */ var _takeLast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(310); +/* harmony import */ var _defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(287); +/* harmony import */ var _util_pipe__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(184); +/** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */ + +function reduce(accumulator, seed) { + if (arguments.length >= 2) { + return function reduceOperatorFunctionWithSeed(source) { + return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(accumulator, seed), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1), Object(_defaultIfEmpty__WEBPACK_IMPORTED_MODULE_2__["defaultIfEmpty"])(seed))(source); + }; + } + return function reduceOperatorFunction(source) { + return Object(_util_pipe__WEBPACK_IMPORTED_MODULE_3__["pipe"])(Object(_scan__WEBPACK_IMPORTED_MODULE_0__["scan"])(function (acc, value, index) { return accumulator(acc, value, index + 1); }), Object(_takeLast__WEBPACK_IMPORTED_MODULE_1__["takeLast"])(1))(source); + }; +} +//# sourceMappingURL=reduce.js.map +/***/ }), +/* 315 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -function switchMap(project, resultSelector) { - if (typeof resultSelector === 'function') { - return function (source) { return source.pipe(switchMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return scan; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ + + +function scan(accumulator, seed) { + var hasSeed = false; + if (arguments.length >= 2) { + hasSeed = true; } - return function (source) { return source.lift(new SwitchMapOperator(project)); }; + return function scanOperatorFunction(source) { + return source.lift(new ScanOperator(accumulator, seed, hasSeed)); + }; } -var SwitchMapOperator = /*@__PURE__*/ (function () { - function SwitchMapOperator(project) { - this.project = project; +var ScanOperator = /*@__PURE__*/ (function () { + function ScanOperator(accumulator, seed, hasSeed) { + if (hasSeed === void 0) { + hasSeed = false; + } + this.accumulator = accumulator; + this.seed = seed; + this.hasSeed = hasSeed; } - SwitchMapOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new SwitchMapSubscriber(subscriber, this.project)); + ScanOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ScanSubscriber(subscriber, this.accumulator, this.seed, this.hasSeed)); }; - return SwitchMapOperator; + return ScanOperator; }()); -var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchMapSubscriber, _super); - function SwitchMapSubscriber(destination, project) { +var ScanSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ScanSubscriber, _super); + function ScanSubscriber(destination, accumulator, _seed, hasSeed) { var _this = _super.call(this, destination) || this; - _this.project = project; + _this.accumulator = accumulator; + _this._seed = _seed; + _this.hasSeed = hasSeed; _this.index = 0; return _this; } - SwitchMapSubscriber.prototype._next = function (value) { - var result; - var index = this.index++; - try { - result = this.project(value, index); - } - catch (error) { - this.destination.error(error); - return; + Object.defineProperty(ScanSubscriber.prototype, "seed", { + get: function () { + return this._seed; + }, + set: function (value) { + this.hasSeed = true; + this._seed = value; + }, + enumerable: true, + configurable: true + }); + ScanSubscriber.prototype._next = function (value) { + if (!this.hasSeed) { + this.seed = value; + this.destination.next(value); } - this._innerSub(result, value, index); - }; - SwitchMapSubscriber.prototype._innerSub = function (result, value, index) { - var innerSubscription = this.innerSubscription; - if (innerSubscription) { - innerSubscription.unsubscribe(); + else { + return this._tryNext(value); } - var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined); - var destination = this.destination; - destination.add(innerSubscriber); - this.innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, value, index, innerSubscriber); }; - SwitchMapSubscriber.prototype._complete = function () { - var innerSubscription = this.innerSubscription; - if (!innerSubscription || innerSubscription.closed) { - _super.prototype._complete.call(this); + ScanSubscriber.prototype._tryNext = function (value) { + var index = this.index++; + var result; + try { + result = this.accumulator(this.seed, value, index); } - this.unsubscribe(); - }; - SwitchMapSubscriber.prototype._unsubscribe = function () { - this.innerSubscription = null; - }; - SwitchMapSubscriber.prototype.notifyComplete = function (innerSub) { - var destination = this.destination; - destination.remove(innerSub); - this.innerSubscription = null; - if (this.isStopped) { - _super.prototype._complete.call(this); + catch (err) { + this.destination.error(err); } + this.seed = result; + this.destination.next(result); }; - SwitchMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.destination.next(innerValue); - }; - return SwitchMapSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=switchMap.js.map + return ScanSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=scan.js.map /***/ }), -/* 326 */ +/* 316 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return switchMapTo; }); -/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(325); -/** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return merge; }); +/* harmony import */ var _observable_merge__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(258); +/** PURE_IMPORTS_START _observable_merge PURE_IMPORTS_END */ -function switchMapTo(innerObservable, resultSelector) { - return resultSelector ? Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; }, resultSelector) : Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; }); +function merge() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; + } + return function (source) { return source.lift.call(_observable_merge__WEBPACK_IMPORTED_MODULE_0__["merge"].apply(void 0, [source].concat(observables))); }; } -//# sourceMappingURL=switchMapTo.js.map +//# sourceMappingURL=merge.js.map /***/ }), -/* 327 */ +/* 317 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return takeUntil; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return mergeMapTo; }); +/* harmony import */ var _mergeMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(242); +/** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */ -function takeUntil(notifier) { - return function (source) { return source.lift(new TakeUntilOperator(notifier)); }; -} -var TakeUntilOperator = /*@__PURE__*/ (function () { - function TakeUntilOperator(notifier) { - this.notifier = notifier; +function mergeMapTo(innerObservable, resultSelector, concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; } - TakeUntilOperator.prototype.call = function (subscriber, source) { - var takeUntilSubscriber = new TakeUntilSubscriber(subscriber); - var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(takeUntilSubscriber, this.notifier); - if (notifierSubscription && !takeUntilSubscriber.seenValue) { - takeUntilSubscriber.add(notifierSubscription); - return source.subscribe(takeUntilSubscriber); - } - return takeUntilSubscriber; - }; - return TakeUntilOperator; -}()); -var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeUntilSubscriber, _super); - function TakeUntilSubscriber(destination) { - var _this = _super.call(this, destination) || this; - _this.seenValue = false; - return _this; + if (typeof resultSelector === 'function') { + return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, resultSelector, concurrent); } - TakeUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.seenValue = true; - this.complete(); - }; - TakeUntilSubscriber.prototype.notifyComplete = function () { - }; - return TakeUntilSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=takeUntil.js.map + if (typeof resultSelector === 'number') { + concurrent = resultSelector; + } + return Object(_mergeMap__WEBPACK_IMPORTED_MODULE_0__["mergeMap"])(function () { return innerObservable; }, concurrent); +} +//# sourceMappingURL=mergeMapTo.js.map /***/ }), -/* 328 */ +/* 318 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return takeWhile; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return mergeScan; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanOperator", function() { return MergeScanOperator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MergeScanSubscriber", function() { return MergeScanSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(230); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(229); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231); +/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_InnerSubscriber PURE_IMPORTS_END */ -function takeWhile(predicate, inclusive) { - if (inclusive === void 0) { - inclusive = false; + + +function mergeScan(accumulator, seed, concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; } - return function (source) { - return source.lift(new TakeWhileOperator(predicate, inclusive)); - }; + return function (source) { return source.lift(new MergeScanOperator(accumulator, seed, concurrent)); }; } -var TakeWhileOperator = /*@__PURE__*/ (function () { - function TakeWhileOperator(predicate, inclusive) { - this.predicate = predicate; - this.inclusive = inclusive; +var MergeScanOperator = /*@__PURE__*/ (function () { + function MergeScanOperator(accumulator, seed, concurrent) { + this.accumulator = accumulator; + this.seed = seed; + this.concurrent = concurrent; } - TakeWhileOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new TakeWhileSubscriber(subscriber, this.predicate, this.inclusive)); + MergeScanOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new MergeScanSubscriber(subscriber, this.accumulator, this.seed, this.concurrent)); }; - return TakeWhileOperator; + return MergeScanOperator; }()); -var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeWhileSubscriber, _super); - function TakeWhileSubscriber(destination, predicate, inclusive) { + +var MergeScanSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](MergeScanSubscriber, _super); + function MergeScanSubscriber(destination, accumulator, acc, concurrent) { var _this = _super.call(this, destination) || this; - _this.predicate = predicate; - _this.inclusive = inclusive; + _this.accumulator = accumulator; + _this.acc = acc; + _this.concurrent = concurrent; + _this.hasValue = false; + _this.hasCompleted = false; + _this.buffer = []; + _this.active = 0; _this.index = 0; return _this; } - TakeWhileSubscriber.prototype._next = function (value) { - var destination = this.destination; - var result; - try { - result = this.predicate(value, this.index++); + MergeScanSubscriber.prototype._next = function (value) { + if (this.active < this.concurrent) { + var index = this.index++; + var destination = this.destination; + var ish = void 0; + try { + var accumulator = this.accumulator; + ish = accumulator(this.acc, value, index); + } + catch (e) { + return destination.error(e); + } + this.active++; + this._innerSub(ish, value, index); } - catch (err) { - destination.error(err); - return; + else { + this.buffer.push(value); } - this.nextOrComplete(value, result); }; - TakeWhileSubscriber.prototype.nextOrComplete = function (value, predicateResult) { + MergeScanSubscriber.prototype._innerSub = function (ish, value, index) { + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_3__["InnerSubscriber"](this, undefined, undefined); var destination = this.destination; - if (Boolean(predicateResult)) { - destination.next(value); - } - else { - if (this.inclusive) { - destination.next(value); + destination.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_1__["subscribeToResult"])(this, ish, value, index, innerSubscriber); + }; + MergeScanSubscriber.prototype._complete = function () { + this.hasCompleted = true; + if (this.active === 0 && this.buffer.length === 0) { + if (this.hasValue === false) { + this.destination.next(this.acc); } - destination.complete(); + this.destination.complete(); } + this.unsubscribe(); }; - return TakeWhileSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=takeWhile.js.map - - -/***/ }), -/* 329 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return tap; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(197); -/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(173); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */ + MergeScanSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + var destination = this.destination; + this.acc = innerValue; + this.hasValue = true; + destination.next(innerValue); + }; + MergeScanSubscriber.prototype.notifyComplete = function (innerSub) { + var buffer = this.buffer; + var destination = this.destination; + destination.remove(innerSub); + this.active--; + if (buffer.length > 0) { + this._next(buffer.shift()); + } + else if (this.active === 0 && this.hasCompleted) { + if (this.hasValue === false) { + this.destination.next(this.acc); + } + this.destination.complete(); + } + }; + return MergeScanSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); +//# sourceMappingURL=mergeScan.js.map +/***/ }), +/* 319 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -function tap(nextOrObserver, error, complete) { - return function tapOperatorFunction(source) { - return source.lift(new DoOperator(nextOrObserver, error, complete)); - }; +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return min; }); +/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(314); +/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ + +function min(comparer) { + var min = (typeof comparer === 'function') + ? function (x, y) { return comparer(x, y) < 0 ? x : y; } + : function (x, y) { return x < y ? x : y; }; + return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(min); } -var DoOperator = /*@__PURE__*/ (function () { - function DoOperator(nextOrObserver, error, complete) { - this.nextOrObserver = nextOrObserver; - this.error = error; - this.complete = complete; - } - DoOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new TapSubscriber(subscriber, this.nextOrObserver, this.error, this.complete)); - }; - return DoOperator; -}()); -var TapSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TapSubscriber, _super); - function TapSubscriber(destination, observerOrNext, error, complete) { - var _this = _super.call(this, destination) || this; - _this._tapNext = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapError = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapComplete = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapError = error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapComplete = complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__["isFunction"])(observerOrNext)) { - _this._context = _this; - _this._tapNext = observerOrNext; - } - else if (observerOrNext) { - _this._context = observerOrNext; - _this._tapNext = observerOrNext.next || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapError = observerOrNext.error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - _this._tapComplete = observerOrNext.complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; - } - return _this; - } - TapSubscriber.prototype._next = function (value) { - try { - this._tapNext.call(this._context, value); - } - catch (err) { - this.destination.error(err); - return; +//# sourceMappingURL=min.js.map + + +/***/ }), +/* 320 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return multicast; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MulticastOperator", function() { return MulticastOperator; }); +/* harmony import */ var _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(186); +/** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */ + +function multicast(subjectOrSubjectFactory, selector) { + return function multicastOperatorFunction(source) { + var subjectFactory; + if (typeof subjectOrSubjectFactory === 'function') { + subjectFactory = subjectOrSubjectFactory; } - this.destination.next(value); - }; - TapSubscriber.prototype._error = function (err) { - try { - this._tapError.call(this._context, err); + else { + subjectFactory = function subjectFactory() { + return subjectOrSubjectFactory; + }; } - catch (err) { - this.destination.error(err); - return; + if (typeof selector === 'function') { + return source.lift(new MulticastOperator(subjectFactory, selector)); } - this.destination.error(err); + var connectable = Object.create(source, _observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_0__["connectableObservableDescriptor"]); + connectable.source = source; + connectable.subjectFactory = subjectFactory; + return connectable; }; - TapSubscriber.prototype._complete = function () { - try { - this._tapComplete.call(this._context); - } - catch (err) { - this.destination.error(err); - return; - } - return this.destination.complete(); +} +var MulticastOperator = /*@__PURE__*/ (function () { + function MulticastOperator(subjectFactory, selector) { + this.subjectFactory = subjectFactory; + this.selector = selector; + } + MulticastOperator.prototype.call = function (subscriber, source) { + var selector = this.selector; + var subject = this.subjectFactory(); + var subscription = selector(subject).subscribe(subscriber); + subscription.add(source.subscribe(subject)); + return subscription; }; - return TapSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=tap.js.map + return MulticastOperator; +}()); + +//# sourceMappingURL=multicast.js.map /***/ }), -/* 330 */ +/* 321 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultThrottleConfig", function() { return defaultThrottleConfig; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return throttle; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNextStatic", function() { return onErrorResumeNextStatic; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(243); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(229); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(231); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -var defaultThrottleConfig = { - leading: true, - trailing: false -}; -function throttle(durationSelector, config) { - if (config === void 0) { - config = defaultThrottleConfig; + + + +function onErrorResumeNext() { + var nextSources = []; + for (var _i = 0; _i < arguments.length; _i++) { + nextSources[_i] = arguments[_i]; } - return function (source) { return source.lift(new ThrottleOperator(durationSelector, config.leading, config.trailing)); }; + if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) { + nextSources = nextSources[0]; + } + return function (source) { return source.lift(new OnErrorResumeNextOperator(nextSources)); }; } -var ThrottleOperator = /*@__PURE__*/ (function () { - function ThrottleOperator(durationSelector, leading, trailing) { - this.durationSelector = durationSelector; - this.leading = leading; - this.trailing = trailing; +function onErrorResumeNextStatic() { + var nextSources = []; + for (var _i = 0; _i < arguments.length; _i++) { + nextSources[_i] = arguments[_i]; } - ThrottleOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ThrottleSubscriber(subscriber, this.durationSelector, this.leading, this.trailing)); + var source = null; + if (nextSources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(nextSources[0])) { + nextSources = nextSources[0]; + } + source = nextSources.shift(); + return Object(_observable_from__WEBPACK_IMPORTED_MODULE_1__["from"])(source, null).lift(new OnErrorResumeNextOperator(nextSources)); +} +var OnErrorResumeNextOperator = /*@__PURE__*/ (function () { + function OnErrorResumeNextOperator(nextSources) { + this.nextSources = nextSources; + } + OnErrorResumeNextOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new OnErrorResumeNextSubscriber(subscriber, this.nextSources)); }; - return ThrottleOperator; + return OnErrorResumeNextOperator; }()); -var ThrottleSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleSubscriber, _super); - function ThrottleSubscriber(destination, durationSelector, _leading, _trailing) { +var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](OnErrorResumeNextSubscriber, _super); + function OnErrorResumeNextSubscriber(destination, nextSources) { var _this = _super.call(this, destination) || this; _this.destination = destination; - _this.durationSelector = durationSelector; - _this._leading = _leading; - _this._trailing = _trailing; - _this._hasValue = false; + _this.nextSources = nextSources; return _this; } - ThrottleSubscriber.prototype._next = function (value) { - this._hasValue = true; - this._sendValue = value; - if (!this._throttled) { - if (this._leading) { - this.send(); - } - else { - this.throttle(value); - } - } + OnErrorResumeNextSubscriber.prototype.notifyError = function (error, innerSub) { + this.subscribeToNextSource(); }; - ThrottleSubscriber.prototype.send = function () { - var _a = this, _hasValue = _a._hasValue, _sendValue = _a._sendValue; - if (_hasValue) { - this.destination.next(_sendValue); - this.throttle(_sendValue); - } - this._hasValue = false; - this._sendValue = null; + OnErrorResumeNextSubscriber.prototype.notifyComplete = function (innerSub) { + this.subscribeToNextSource(); }; - ThrottleSubscriber.prototype.throttle = function (value) { - var duration = this.tryDurationSelector(value); - if (!!duration) { - this.add(this._throttled = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration)); - } + OnErrorResumeNextSubscriber.prototype._error = function (err) { + this.subscribeToNextSource(); + this.unsubscribe(); }; - ThrottleSubscriber.prototype.tryDurationSelector = function (value) { - try { - return this.durationSelector(value); - } - catch (err) { - this.destination.error(err); - return null; - } + OnErrorResumeNextSubscriber.prototype._complete = function () { + this.subscribeToNextSource(); + this.unsubscribe(); }; - ThrottleSubscriber.prototype.throttlingDone = function () { - var _a = this, _throttled = _a._throttled, _trailing = _a._trailing; - if (_throttled) { - _throttled.unsubscribe(); + OnErrorResumeNextSubscriber.prototype.subscribeToNextSource = function () { + var next = this.nextSources.shift(); + if (!!next) { + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_4__["InnerSubscriber"](this, undefined, undefined); + var destination = this.destination; + destination.add(innerSubscriber); + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, next, undefined, undefined, innerSubscriber); } - this._throttled = null; - if (_trailing) { - this.send(); + else { + this.destination.complete(); } }; - ThrottleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.throttlingDone(); - }; - ThrottleSubscriber.prototype.notifyComplete = function () { - this.throttlingDone(); - }; - return ThrottleSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=throttle.js.map + return OnErrorResumeNextSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); +//# sourceMappingURL=onErrorResumeNext.js.map /***/ }), -/* 331 */ +/* 322 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return throttleTime; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return pairwise; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(199); -/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(330); -/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */ - - +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function throttleTime(duration, scheduler, config) { - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"]; - } - if (config === void 0) { - config = _throttle__WEBPACK_IMPORTED_MODULE_3__["defaultThrottleConfig"]; - } - return function (source) { return source.lift(new ThrottleTimeOperator(duration, scheduler, config.leading, config.trailing)); }; +function pairwise() { + return function (source) { return source.lift(new PairwiseOperator()); }; } -var ThrottleTimeOperator = /*@__PURE__*/ (function () { - function ThrottleTimeOperator(duration, scheduler, leading, trailing) { - this.duration = duration; - this.scheduler = scheduler; - this.leading = leading; - this.trailing = trailing; +var PairwiseOperator = /*@__PURE__*/ (function () { + function PairwiseOperator() { } - ThrottleTimeOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ThrottleTimeSubscriber(subscriber, this.duration, this.scheduler, this.leading, this.trailing)); + PairwiseOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new PairwiseSubscriber(subscriber)); }; - return ThrottleTimeOperator; + return PairwiseOperator; }()); -var ThrottleTimeSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleTimeSubscriber, _super); - function ThrottleTimeSubscriber(destination, duration, scheduler, leading, trailing) { +var PairwiseSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](PairwiseSubscriber, _super); + function PairwiseSubscriber(destination) { var _this = _super.call(this, destination) || this; - _this.duration = duration; - _this.scheduler = scheduler; - _this.leading = leading; - _this.trailing = trailing; - _this._hasTrailingValue = false; - _this._trailingValue = null; + _this.hasPrev = false; return _this; } - ThrottleTimeSubscriber.prototype._next = function (value) { - if (this.throttled) { - if (this.trailing) { - this._trailingValue = value; - this._hasTrailingValue = true; - } - } - else { - this.add(this.throttled = this.scheduler.schedule(dispatchNext, this.duration, { subscriber: this })); - if (this.leading) { - this.destination.next(value); - } - else if (this.trailing) { - this._trailingValue = value; - this._hasTrailingValue = true; - } - } - }; - ThrottleTimeSubscriber.prototype._complete = function () { - if (this._hasTrailingValue) { - this.destination.next(this._trailingValue); - this.destination.complete(); + PairwiseSubscriber.prototype._next = function (value) { + var pair; + if (this.hasPrev) { + pair = [this.prev, value]; } else { - this.destination.complete(); + this.hasPrev = true; } - }; - ThrottleTimeSubscriber.prototype.clearThrottle = function () { - var throttled = this.throttled; - if (throttled) { - if (this.trailing && this._hasTrailingValue) { - this.destination.next(this._trailingValue); - this._trailingValue = null; - this._hasTrailingValue = false; - } - throttled.unsubscribe(); - this.remove(throttled); - this.throttled = null; + this.prev = value; + if (pair) { + this.destination.next(pair); } }; - return ThrottleTimeSubscriber; + return PairwiseSubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -function dispatchNext(arg) { - var subscriber = arg.subscriber; - subscriber.clearThrottle(); -} -//# sourceMappingURL=throttleTime.js.map +//# sourceMappingURL=pairwise.js.map /***/ }), -/* 332 */ +/* 323 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return timeInterval; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeInterval", function() { return TimeInterval; }); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199); -/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(276); -/* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(333); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231); -/** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */ - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; }); +/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(263); +/* harmony import */ var _filter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(264); +/** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */ -function timeInterval(scheduler) { - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"]; - } +function partition(predicate, thisArg) { return function (source) { - return Object(_observable_defer__WEBPACK_IMPORTED_MODULE_2__["defer"])(function () { - return source.pipe(Object(_scan__WEBPACK_IMPORTED_MODULE_1__["scan"])(function (_a, value) { - var current = _a.current; - return ({ value: value, current: scheduler.now(), last: current }); - }, { current: scheduler.now(), value: undefined, last: undefined }), Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (_a) { - var current = _a.current, last = _a.last, value = _a.value; - return new TimeInterval(value, current - last); - })); - }); + return [ + Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(predicate, thisArg)(source), + Object(_filter__WEBPACK_IMPORTED_MODULE_1__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(source) + ]; }; } -var TimeInterval = /*@__PURE__*/ (function () { - function TimeInterval(value, interval) { - this.value = value; - this.interval = interval; - } - return TimeInterval; -}()); - -//# sourceMappingURL=timeInterval.js.map +//# sourceMappingURL=partition.js.map /***/ }), -/* 333 */ +/* 324 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return defer; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(242); -/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */ - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return pluck; }); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(226); +/** PURE_IMPORTS_START _map PURE_IMPORTS_END */ -function defer(observableFactory) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var input; - try { - input = observableFactory(); - } - catch (err) { - subscriber.error(err); - return undefined; +function pluck() { + var properties = []; + for (var _i = 0; _i < arguments.length; _i++) { + properties[_i] = arguments[_i]; + } + var length = properties.length; + if (length === 0) { + throw new Error('list of properties cannot be empty.'); + } + return function (source) { return Object(_map__WEBPACK_IMPORTED_MODULE_0__["map"])(plucker(properties, length))(source); }; +} +function plucker(props, length) { + var mapper = function (x) { + var currentProp = x; + for (var i = 0; i < length; i++) { + var p = currentProp[props[i]]; + if (typeof p !== 'undefined') { + currentProp = p; + } + else { + return undefined; + } } - var source = input ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(input) : Object(_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(); - return source.subscribe(subscriber); - }); + return currentProp; + }; + return mapper; } -//# sourceMappingURL=defer.js.map +//# sourceMappingURL=pluck.js.map /***/ }), -/* 334 */ +/* 325 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return timeout; }); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199); -/* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(335); -/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(336); -/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(243); -/** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */ - - +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return publish; }); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(187); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320); +/** PURE_IMPORTS_START _Subject,_multicast PURE_IMPORTS_END */ -function timeout(due, scheduler) { - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"]; - } - return Object(_timeoutWith__WEBPACK_IMPORTED_MODULE_2__["timeoutWith"])(due, Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_3__["throwError"])(new _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__["TimeoutError"]()), scheduler); +function publish(selector) { + return selector ? + Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"](); }, selector) : + Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _Subject__WEBPACK_IMPORTED_MODULE_0__["Subject"]()); } -//# sourceMappingURL=timeout.js.map +//# sourceMappingURL=publish.js.map /***/ }), -/* 335 */ +/* 326 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return TimeoutError; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var TimeoutErrorImpl = /*@__PURE__*/ (function () { - function TimeoutErrorImpl() { - Error.call(this); - this.message = 'Timeout has occurred'; - this.name = 'TimeoutError'; - return this; - } - TimeoutErrorImpl.prototype = /*@__PURE__*/ Object.create(Error.prototype); - return TimeoutErrorImpl; -})(); -var TimeoutError = TimeoutErrorImpl; -//# sourceMappingURL=TimeoutError.js.map +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return publishBehavior; }); +/* harmony import */ var _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(192); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320); +/** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */ + + +function publishBehavior(value) { + return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _BehaviorSubject__WEBPACK_IMPORTED_MODULE_0__["BehaviorSubject"](value))(source); }; +} +//# sourceMappingURL=publishBehavior.js.map /***/ }), -/* 336 */ +/* 327 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return timeoutWith; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199); -/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(240); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return publishLast; }); +/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(210); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320); +/** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */ +function publishLast() { + return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(new _AsyncSubject__WEBPACK_IMPORTED_MODULE_0__["AsyncSubject"]())(source); }; +} +//# sourceMappingURL=publishLast.js.map +/***/ }), +/* 328 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -function timeoutWith(due, withObservable, scheduler) { - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return publishReplay; }); +/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(320); +/** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */ + + +function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) { + if (selectorOrScheduler && typeof selectorOrScheduler !== 'function') { + scheduler = selectorOrScheduler; } - return function (source) { - var absoluteTimeout = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(due); - var waitFor = absoluteTimeout ? (+due - scheduler.now()) : Math.abs(due); - return source.lift(new TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler)); - }; + var selector = typeof selectorOrScheduler === 'function' ? selectorOrScheduler : undefined; + var subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler); + return function (source) { return Object(_multicast__WEBPACK_IMPORTED_MODULE_1__["multicast"])(function () { return subject; }, selector)(source); }; } -var TimeoutWithOperator = /*@__PURE__*/ (function () { - function TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler) { - this.waitFor = waitFor; - this.absoluteTimeout = absoluteTimeout; - this.withObservable = withObservable; - this.scheduler = scheduler; - } - TimeoutWithOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new TimeoutWithSubscriber(subscriber, this.absoluteTimeout, this.waitFor, this.withObservable, this.scheduler)); - }; - return TimeoutWithOperator; -}()); -var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TimeoutWithSubscriber, _super); - function TimeoutWithSubscriber(destination, absoluteTimeout, waitFor, withObservable, scheduler) { - var _this = _super.call(this, destination) || this; - _this.absoluteTimeout = absoluteTimeout; - _this.waitFor = waitFor; - _this.withObservable = withObservable; - _this.scheduler = scheduler; - _this.action = null; - _this.scheduleTimeout(); - return _this; - } - TimeoutWithSubscriber.dispatchTimeout = function (subscriber) { - var withObservable = subscriber.withObservable; - subscriber._unsubscribeAndRecycle(); - subscriber.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(subscriber, withObservable)); - }; - TimeoutWithSubscriber.prototype.scheduleTimeout = function () { - var action = this.action; - if (action) { - this.action = action.schedule(this, this.waitFor); - } - else { - this.add(this.action = this.scheduler.schedule(TimeoutWithSubscriber.dispatchTimeout, this.waitFor, this)); - } - }; - TimeoutWithSubscriber.prototype._next = function (value) { - if (!this.absoluteTimeout) { - this.scheduleTimeout(); - } - _super.prototype._next.call(this, value); - }; - TimeoutWithSubscriber.prototype._unsubscribe = function () { - this.action = null; - this.scheduler = null; - this.withObservable = null; - }; - return TimeoutWithSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); -//# sourceMappingURL=timeoutWith.js.map +//# sourceMappingURL=publishReplay.js.map /***/ }), -/* 337 */ +/* 329 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return timestamp; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Timestamp", function() { return Timestamp; }); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(199); -/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(231); -/** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return race; }); +/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(178); +/* harmony import */ var _observable_race__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); +/** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */ -function timestamp(scheduler) { - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"]; +function race() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; } - return Object(_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (value) { return new Timestamp(value, scheduler.now()); }); + return function raceOperatorFunction(source) { + if (observables.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_0__["isArray"])(observables[0])) { + observables = observables[0]; + } + return source.lift.call(_observable_race__WEBPACK_IMPORTED_MODULE_1__["race"].apply(void 0, [source].concat(observables))); + }; } -var Timestamp = /*@__PURE__*/ (function () { - function Timestamp(value, timestamp) { - this.value = value; - this.timestamp = timestamp; - } - return Timestamp; -}()); - -//# sourceMappingURL=timestamp.js.map +//# sourceMappingURL=race.js.map /***/ }), -/* 338 */ +/* 330 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return toArray; }); -/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(275); -/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return repeat; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _observable_empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(203); +/** PURE_IMPORTS_START tslib,_Subscriber,_observable_empty PURE_IMPORTS_END */ -function toArrayReducer(arr, item, index) { - if (index === 0) { - return [item]; + + +function repeat(count) { + if (count === void 0) { + count = -1; } - arr.push(item); - return arr; -} -function toArray() { - return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(toArrayReducer, []); + return function (source) { + if (count === 0) { + return Object(_observable_empty__WEBPACK_IMPORTED_MODULE_2__["empty"])(); + } + else if (count < 0) { + return source.lift(new RepeatOperator(-1, source)); + } + else { + return source.lift(new RepeatOperator(count - 1, source)); + } + }; } -//# sourceMappingURL=toArray.js.map +var RepeatOperator = /*@__PURE__*/ (function () { + function RepeatOperator(count, source) { + this.count = count; + this.source = source; + } + RepeatOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new RepeatSubscriber(subscriber, this.count, this.source)); + }; + return RepeatOperator; +}()); +var RepeatSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatSubscriber, _super); + function RepeatSubscriber(destination, count, source) { + var _this = _super.call(this, destination) || this; + _this.count = count; + _this.source = source; + return _this; + } + RepeatSubscriber.prototype.complete = function () { + if (!this.isStopped) { + var _a = this, source = _a.source, count = _a.count; + if (count === 0) { + return _super.prototype.complete.call(this); + } + else if (count > -1) { + this.count = count - 1; + } + source.subscribe(this._unsubscribeAndRecycle()); + } + }; + return RepeatSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=repeat.js.map /***/ }), -/* 339 */ +/* 331 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "window", function() { return window; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return repeatWhen; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(230); /** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function window(windowBoundaries) { - return function windowOperatorFunction(source) { - return source.lift(new WindowOperator(windowBoundaries)); - }; +function repeatWhen(notifier) { + return function (source) { return source.lift(new RepeatWhenOperator(notifier)); }; } -var WindowOperator = /*@__PURE__*/ (function () { - function WindowOperator(windowBoundaries) { - this.windowBoundaries = windowBoundaries; +var RepeatWhenOperator = /*@__PURE__*/ (function () { + function RepeatWhenOperator(notifier) { + this.notifier = notifier; } - WindowOperator.prototype.call = function (subscriber, source) { - var windowSubscriber = new WindowSubscriber(subscriber); - var sourceSubscription = source.subscribe(windowSubscriber); - if (!sourceSubscription.closed) { - windowSubscriber.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(windowSubscriber, this.windowBoundaries)); - } - return sourceSubscription; + RepeatWhenOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new RepeatWhenSubscriber(subscriber, this.notifier, source)); }; - return WindowOperator; + return RepeatWhenOperator; }()); -var WindowSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super); - function WindowSubscriber(destination) { +var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RepeatWhenSubscriber, _super); + function RepeatWhenSubscriber(destination, notifier, source) { var _this = _super.call(this, destination) || this; - _this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); - destination.next(_this.window); + _this.notifier = notifier; + _this.source = source; + _this.sourceIsBeingSubscribedTo = true; return _this; } - WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.openWindow(); - }; - WindowSubscriber.prototype.notifyError = function (error, innerSub) { - this._error(error); - }; - WindowSubscriber.prototype.notifyComplete = function (innerSub) { - this._complete(); + RepeatWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.sourceIsBeingSubscribedTo = true; + this.source.subscribe(this); }; - WindowSubscriber.prototype._next = function (value) { - this.window.next(value); + RepeatWhenSubscriber.prototype.notifyComplete = function (innerSub) { + if (this.sourceIsBeingSubscribedTo === false) { + return _super.prototype.complete.call(this); + } }; - WindowSubscriber.prototype._error = function (err) { - this.window.error(err); - this.destination.error(err); + RepeatWhenSubscriber.prototype.complete = function () { + this.sourceIsBeingSubscribedTo = false; + if (!this.isStopped) { + if (!this.retries) { + this.subscribeToRetries(); + } + if (!this.retriesSubscription || this.retriesSubscription.closed) { + return _super.prototype.complete.call(this); + } + this._unsubscribeAndRecycle(); + this.notifications.next(); + } }; - WindowSubscriber.prototype._complete = function () { - this.window.complete(); - this.destination.complete(); + RepeatWhenSubscriber.prototype._unsubscribe = function () { + var _a = this, notifications = _a.notifications, retriesSubscription = _a.retriesSubscription; + if (notifications) { + notifications.unsubscribe(); + this.notifications = null; + } + if (retriesSubscription) { + retriesSubscription.unsubscribe(); + this.retriesSubscription = null; + } + this.retries = null; }; - WindowSubscriber.prototype._unsubscribe = function () { - this.window = null; + RepeatWhenSubscriber.prototype._unsubscribeAndRecycle = function () { + var _unsubscribe = this._unsubscribe; + this._unsubscribe = null; + _super.prototype._unsubscribeAndRecycle.call(this); + this._unsubscribe = _unsubscribe; + return this; }; - WindowSubscriber.prototype.openWindow = function () { - var prevWindow = this.window; - if (prevWindow) { - prevWindow.complete(); + RepeatWhenSubscriber.prototype.subscribeToRetries = function () { + this.notifications = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); + var retries; + try { + var notifier = this.notifier; + retries = notifier(this.notifications); } - var destination = this.destination; - var newWindow = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); - destination.next(newWindow); + catch (e) { + return _super.prototype.complete.call(this); + } + this.retries = retries; + this.retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries); }; - return WindowSubscriber; + return RepeatWhenSubscriber; }(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); -//# sourceMappingURL=window.js.map +//# sourceMappingURL=repeatWhen.js.map /***/ }), -/* 340 */ +/* 332 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return windowCount; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return retry; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); /* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(265); -/** PURE_IMPORTS_START tslib,_Subscriber,_Subject PURE_IMPORTS_END */ - +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function windowCount(windowSize, startWindowEvery) { - if (startWindowEvery === void 0) { - startWindowEvery = 0; +function retry(count) { + if (count === void 0) { + count = -1; } - return function windowCountOperatorFunction(source) { - return source.lift(new WindowCountOperator(windowSize, startWindowEvery)); - }; + return function (source) { return source.lift(new RetryOperator(count, source)); }; } -var WindowCountOperator = /*@__PURE__*/ (function () { - function WindowCountOperator(windowSize, startWindowEvery) { - this.windowSize = windowSize; - this.startWindowEvery = startWindowEvery; +var RetryOperator = /*@__PURE__*/ (function () { + function RetryOperator(count, source) { + this.count = count; + this.source = source; } - WindowCountOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new WindowCountSubscriber(subscriber, this.windowSize, this.startWindowEvery)); + RetryOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new RetrySubscriber(subscriber, this.count, this.source)); }; - return WindowCountOperator; + return RetryOperator; }()); -var WindowCountSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowCountSubscriber, _super); - function WindowCountSubscriber(destination, windowSize, startWindowEvery) { +var RetrySubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetrySubscriber, _super); + function RetrySubscriber(destination, count, source) { var _this = _super.call(this, destination) || this; - _this.destination = destination; - _this.windowSize = windowSize; - _this.startWindowEvery = startWindowEvery; - _this.windows = [new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]()]; - _this.count = 0; - destination.next(_this.windows[0]); + _this.count = count; + _this.source = source; return _this; } - WindowCountSubscriber.prototype._next = function (value) { - var startWindowEvery = (this.startWindowEvery > 0) ? this.startWindowEvery : this.windowSize; - var destination = this.destination; - var windowSize = this.windowSize; - var windows = this.windows; - var len = windows.length; - for (var i = 0; i < len && !this.closed; i++) { - windows[i].next(value); - } - var c = this.count - windowSize + 1; - if (c >= 0 && c % startWindowEvery === 0 && !this.closed) { - windows.shift().complete(); - } - if (++this.count % startWindowEvery === 0 && !this.closed) { - var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"](); - windows.push(window_1); - destination.next(window_1); - } - }; - WindowCountSubscriber.prototype._error = function (err) { - var windows = this.windows; - if (windows) { - while (windows.length > 0 && !this.closed) { - windows.shift().error(err); + RetrySubscriber.prototype.error = function (err) { + if (!this.isStopped) { + var _a = this, source = _a.source, count = _a.count; + if (count === 0) { + return _super.prototype.error.call(this, err); } - } - this.destination.error(err); - }; - WindowCountSubscriber.prototype._complete = function () { - var windows = this.windows; - if (windows) { - while (windows.length > 0 && !this.closed) { - windows.shift().complete(); + else if (count > -1) { + this.count = count - 1; } + source.subscribe(this._unsubscribeAndRecycle()); } - this.destination.complete(); - }; - WindowCountSubscriber.prototype._unsubscribe = function () { - this.count = 0; - this.windows = null; }; - return WindowCountSubscriber; + return RetrySubscriber; }(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); -//# sourceMappingURL=windowCount.js.map +//# sourceMappingURL=retry.js.map /***/ }), -/* 341 */ +/* 333 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return windowTime; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return retryWhen; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(199); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172); -/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(205); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(206); -/** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */ - - +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function windowTime(windowTimeSpan) { - var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"]; - var windowCreationInterval = null; - var maxWindowSize = Number.POSITIVE_INFINITY; - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[3])) { - scheduler = arguments[3]; - } - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[2])) { - scheduler = arguments[2]; - } - else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[2])) { - maxWindowSize = arguments[2]; - } - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[1])) { - scheduler = arguments[1]; - } - else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[1])) { - windowCreationInterval = arguments[1]; - } - return function windowTimeOperatorFunction(source) { - return source.lift(new WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler)); - }; +function retryWhen(notifier) { + return function (source) { return source.lift(new RetryWhenOperator(notifier, source)); }; } -var WindowTimeOperator = /*@__PURE__*/ (function () { - function WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) { - this.windowTimeSpan = windowTimeSpan; - this.windowCreationInterval = windowCreationInterval; - this.maxWindowSize = maxWindowSize; - this.scheduler = scheduler; +var RetryWhenOperator = /*@__PURE__*/ (function () { + function RetryWhenOperator(notifier, source) { + this.notifier = notifier; + this.source = source; } - WindowTimeOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new WindowTimeSubscriber(subscriber, this.windowTimeSpan, this.windowCreationInterval, this.maxWindowSize, this.scheduler)); + RetryWhenOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new RetryWhenSubscriber(subscriber, this.notifier, this.source)); }; - return WindowTimeOperator; + return RetryWhenOperator; }()); -var CountedSubject = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountedSubject, _super); - function CountedSubject() { - var _this = _super !== null && _super.apply(this, arguments) || this; - _this._numberOfNextedValues = 0; - return _this; - } - CountedSubject.prototype.next = function (value) { - this._numberOfNextedValues++; - _super.prototype.next.call(this, value); - }; - Object.defineProperty(CountedSubject.prototype, "numberOfNextedValues", { - get: function () { - return this._numberOfNextedValues; - }, - enumerable: true, - configurable: true - }); - return CountedSubject; -}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"])); -var WindowTimeSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowTimeSubscriber, _super); - function WindowTimeSubscriber(destination, windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) { +var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](RetryWhenSubscriber, _super); + function RetryWhenSubscriber(destination, notifier, source) { var _this = _super.call(this, destination) || this; - _this.destination = destination; - _this.windowTimeSpan = windowTimeSpan; - _this.windowCreationInterval = windowCreationInterval; - _this.maxWindowSize = maxWindowSize; - _this.scheduler = scheduler; - _this.windows = []; - var window = _this.openWindow(); - if (windowCreationInterval !== null && windowCreationInterval >= 0) { - var closeState = { subscriber: _this, window: window, context: null }; - var creationState = { windowTimeSpan: windowTimeSpan, windowCreationInterval: windowCreationInterval, subscriber: _this, scheduler: scheduler }; - _this.add(scheduler.schedule(dispatchWindowClose, windowTimeSpan, closeState)); - _this.add(scheduler.schedule(dispatchWindowCreation, windowCreationInterval, creationState)); - } - else { - var timeSpanOnlyState = { subscriber: _this, window: window, windowTimeSpan: windowTimeSpan }; - _this.add(scheduler.schedule(dispatchWindowTimeSpanOnly, windowTimeSpan, timeSpanOnlyState)); - } + _this.notifier = notifier; + _this.source = source; return _this; } - WindowTimeSubscriber.prototype._next = function (value) { - var windows = this.windows; - var len = windows.length; - for (var i = 0; i < len; i++) { - var window_1 = windows[i]; - if (!window_1.closed) { - window_1.next(value); - if (window_1.numberOfNextedValues >= this.maxWindowSize) { - this.closeWindow(window_1); + RetryWhenSubscriber.prototype.error = function (err) { + if (!this.isStopped) { + var errors = this.errors; + var retries = this.retries; + var retriesSubscription = this.retriesSubscription; + if (!retries) { + errors = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); + try { + var notifier = this.notifier; + retries = notifier(errors); + } + catch (e) { + return _super.prototype.error.call(this, e); } + retriesSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, retries); } - } - }; - WindowTimeSubscriber.prototype._error = function (err) { - var windows = this.windows; - while (windows.length > 0) { - windows.shift().error(err); - } - this.destination.error(err); - }; - WindowTimeSubscriber.prototype._complete = function () { - var windows = this.windows; - while (windows.length > 0) { - var window_2 = windows.shift(); - if (!window_2.closed) { - window_2.complete(); + else { + this.errors = null; + this.retriesSubscription = null; } + this._unsubscribeAndRecycle(); + this.errors = errors; + this.retries = retries; + this.retriesSubscription = retriesSubscription; + errors.next(err); } - this.destination.complete(); }; - WindowTimeSubscriber.prototype.openWindow = function () { - var window = new CountedSubject(); - this.windows.push(window); - var destination = this.destination; - destination.next(window); - return window; + RetryWhenSubscriber.prototype._unsubscribe = function () { + var _a = this, errors = _a.errors, retriesSubscription = _a.retriesSubscription; + if (errors) { + errors.unsubscribe(); + this.errors = null; + } + if (retriesSubscription) { + retriesSubscription.unsubscribe(); + this.retriesSubscription = null; + } + this.retries = null; }; - WindowTimeSubscriber.prototype.closeWindow = function (window) { - window.complete(); - var windows = this.windows; - windows.splice(windows.indexOf(window), 1); + RetryWhenSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + var _unsubscribe = this._unsubscribe; + this._unsubscribe = null; + this._unsubscribeAndRecycle(); + this._unsubscribe = _unsubscribe; + this.source.subscribe(this); }; - return WindowTimeSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"])); -function dispatchWindowTimeSpanOnly(state) { - var subscriber = state.subscriber, windowTimeSpan = state.windowTimeSpan, window = state.window; - if (window) { - subscriber.closeWindow(window); - } - state.window = subscriber.openWindow(); - this.schedule(state, windowTimeSpan); -} -function dispatchWindowCreation(state) { - var windowTimeSpan = state.windowTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler, windowCreationInterval = state.windowCreationInterval; - var window = subscriber.openWindow(); - var action = this; - var context = { action: action, subscription: null }; - var timeSpanState = { subscriber: subscriber, window: window, context: context }; - context.subscription = scheduler.schedule(dispatchWindowClose, windowTimeSpan, timeSpanState); - action.add(context.subscription); - action.schedule(state, windowCreationInterval); -} -function dispatchWindowClose(state) { - var subscriber = state.subscriber, window = state.window, context = state.context; - if (context && context.action && context.subscription) { - context.action.remove(context.subscription); - } - subscriber.closeWindow(window); -} -//# sourceMappingURL=windowTime.js.map + return RetryWhenSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); +//# sourceMappingURL=retryWhen.js.map /***/ }), -/* 342 */ +/* 334 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return windowToggle; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return sample; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - - +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -function windowToggle(openings, closingSelector) { - return function (source) { return source.lift(new WindowToggleOperator(openings, closingSelector)); }; +function sample(notifier) { + return function (source) { return source.lift(new SampleOperator(notifier)); }; } -var WindowToggleOperator = /*@__PURE__*/ (function () { - function WindowToggleOperator(openings, closingSelector) { - this.openings = openings; - this.closingSelector = closingSelector; +var SampleOperator = /*@__PURE__*/ (function () { + function SampleOperator(notifier) { + this.notifier = notifier; } - WindowToggleOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new WindowToggleSubscriber(subscriber, this.openings, this.closingSelector)); + SampleOperator.prototype.call = function (subscriber, source) { + var sampleSubscriber = new SampleSubscriber(subscriber); + var subscription = source.subscribe(sampleSubscriber); + subscription.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(sampleSubscriber, this.notifier)); + return subscription; }; - return WindowToggleOperator; + return SampleOperator; }()); -var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowToggleSubscriber, _super); - function WindowToggleSubscriber(destination, openings, closingSelector) { - var _this = _super.call(this, destination) || this; - _this.openings = openings; - _this.closingSelector = closingSelector; - _this.contexts = []; - _this.add(_this.openSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(_this, openings, openings)); +var SampleSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleSubscriber, _super); + function SampleSubscriber() { + var _this = _super !== null && _super.apply(this, arguments) || this; + _this.hasValue = false; return _this; } - WindowToggleSubscriber.prototype._next = function (value) { - var contexts = this.contexts; - if (contexts) { - var len = contexts.length; - for (var i = 0; i < len; i++) { - contexts[i].window.next(value); - } - } - }; - WindowToggleSubscriber.prototype._error = function (err) { - var contexts = this.contexts; - this.contexts = null; - if (contexts) { - var len = contexts.length; - var index = -1; - while (++index < len) { - var context_1 = contexts[index]; - context_1.window.error(err); - context_1.subscription.unsubscribe(); - } - } - _super.prototype._error.call(this, err); - }; - WindowToggleSubscriber.prototype._complete = function () { - var contexts = this.contexts; - this.contexts = null; - if (contexts) { - var len = contexts.length; - var index = -1; - while (++index < len) { - var context_2 = contexts[index]; - context_2.window.complete(); - context_2.subscription.unsubscribe(); - } - } - _super.prototype._complete.call(this); - }; - WindowToggleSubscriber.prototype._unsubscribe = function () { - var contexts = this.contexts; - this.contexts = null; - if (contexts) { - var len = contexts.length; - var index = -1; - while (++index < len) { - var context_3 = contexts[index]; - context_3.window.unsubscribe(); - context_3.subscription.unsubscribe(); - } - } - }; - WindowToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - if (outerValue === this.openings) { - var closingNotifier = void 0; - try { - var closingSelector = this.closingSelector; - closingNotifier = closingSelector(innerValue); - } - catch (e) { - return this.error(e); - } - var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); - var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](); - var context_4 = { window: window_1, subscription: subscription }; - this.contexts.push(context_4); - var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, closingNotifier, context_4); - if (innerSubscription.closed) { - this.closeWindow(this.contexts.length - 1); - } - else { - innerSubscription.context = context_4; - subscription.add(innerSubscription); - } - this.destination.next(window_1); - } - else { - this.closeWindow(this.contexts.indexOf(outerValue)); - } + SampleSubscriber.prototype._next = function (value) { + this.value = value; + this.hasValue = true; }; - WindowToggleSubscriber.prototype.notifyError = function (err) { - this.error(err); + SampleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.emitValue(); }; - WindowToggleSubscriber.prototype.notifyComplete = function (inner) { - if (inner !== this.openSubscription) { - this.closeWindow(this.contexts.indexOf(inner.context)); - } + SampleSubscriber.prototype.notifyComplete = function () { + this.emitValue(); }; - WindowToggleSubscriber.prototype.closeWindow = function (index) { - if (index === -1) { - return; + SampleSubscriber.prototype.emitValue = function () { + if (this.hasValue) { + this.hasValue = false; + this.destination.next(this.value); } - var contexts = this.contexts; - var context = contexts[index]; - var window = context.window, subscription = context.subscription; - contexts.splice(index, 1); - window.complete(); - subscription.unsubscribe(); }; - return WindowToggleSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); -//# sourceMappingURL=windowToggle.js.map + return SampleSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=sample.js.map /***/ }), -/* 343 */ +/* 335 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return windowWhen; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return sampleTime; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(265); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(215); +/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */ -function windowWhen(closingSelector) { - return function windowWhenOperatorFunction(source) { - return source.lift(new WindowOperator(closingSelector)); - }; +function sampleTime(period, scheduler) { + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"]; + } + return function (source) { return source.lift(new SampleTimeOperator(period, scheduler)); }; } -var WindowOperator = /*@__PURE__*/ (function () { - function WindowOperator(closingSelector) { - this.closingSelector = closingSelector; +var SampleTimeOperator = /*@__PURE__*/ (function () { + function SampleTimeOperator(period, scheduler) { + this.period = period; + this.scheduler = scheduler; } - WindowOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new WindowSubscriber(subscriber, this.closingSelector)); + SampleTimeOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new SampleTimeSubscriber(subscriber, this.period, this.scheduler)); }; - return WindowOperator; + return SampleTimeOperator; }()); -var WindowSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super); - function WindowSubscriber(destination, closingSelector) { +var SampleTimeSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SampleTimeSubscriber, _super); + function SampleTimeSubscriber(destination, period, scheduler) { var _this = _super.call(this, destination) || this; - _this.destination = destination; - _this.closingSelector = closingSelector; - _this.openWindow(); + _this.period = period; + _this.scheduler = scheduler; + _this.hasValue = false; + _this.add(scheduler.schedule(dispatchNotification, period, { subscriber: _this, period: period })); return _this; } - WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.openWindow(innerSub); - }; - WindowSubscriber.prototype.notifyError = function (error, innerSub) { - this._error(error); - }; - WindowSubscriber.prototype.notifyComplete = function (innerSub) { - this.openWindow(innerSub); - }; - WindowSubscriber.prototype._next = function (value) { - this.window.next(value); - }; - WindowSubscriber.prototype._error = function (err) { - this.window.error(err); - this.destination.error(err); - this.unsubscribeClosingNotification(); - }; - WindowSubscriber.prototype._complete = function () { - this.window.complete(); - this.destination.complete(); - this.unsubscribeClosingNotification(); - }; - WindowSubscriber.prototype.unsubscribeClosingNotification = function () { - if (this.closingNotification) { - this.closingNotification.unsubscribe(); - } + SampleTimeSubscriber.prototype._next = function (value) { + this.lastValue = value; + this.hasValue = true; }; - WindowSubscriber.prototype.openWindow = function (innerSub) { - if (innerSub === void 0) { - innerSub = null; - } - if (innerSub) { - this.remove(innerSub); - innerSub.unsubscribe(); - } - var prevWindow = this.window; - if (prevWindow) { - prevWindow.complete(); - } - var window = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); - this.destination.next(window); - var closingNotifier; - try { - var closingSelector = this.closingSelector; - closingNotifier = closingSelector(); - } - catch (e) { - this.destination.error(e); - this.window.error(e); - return; + SampleTimeSubscriber.prototype.notifyNext = function () { + if (this.hasValue) { + this.hasValue = false; + this.destination.next(this.lastValue); } - this.add(this.closingNotification = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, closingNotifier)); }; - return WindowSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); -//# sourceMappingURL=windowWhen.js.map + return SampleTimeSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +function dispatchNotification(state) { + var subscriber = state.subscriber, period = state.period; + subscriber.notifyNext(); + this.schedule(state, period); +} +//# sourceMappingURL=sampleTime.js.map /***/ }), -/* 344 */ +/* 336 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return withLatestFrom; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return sequenceEqual; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceEqualOperator", function() { return SequenceEqualOperator; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SequenceEqualSubscriber", function() { return SequenceEqualSubscriber; }); /* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(182); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function withLatestFrom() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - return function (source) { - var project; - if (typeof args[args.length - 1] === 'function') { - project = args.pop(); - } - var observables = args; - return source.lift(new WithLatestFromOperator(observables, project)); - }; +function sequenceEqual(compareTo, comparator) { + return function (source) { return source.lift(new SequenceEqualOperator(compareTo, comparator)); }; } -var WithLatestFromOperator = /*@__PURE__*/ (function () { - function WithLatestFromOperator(observables, project) { - this.observables = observables; - this.project = project; +var SequenceEqualOperator = /*@__PURE__*/ (function () { + function SequenceEqualOperator(compareTo, comparator) { + this.compareTo = compareTo; + this.comparator = comparator; } - WithLatestFromOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new WithLatestFromSubscriber(subscriber, this.observables, this.project)); + SequenceEqualOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new SequenceEqualSubscriber(subscriber, this.compareTo, this.comparator)); }; - return WithLatestFromOperator; + return SequenceEqualOperator; }()); -var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WithLatestFromSubscriber, _super); - function WithLatestFromSubscriber(destination, observables, project) { + +var SequenceEqualSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualSubscriber, _super); + function SequenceEqualSubscriber(destination, compareTo, comparator) { var _this = _super.call(this, destination) || this; - _this.observables = observables; - _this.project = project; - _this.toRespond = []; - var len = observables.length; - _this.values = new Array(len); - for (var i = 0; i < len; i++) { - _this.toRespond.push(i); - } - for (var i = 0; i < len; i++) { - var observable = observables[i]; - _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, observable, observable, i)); - } + _this.compareTo = compareTo; + _this.comparator = comparator; + _this._a = []; + _this._b = []; + _this._oneComplete = false; + _this.destination.add(compareTo.subscribe(new SequenceEqualCompareToSubscriber(destination, _this))); return _this; } - WithLatestFromSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.values[outerIndex] = innerValue; - var toRespond = this.toRespond; - if (toRespond.length > 0) { - var found = toRespond.indexOf(outerIndex); - if (found !== -1) { - toRespond.splice(found, 1); - } + SequenceEqualSubscriber.prototype._next = function (value) { + if (this._oneComplete && this._b.length === 0) { + this.emit(false); + } + else { + this._a.push(value); + this.checkValues(); } }; - WithLatestFromSubscriber.prototype.notifyComplete = function () { + SequenceEqualSubscriber.prototype._complete = function () { + if (this._oneComplete) { + this.emit(this._a.length === 0 && this._b.length === 0); + } + else { + this._oneComplete = true; + } + this.unsubscribe(); }; - WithLatestFromSubscriber.prototype._next = function (value) { - if (this.toRespond.length === 0) { - var args = [value].concat(this.values); - if (this.project) { - this._tryProject(args); + SequenceEqualSubscriber.prototype.checkValues = function () { + var _c = this, _a = _c._a, _b = _c._b, comparator = _c.comparator; + while (_a.length > 0 && _b.length > 0) { + var a = _a.shift(); + var b = _b.shift(); + var areEqual = false; + try { + areEqual = comparator ? comparator(a, b) : a === b; } - else { - this.destination.next(args); + catch (e) { + this.destination.error(e); + } + if (!areEqual) { + this.emit(false); } } }; - WithLatestFromSubscriber.prototype._tryProject = function (args) { - var result; - try { - result = this.project.apply(this, args); + SequenceEqualSubscriber.prototype.emit = function (value) { + var destination = this.destination; + destination.next(value); + destination.complete(); + }; + SequenceEqualSubscriber.prototype.nextB = function (value) { + if (this._oneComplete && this._a.length === 0) { + this.emit(false); } - catch (err) { - this.destination.error(err); - return; + else { + this._b.push(value); + this.checkValues(); } - this.destination.next(result); }; - return WithLatestFromSubscriber; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); -//# sourceMappingURL=withLatestFrom.js.map + SequenceEqualSubscriber.prototype.completeB = function () { + if (this._oneComplete) { + this.emit(this._a.length === 0 && this._b.length === 0); + } + else { + this._oneComplete = true; + } + }; + return SequenceEqualSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); + +var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SequenceEqualCompareToSubscriber, _super); + function SequenceEqualCompareToSubscriber(destination, parent) { + var _this = _super.call(this, destination) || this; + _this.parent = parent; + return _this; + } + SequenceEqualCompareToSubscriber.prototype._next = function (value) { + this.parent.nextB(value); + }; + SequenceEqualCompareToSubscriber.prototype._error = function (err) { + this.parent.error(err); + this.unsubscribe(); + }; + SequenceEqualCompareToSubscriber.prototype._complete = function () { + this.parent.completeB(); + this.unsubscribe(); + }; + return SequenceEqualCompareToSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=sequenceEqual.js.map /***/ }), -/* 345 */ +/* 337 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; }); -/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346); -/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "share", function() { return share; }); +/* harmony import */ var _multicast__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(320); +/* harmony import */ var _refCount__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(190); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(187); +/** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */ -function zip() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - return function zipOperatorFunction(source) { - return source.lift.call(_observable_zip__WEBPACK_IMPORTED_MODULE_0__["zip"].apply(void 0, [source].concat(observables))); - }; + + +function shareSubjectFactory() { + return new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"](); } -//# sourceMappingURL=zip.js.map +function share() { + return function (source) { return Object(_refCount__WEBPACK_IMPORTED_MODULE_1__["refCount"])()(Object(_multicast__WEBPACK_IMPORTED_MODULE_0__["multicast"])(shareSubjectFactory)(source)); }; +} +//# sourceMappingURL=share.js.map /***/ }), -/* 346 */ +/* 338 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipOperator", function() { return ZipOperator; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ZipSubscriber", function() { return ZipSubscriber; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _fromArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178); -/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172); -/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(171); -/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(182); -/* harmony import */ var _internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(188); -/** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_OuterSubscriber,_util_subscribeToResult,_.._internal_symbol_iterator PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return shareReplay; }); +/* harmony import */ var _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); +/** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */ +function shareReplay(configOrBufferSize, windowTime, scheduler) { + var config; + if (configOrBufferSize && typeof configOrBufferSize === 'object') { + config = configOrBufferSize; + } + else { + config = { + bufferSize: configOrBufferSize, + windowTime: windowTime, + refCount: false, + scheduler: scheduler + }; + } + return function (source) { return source.lift(shareReplayOperator(config)); }; +} +function shareReplayOperator(_a) { + var _b = _a.bufferSize, bufferSize = _b === void 0 ? Number.POSITIVE_INFINITY : _b, _c = _a.windowTime, windowTime = _c === void 0 ? Number.POSITIVE_INFINITY : _c, useRefCount = _a.refCount, scheduler = _a.scheduler; + var subject; + var refCount = 0; + var subscription; + var hasError = false; + var isComplete = false; + return function shareReplayOperation(source) { + refCount++; + if (!subject || hasError) { + hasError = false; + subject = new _ReplaySubject__WEBPACK_IMPORTED_MODULE_0__["ReplaySubject"](bufferSize, windowTime, scheduler); + subscription = source.subscribe({ + next: function (value) { subject.next(value); }, + error: function (err) { + hasError = true; + subject.error(err); + }, + complete: function () { + isComplete = true; + subject.complete(); + }, + }); + } + var innerSub = subject.subscribe(this); + this.add(function () { + refCount--; + innerSub.unsubscribe(); + if (subscription && !isComplete && useRefCount && refCount === 0) { + subscription.unsubscribe(); + subscription = undefined; + subject = undefined; + } + }); + }; +} +//# sourceMappingURL=shareReplay.js.map +/***/ }), +/* 339 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "single", function() { return single; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(223); +/** PURE_IMPORTS_START tslib,_Subscriber,_util_EmptyError PURE_IMPORTS_END */ -function zip() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - var resultSelector = observables[observables.length - 1]; - if (typeof resultSelector === 'function') { - observables.pop(); - } - return Object(_fromArray__WEBPACK_IMPORTED_MODULE_1__["fromArray"])(observables, undefined).lift(new ZipOperator(resultSelector)); +function single(predicate) { + return function (source) { return source.lift(new SingleOperator(predicate, source)); }; } -var ZipOperator = /*@__PURE__*/ (function () { - function ZipOperator(resultSelector) { - this.resultSelector = resultSelector; +var SingleOperator = /*@__PURE__*/ (function () { + function SingleOperator(predicate, source) { + this.predicate = predicate; + this.source = source; } - ZipOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ZipSubscriber(subscriber, this.resultSelector)); + SingleOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new SingleSubscriber(subscriber, this.predicate, this.source)); }; - return ZipOperator; + return SingleOperator; }()); - -var ZipSubscriber = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipSubscriber, _super); - function ZipSubscriber(destination, resultSelector, values) { - if (values === void 0) { - values = Object.create(null); - } +var SingleSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SingleSubscriber, _super); + function SingleSubscriber(destination, predicate, source) { var _this = _super.call(this, destination) || this; - _this.iterators = []; - _this.active = 0; - _this.resultSelector = (typeof resultSelector === 'function') ? resultSelector : null; - _this.values = values; + _this.predicate = predicate; + _this.source = source; + _this.seenValue = false; + _this.index = 0; return _this; } - ZipSubscriber.prototype._next = function (value) { - var iterators = this.iterators; - if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(value)) { - iterators.push(new StaticArrayIterator(value)); - } - else if (typeof value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] === 'function') { - iterators.push(new StaticIterator(value[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]]())); + SingleSubscriber.prototype.applySingleValue = function (value) { + if (this.seenValue) { + this.destination.error('Sequence contains more than one element'); } else { - iterators.push(new ZipBufferIterator(this.destination, this, value)); + this.seenValue = true; + this.singleValue = value; } }; - ZipSubscriber.prototype._complete = function () { - var iterators = this.iterators; - var len = iterators.length; - this.unsubscribe(); - if (len === 0) { - this.destination.complete(); - return; + SingleSubscriber.prototype._next = function (value) { + var index = this.index++; + if (this.predicate) { + this.tryNext(value, index); } - this.active = len; - for (var i = 0; i < len; i++) { - var iterator = iterators[i]; - if (iterator.stillUnsubscribed) { - var destination = this.destination; - destination.add(iterator.subscribe(iterator, i)); - } - else { - this.active--; - } + else { + this.applySingleValue(value); } }; - ZipSubscriber.prototype.notifyInactive = function () { - this.active--; - if (this.active === 0) { - this.destination.complete(); + SingleSubscriber.prototype.tryNext = function (value, index) { + try { + if (this.predicate(value, index, this.source)) { + this.applySingleValue(value); + } + } + catch (err) { + this.destination.error(err); } }; - ZipSubscriber.prototype.checkIterators = function () { - var iterators = this.iterators; - var len = iterators.length; + SingleSubscriber.prototype._complete = function () { var destination = this.destination; - for (var i = 0; i < len; i++) { - var iterator = iterators[i]; - if (typeof iterator.hasValue === 'function' && !iterator.hasValue()) { - return; - } + if (this.index > 0) { + destination.next(this.seenValue ? this.singleValue : undefined); + destination.complete(); } - var shouldComplete = false; - var args = []; - for (var i = 0; i < len; i++) { - var iterator = iterators[i]; - var result = iterator.next(); - if (iterator.hasCompleted()) { - shouldComplete = true; - } - if (result.done) { - destination.complete(); - return; - } - args.push(result.value); + else { + destination.error(new _util_EmptyError__WEBPACK_IMPORTED_MODULE_2__["EmptyError"]); } - if (this.resultSelector) { - this._tryresultSelector(args); + }; + return SingleSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=single.js.map + + +/***/ }), +/* 340 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return skip; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ + + +function skip(count) { + return function (source) { return source.lift(new SkipOperator(count)); }; +} +var SkipOperator = /*@__PURE__*/ (function () { + function SkipOperator(total) { + this.total = total; + } + SkipOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new SkipSubscriber(subscriber, this.total)); + }; + return SkipOperator; +}()); +var SkipSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipSubscriber, _super); + function SkipSubscriber(destination, total) { + var _this = _super.call(this, destination) || this; + _this.total = total; + _this.count = 0; + return _this; + } + SkipSubscriber.prototype._next = function (x) { + if (++this.count > this.total) { + this.destination.next(x); } - else { - destination.next(args); + }; + return SkipSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=skip.js.map + + +/***/ }), +/* 341 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return skipLast; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(222); +/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError PURE_IMPORTS_END */ + + + +function skipLast(count) { + return function (source) { return source.lift(new SkipLastOperator(count)); }; +} +var SkipLastOperator = /*@__PURE__*/ (function () { + function SkipLastOperator(_skipCount) { + this._skipCount = _skipCount; + if (this._skipCount < 0) { + throw new _util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_2__["ArgumentOutOfRangeError"]; } - if (shouldComplete) { - destination.complete(); + } + SkipLastOperator.prototype.call = function (subscriber, source) { + if (this._skipCount === 0) { + return source.subscribe(new _Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"](subscriber)); + } + else { + return source.subscribe(new SkipLastSubscriber(subscriber, this._skipCount)); } }; - ZipSubscriber.prototype._tryresultSelector = function (args) { - var result; - try { - result = this.resultSelector.apply(this, args); + return SkipLastOperator; +}()); +var SkipLastSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipLastSubscriber, _super); + function SkipLastSubscriber(destination, _skipCount) { + var _this = _super.call(this, destination) || this; + _this._skipCount = _skipCount; + _this._count = 0; + _this._ring = new Array(_skipCount); + return _this; + } + SkipLastSubscriber.prototype._next = function (value) { + var skipCount = this._skipCount; + var count = this._count++; + if (count < skipCount) { + this._ring[count] = value; } - catch (err) { - this.destination.error(err); - return; + else { + var currentIndex = count % skipCount; + var ring = this._ring; + var oldValue = ring[currentIndex]; + ring[currentIndex] = value; + this.destination.next(oldValue); } - this.destination.next(result); }; - return ZipSubscriber; -}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"])); + return SkipLastSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=skipLast.js.map -var StaticIterator = /*@__PURE__*/ (function () { - function StaticIterator(iterator) { - this.iterator = iterator; - this.nextResult = iterator.next(); + +/***/ }), +/* 342 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return skipUntil; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ + + + + +function skipUntil(notifier) { + return function (source) { return source.lift(new SkipUntilOperator(notifier)); }; +} +var SkipUntilOperator = /*@__PURE__*/ (function () { + function SkipUntilOperator(notifier) { + this.notifier = notifier; } - StaticIterator.prototype.hasValue = function () { - return true; - }; - StaticIterator.prototype.next = function () { - var result = this.nextResult; - this.nextResult = this.iterator.next(); - return result; - }; - StaticIterator.prototype.hasCompleted = function () { - var nextResult = this.nextResult; - return nextResult && nextResult.done; + SkipUntilOperator.prototype.call = function (destination, source) { + return source.subscribe(new SkipUntilSubscriber(destination, this.notifier)); }; - return StaticIterator; + return SkipUntilOperator; }()); -var StaticArrayIterator = /*@__PURE__*/ (function () { - function StaticArrayIterator(array) { - this.array = array; - this.index = 0; - this.length = 0; - this.length = array.length; +var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipUntilSubscriber, _super); + function SkipUntilSubscriber(destination, notifier) { + var _this = _super.call(this, destination) || this; + _this.hasValue = false; + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](_this, undefined, undefined); + _this.add(innerSubscriber); + _this.innerSubscription = innerSubscriber; + Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(_this, notifier, undefined, undefined, innerSubscriber); + return _this; } - StaticArrayIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] = function () { - return this; + SkipUntilSubscriber.prototype._next = function (value) { + if (this.hasValue) { + _super.prototype._next.call(this, value); + } }; - StaticArrayIterator.prototype.next = function (value) { - var i = this.index++; - var array = this.array; - return i < this.length ? { value: array[i], done: false } : { value: null, done: true }; + SkipUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.hasValue = true; + if (this.innerSubscription) { + this.innerSubscription.unsubscribe(); + } }; - StaticArrayIterator.prototype.hasValue = function () { - return this.array.length > this.index; + SkipUntilSubscriber.prototype.notifyComplete = function () { }; - StaticArrayIterator.prototype.hasCompleted = function () { - return this.array.length === this.index; + return SkipUntilSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=skipUntil.js.map + + +/***/ }), +/* 343 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return skipWhile; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ + + +function skipWhile(predicate) { + return function (source) { return source.lift(new SkipWhileOperator(predicate)); }; +} +var SkipWhileOperator = /*@__PURE__*/ (function () { + function SkipWhileOperator(predicate) { + this.predicate = predicate; + } + SkipWhileOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new SkipWhileSubscriber(subscriber, this.predicate)); }; - return StaticArrayIterator; + return SkipWhileOperator; }()); -var ZipBufferIterator = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ZipBufferIterator, _super); - function ZipBufferIterator(destination, parent, observable) { +var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SkipWhileSubscriber, _super); + function SkipWhileSubscriber(destination, predicate) { var _this = _super.call(this, destination) || this; - _this.parent = parent; - _this.observable = observable; - _this.stillUnsubscribed = true; - _this.buffer = []; - _this.isComplete = false; + _this.predicate = predicate; + _this.skipping = true; + _this.index = 0; return _this; } - ZipBufferIterator.prototype[_internal_symbol_iterator__WEBPACK_IMPORTED_MODULE_6__["iterator"]] = function () { - return this; - }; - ZipBufferIterator.prototype.next = function () { - var buffer = this.buffer; - if (buffer.length === 0 && this.isComplete) { - return { value: null, done: true }; + SkipWhileSubscriber.prototype._next = function (value) { + var destination = this.destination; + if (this.skipping) { + this.tryCallPredicate(value); } - else { - return { value: buffer.shift(), done: false }; + if (!this.skipping) { + destination.next(value); } }; - ZipBufferIterator.prototype.hasValue = function () { - return this.buffer.length > 0; - }; - ZipBufferIterator.prototype.hasCompleted = function () { - return this.buffer.length === 0 && this.isComplete; - }; - ZipBufferIterator.prototype.notifyComplete = function () { - if (this.buffer.length > 0) { - this.isComplete = true; - this.parent.notifyInactive(); + SkipWhileSubscriber.prototype.tryCallPredicate = function (value) { + try { + var result = this.predicate(value, this.index++); + this.skipping = Boolean(result); } - else { - this.destination.complete(); + catch (err) { + this.destination.error(err); } }; - ZipBufferIterator.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.buffer.push(innerValue); - this.parent.checkIterators(); - }; - ZipBufferIterator.prototype.subscribe = function (value, index) { - return Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_5__["subscribeToResult"])(this, this.observable, this, index); - }; - return ZipBufferIterator; -}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_4__["OuterSubscriber"])); -//# sourceMappingURL=zip.js.map + return SkipWhileSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=skipWhile.js.map /***/ }), -/* 347 */ +/* 344 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return zipAll; }); -/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346); -/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return startWith; }); +/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(239); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(205); +/** PURE_IMPORTS_START _observable_concat,_util_isScheduler PURE_IMPORTS_END */ -function zipAll(project) { - return function (source) { return source.lift(new _observable_zip__WEBPACK_IMPORTED_MODULE_0__["ZipOperator"](project)); }; + +function startWith() { + var array = []; + for (var _i = 0; _i < arguments.length; _i++) { + array[_i] = arguments[_i]; + } + var scheduler = array[array.length - 1]; + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_1__["isScheduler"])(scheduler)) { + array.pop(); + return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source, scheduler); }; + } + else { + return function (source) { return Object(_observable_concat__WEBPACK_IMPORTED_MODULE_0__["concat"])(array, source); }; + } } -//# sourceMappingURL=zipAll.js.map +//# sourceMappingURL=startWith.js.map /***/ }), -/* 348 */ -/***/ (function(module, exports, __webpack_require__) { +/* 345 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return subscribeOn; }); +/* harmony import */ var _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(346); +/** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */ +function subscribeOn(scheduler, delay) { + if (delay === void 0) { + delay = 0; + } + return function subscribeOnOperatorFunction(source) { + return source.lift(new SubscribeOnOperator(scheduler, delay)); + }; +} +var SubscribeOnOperator = /*@__PURE__*/ (function () { + function SubscribeOnOperator(scheduler, delay) { + this.scheduler = scheduler; + this.delay = delay; + } + SubscribeOnOperator.prototype.call = function (subscriber, source) { + return new _observable_SubscribeOnObservable__WEBPACK_IMPORTED_MODULE_0__["SubscribeOnObservable"](source, this.delay, this.scheduler).subscribe(subscriber); + }; + return SubscribeOnOperator; +}()); +//# sourceMappingURL=subscribeOn.js.map -const callbacks = new Set(); -let called = false; - -function exit(exit, signal) { - if (called) { - return; - } - called = true; +/***/ }), +/* 346 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - for (const callback of callbacks) { - callback(); - } +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SubscribeOnObservable", function() { return SubscribeOnObservable; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(170); +/* harmony import */ var _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(211); +/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(257); +/** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */ - if (exit === true) { - process.exit(128 + signal); // eslint-disable-line unicorn/no-process-exit - } -} -module.exports = callback => { - callbacks.add(callback); - if (callbacks.size === 1) { - process.once('exit', exit); - process.once('SIGINT', exit.bind(null, true, 2)); - process.once('SIGTERM', exit.bind(null, true, 15)); - // PM2 Cluster shutdown message. Caught to support async handlers with pm2, needed because - // explicitly calling process.exit() doesn't trigger the beforeExit event, and the exit - // event cannot support async handlers, since the event loop is never called after it. - process.on('message', message => { - if (message === 'shutdown') { - exit(true, -128); - } - }); - } +var SubscribeOnObservable = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SubscribeOnObservable, _super); + function SubscribeOnObservable(source, delayTime, scheduler) { + if (delayTime === void 0) { + delayTime = 0; + } + if (scheduler === void 0) { + scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"]; + } + var _this = _super.call(this) || this; + _this.source = source; + _this.delayTime = delayTime; + _this.scheduler = scheduler; + if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_3__["isNumeric"])(delayTime) || delayTime < 0) { + _this.delayTime = 0; + } + if (!scheduler || typeof scheduler.schedule !== 'function') { + _this.scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"]; + } + return _this; + } + SubscribeOnObservable.create = function (source, delay, scheduler) { + if (delay === void 0) { + delay = 0; + } + if (scheduler === void 0) { + scheduler = _scheduler_asap__WEBPACK_IMPORTED_MODULE_2__["asap"]; + } + return new SubscribeOnObservable(source, delay, scheduler); + }; + SubscribeOnObservable.dispatch = function (arg) { + var source = arg.source, subscriber = arg.subscriber; + return this.add(source.subscribe(subscriber)); + }; + SubscribeOnObservable.prototype._subscribe = function (subscriber) { + var delay = this.delayTime; + var source = this.source; + var scheduler = this.scheduler; + return scheduler.schedule(SubscribeOnObservable.dispatch, delay, { + source: source, subscriber: subscriber + }); + }; + return SubscribeOnObservable; +}(_Observable__WEBPACK_IMPORTED_MODULE_1__["Observable"])); - return () => { - callbacks.delete(callback); - }; -}; +//# sourceMappingURL=SubscribeOnObservable.js.map /***/ }), -/* 349 */ -/***/ (function(module, exports, __webpack_require__) { +/* 347 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return switchAll; }); +/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(348); +/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(220); +/** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -const $isCliError = Symbol('isCliError'); -function createCliError(message) { - const error = new Error(message); - error[$isCliError] = true; - return error; -} -exports.createCliError = createCliError; -function isCliError(error) { - return error && !!error[$isCliError]; + +function switchAll() { + return Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(_util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]); } -exports.isCliError = isCliError; +//# sourceMappingURL=switchAll.js.map /***/ }), -/* 350 */ -/***/ (function(module, exports, __webpack_require__) { +/* 348 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return switchMap; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(230); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(226); +/* harmony import */ var _observable_from__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(243); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_InnerSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -const tslib_1 = __webpack_require__(36); -const execa_1 = tslib_1.__importDefault(__webpack_require__(351)); -const fs_1 = __webpack_require__(23); -const Rx = tslib_1.__importStar(__webpack_require__(391)); -const operators_1 = __webpack_require__(169); -const chalk_1 = tslib_1.__importDefault(__webpack_require__(2)); -const tree_kill_1 = tslib_1.__importDefault(__webpack_require__(411)); -const util_1 = __webpack_require__(29); -const treeKillAsync = util_1.promisify((...args) => tree_kill_1.default(...args)); -const observe_lines_1 = __webpack_require__(412); -const errors_1 = __webpack_require__(349); -const SECOND = 1000; -const STOP_TIMEOUT = 30 * SECOND; -async function withTimeout(attempt, ms, onTimeout) { - const TIMEOUT = Symbol('timeout'); - try { - await Promise.race([ - attempt(), - new Promise((_, reject) => setTimeout(() => reject(TIMEOUT), ms)), - ]); - } - catch (error) { - if (error === TIMEOUT) { - await onTimeout(); - } - else { - throw error; - } + + + + + +function switchMap(project, resultSelector) { + if (typeof resultSelector === 'function') { + return function (source) { return source.pipe(switchMap(function (a, i) { return Object(_observable_from__WEBPACK_IMPORTED_MODULE_5__["from"])(project(a, i)).pipe(Object(_map__WEBPACK_IMPORTED_MODULE_4__["map"])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; } + return function (source) { return source.lift(new SwitchMapOperator(project)); }; } -function startProc(name, options, log) { - const { cmd, args, cwd, env, stdin } = options; - log.info('[%s] > %s', name, cmd, args.join(' ')); - // spawn fails with ENOENT when either the - // cmd or cwd don't exist, so we check for the cwd - // ahead of time so that the error is less ambiguous - try { - if (!fs_1.statSync(cwd).isDirectory()) { - throw new Error(`cwd "${cwd}" exists but is not a directory`); - } - } - catch (err) { - if (err.code === 'ENOENT') { - throw new Error(`cwd "${cwd}" does not exist`); - } - } - const childProcess = execa_1.default(cmd, args, { - cwd, - env, - stdio: ['pipe', 'pipe', 'pipe'], - preferLocal: true, - }); - if (stdin) { - childProcess.stdin.end(stdin, 'utf8'); +var SwitchMapOperator = /*@__PURE__*/ (function () { + function SwitchMapOperator(project) { + this.project = project; } - else { - childProcess.stdin.end(); + SwitchMapOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new SwitchMapSubscriber(subscriber, this.project)); + }; + return SwitchMapOperator; +}()); +var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](SwitchMapSubscriber, _super); + function SwitchMapSubscriber(destination, project) { + var _this = _super.call(this, destination) || this; + _this.project = project; + _this.index = 0; + return _this; } - let stopCalled = false; - const outcome$ = Rx.race( - // observe first exit event - Rx.fromEvent(childProcess, 'exit').pipe(operators_1.take(1), operators_1.map(([code]) => { - if (stopCalled) { - return null; - } - // JVM exits with 143 on SIGTERM and 130 on SIGINT, dont' treat then as errors - if (code > 0 && !(code === 143 || code === 130)) { - throw errors_1.createCliError(`[${name}] exited with code ${code}`); + SwitchMapSubscriber.prototype._next = function (value) { + var result; + var index = this.index++; + try { + result = this.project(value, index); } - return code; - })), - // observe first error event - Rx.fromEvent(childProcess, 'error').pipe(operators_1.take(1), operators_1.mergeMap(err => Rx.throwError(err)))).pipe(operators_1.share()); - const lines$ = Rx.merge(observe_lines_1.observeLines(childProcess.stdout), observe_lines_1.observeLines(childProcess.stderr)).pipe(operators_1.tap(line => log.write(` ${chalk_1.default.gray('proc')} [${chalk_1.default.gray(name)}] ${line}`)), operators_1.share()); - const outcomePromise = Rx.merge(lines$.pipe(operators_1.ignoreElements()), outcome$).toPromise(); - async function stop(signal) { - if (stopCalled) { + catch (error) { + this.destination.error(error); return; } - stopCalled = true; - await withTimeout(async () => { - log.debug(`Sending "${signal}" to proc "${name}"`); - await treeKillAsync(childProcess.pid, signal); - await outcomePromise; - }, STOP_TIMEOUT, async () => { - log.warning(`Proc "${name}" was sent "${signal}" didn't emit the "exit" or "error" events after ${STOP_TIMEOUT} ms, sending SIGKILL`); - await treeKillAsync(childProcess.pid, 'SIGKILL'); - }); - await withTimeout(async () => { - try { - await outcomePromise; - } - catch (error) { - // ignore - } - }, STOP_TIMEOUT, async () => { - throw new Error(`Proc "${name}" was stopped but never emitted either the "exit" or "error" event after ${STOP_TIMEOUT} ms`); - }); - } - return { - name, - lines$, - outcome$, - outcomePromise, - stop, + this._innerSub(result, value, index); }; -} -exports.startProc = startProc; + SwitchMapSubscriber.prototype._innerSub = function (result, value, index) { + var innerSubscription = this.innerSubscription; + if (innerSubscription) { + innerSubscription.unsubscribe(); + } + var innerSubscriber = new _InnerSubscriber__WEBPACK_IMPORTED_MODULE_2__["InnerSubscriber"](this, undefined, undefined); + var destination = this.destination; + destination.add(innerSubscriber); + this.innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, result, value, index, innerSubscriber); + }; + SwitchMapSubscriber.prototype._complete = function () { + var innerSubscription = this.innerSubscription; + if (!innerSubscription || innerSubscription.closed) { + _super.prototype._complete.call(this); + } + this.unsubscribe(); + }; + SwitchMapSubscriber.prototype._unsubscribe = function () { + this.innerSubscription = null; + }; + SwitchMapSubscriber.prototype.notifyComplete = function (innerSub) { + var destination = this.destination; + destination.remove(innerSub); + this.innerSubscription = null; + if (this.isStopped) { + _super.prototype._complete.call(this); + } + }; + SwitchMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.destination.next(innerValue); + }; + return SwitchMapSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=switchMap.js.map /***/ }), -/* 351 */ -/***/ (function(module, exports, __webpack_require__) { +/* 349 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return switchMapTo; }); +/* harmony import */ var _switchMap__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(348); +/** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */ -const path = __webpack_require__(16); -const childProcess = __webpack_require__(352); -const crossSpawn = __webpack_require__(353); -const stripFinalNewline = __webpack_require__(366); -const npmRunPath = __webpack_require__(367); -const onetime = __webpack_require__(368); -const makeError = __webpack_require__(370); -const normalizeStdio = __webpack_require__(375); -const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(376); -const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(380); -const {mergePromise, getSpawnedPromise} = __webpack_require__(389); -const {joinCommand, parseCommand} = __webpack_require__(390); +function switchMapTo(innerObservable, resultSelector) { + return resultSelector ? Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; }, resultSelector) : Object(_switchMap__WEBPACK_IMPORTED_MODULE_0__["switchMap"])(function () { return innerObservable; }); +} +//# sourceMappingURL=switchMapTo.js.map -const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100; -const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => { - const env = extendEnv ? {...process.env, ...envOption} : envOption; +/***/ }), +/* 350 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - if (preferLocal) { - return npmRunPath.env({env, cwd: localDir, execPath}); - } +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return takeUntil; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - return env; -}; -const handleArgs = (file, args, options = {}) => { - const parsed = crossSpawn._parse(file, args, options); - file = parsed.command; - args = parsed.args; - options = parsed.options; - options = { - maxBuffer: DEFAULT_MAX_BUFFER, - buffer: true, - stripFinalNewline: true, - extendEnv: true, - preferLocal: false, - localDir: options.cwd || process.cwd(), - execPath: process.execPath, - encoding: 'utf8', - reject: true, - cleanup: true, - all: false, - windowsHide: true, - ...options - }; +function takeUntil(notifier) { + return function (source) { return source.lift(new TakeUntilOperator(notifier)); }; +} +var TakeUntilOperator = /*@__PURE__*/ (function () { + function TakeUntilOperator(notifier) { + this.notifier = notifier; + } + TakeUntilOperator.prototype.call = function (subscriber, source) { + var takeUntilSubscriber = new TakeUntilSubscriber(subscriber); + var notifierSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(takeUntilSubscriber, this.notifier); + if (notifierSubscription && !takeUntilSubscriber.seenValue) { + takeUntilSubscriber.add(notifierSubscription); + return source.subscribe(takeUntilSubscriber); + } + return takeUntilSubscriber; + }; + return TakeUntilOperator; +}()); +var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeUntilSubscriber, _super); + function TakeUntilSubscriber(destination) { + var _this = _super.call(this, destination) || this; + _this.seenValue = false; + return _this; + } + TakeUntilSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.seenValue = true; + this.complete(); + }; + TakeUntilSubscriber.prototype.notifyComplete = function () { + }; + return TakeUntilSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=takeUntil.js.map - options.env = getEnv(options); - options.stdio = normalizeStdio(options); +/***/ }), +/* 351 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') { - // #116 - args.unshift('/q'); - } +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return takeWhile; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - return {file, args, options, parsed}; -}; -const handleOutput = (options, value, error) => { - if (typeof value !== 'string' && !Buffer.isBuffer(value)) { - // When `execa.sync()` errors, we normalize it to '' to mimic `execa()` - return error === undefined ? undefined : ''; - } +function takeWhile(predicate, inclusive) { + if (inclusive === void 0) { + inclusive = false; + } + return function (source) { + return source.lift(new TakeWhileOperator(predicate, inclusive)); + }; +} +var TakeWhileOperator = /*@__PURE__*/ (function () { + function TakeWhileOperator(predicate, inclusive) { + this.predicate = predicate; + this.inclusive = inclusive; + } + TakeWhileOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new TakeWhileSubscriber(subscriber, this.predicate, this.inclusive)); + }; + return TakeWhileOperator; +}()); +var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TakeWhileSubscriber, _super); + function TakeWhileSubscriber(destination, predicate, inclusive) { + var _this = _super.call(this, destination) || this; + _this.predicate = predicate; + _this.inclusive = inclusive; + _this.index = 0; + return _this; + } + TakeWhileSubscriber.prototype._next = function (value) { + var destination = this.destination; + var result; + try { + result = this.predicate(value, this.index++); + } + catch (err) { + destination.error(err); + return; + } + this.nextOrComplete(value, result); + }; + TakeWhileSubscriber.prototype.nextOrComplete = function (value, predicateResult) { + var destination = this.destination; + if (Boolean(predicateResult)) { + destination.next(value); + } + else { + if (this.inclusive) { + destination.next(value); + } + destination.complete(); + } + }; + return TakeWhileSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=takeWhile.js.map - if (options.stripFinalNewline) { - return stripFinalNewline(value); - } - return value; -}; +/***/ }), +/* 352 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -const execa = (file, args, options) => { - const parsed = handleArgs(file, args, options); - const command = joinCommand(file, args); +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return tap; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(185); +/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(173); +/** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */ - let spawned; - try { - spawned = childProcess.spawn(parsed.file, parsed.args, parsed.options); - } catch (error) { - // Ensure the returned error is always both a promise and a child process - const dummySpawned = new childProcess.ChildProcess(); - const errorPromise = Promise.reject(makeError({ - error, - stdout: '', - stderr: '', - all: '', - command, - parsed, - timedOut: false, - isCanceled: false, - killed: false - })); - return mergePromise(dummySpawned, errorPromise); - } - const spawnedPromise = getSpawnedPromise(spawned); - const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise); - const processDone = setExitHandler(spawned, parsed.options, timedPromise); - - const context = {isCanceled: false}; - - spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned)); - spawned.cancel = spawnedCancel.bind(null, spawned, context); - - const handlePromise = async () => { - const [{error, exitCode, signal, timedOut}, stdoutResult, stderrResult, allResult] = await getSpawnedResult(spawned, parsed.options, processDone); - const stdout = handleOutput(parsed.options, stdoutResult); - const stderr = handleOutput(parsed.options, stderrResult); - const all = handleOutput(parsed.options, allResult); - - if (error || exitCode !== 0 || signal !== null) { - const returnedError = makeError({ - error, - exitCode, - signal, - stdout, - stderr, - all, - command, - parsed, - timedOut, - isCanceled: context.isCanceled, - killed: spawned.killed - }); - if (!parsed.options.reject) { - return returnedError; - } - throw returnedError; - } +function tap(nextOrObserver, error, complete) { + return function tapOperatorFunction(source) { + return source.lift(new DoOperator(nextOrObserver, error, complete)); + }; +} +var DoOperator = /*@__PURE__*/ (function () { + function DoOperator(nextOrObserver, error, complete) { + this.nextOrObserver = nextOrObserver; + this.error = error; + this.complete = complete; + } + DoOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new TapSubscriber(subscriber, this.nextOrObserver, this.error, this.complete)); + }; + return DoOperator; +}()); +var TapSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TapSubscriber, _super); + function TapSubscriber(destination, observerOrNext, error, complete) { + var _this = _super.call(this, destination) || this; + _this._tapNext = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapError = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapComplete = _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapError = error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapComplete = complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_3__["isFunction"])(observerOrNext)) { + _this._context = _this; + _this._tapNext = observerOrNext; + } + else if (observerOrNext) { + _this._context = observerOrNext; + _this._tapNext = observerOrNext.next || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapError = observerOrNext.error || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + _this._tapComplete = observerOrNext.complete || _util_noop__WEBPACK_IMPORTED_MODULE_2__["noop"]; + } + return _this; + } + TapSubscriber.prototype._next = function (value) { + try { + this._tapNext.call(this._context, value); + } + catch (err) { + this.destination.error(err); + return; + } + this.destination.next(value); + }; + TapSubscriber.prototype._error = function (err) { + try { + this._tapError.call(this._context, err); + } + catch (err) { + this.destination.error(err); + return; + } + this.destination.error(err); + }; + TapSubscriber.prototype._complete = function () { + try { + this._tapComplete.call(this._context); + } + catch (err) { + this.destination.error(err); + return; + } + return this.destination.complete(); + }; + return TapSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=tap.js.map - return { - command, - exitCode: 0, - stdout, - stderr, - all, - failed: false, - timedOut: false, - isCanceled: false, - killed: false - }; - }; - const handlePromiseOnce = onetime(handlePromise); +/***/ }), +/* 353 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed); +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultThrottleConfig", function() { return defaultThrottleConfig; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return throttle; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ - handleInput(spawned, parsed.options.input); - spawned.all = makeAllStream(spawned, parsed.options); - return mergePromise(spawned, handlePromiseOnce); +var defaultThrottleConfig = { + leading: true, + trailing: false }; +function throttle(durationSelector, config) { + if (config === void 0) { + config = defaultThrottleConfig; + } + return function (source) { return source.lift(new ThrottleOperator(durationSelector, config.leading, config.trailing)); }; +} +var ThrottleOperator = /*@__PURE__*/ (function () { + function ThrottleOperator(durationSelector, leading, trailing) { + this.durationSelector = durationSelector; + this.leading = leading; + this.trailing = trailing; + } + ThrottleOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ThrottleSubscriber(subscriber, this.durationSelector, this.leading, this.trailing)); + }; + return ThrottleOperator; +}()); +var ThrottleSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleSubscriber, _super); + function ThrottleSubscriber(destination, durationSelector, _leading, _trailing) { + var _this = _super.call(this, destination) || this; + _this.destination = destination; + _this.durationSelector = durationSelector; + _this._leading = _leading; + _this._trailing = _trailing; + _this._hasValue = false; + return _this; + } + ThrottleSubscriber.prototype._next = function (value) { + this._hasValue = true; + this._sendValue = value; + if (!this._throttled) { + if (this._leading) { + this.send(); + } + else { + this.throttle(value); + } + } + }; + ThrottleSubscriber.prototype.send = function () { + var _a = this, _hasValue = _a._hasValue, _sendValue = _a._sendValue; + if (_hasValue) { + this.destination.next(_sendValue); + this.throttle(_sendValue); + } + this._hasValue = false; + this._sendValue = null; + }; + ThrottleSubscriber.prototype.throttle = function (value) { + var duration = this.tryDurationSelector(value); + if (!!duration) { + this.add(this._throttled = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(this, duration)); + } + }; + ThrottleSubscriber.prototype.tryDurationSelector = function (value) { + try { + return this.durationSelector(value); + } + catch (err) { + this.destination.error(err); + return null; + } + }; + ThrottleSubscriber.prototype.throttlingDone = function () { + var _a = this, _throttled = _a._throttled, _trailing = _a._trailing; + if (_throttled) { + _throttled.unsubscribe(); + } + this._throttled = null; + if (_trailing) { + this.send(); + } + }; + ThrottleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.throttlingDone(); + }; + ThrottleSubscriber.prototype.notifyComplete = function () { + this.throttlingDone(); + }; + return ThrottleSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=throttle.js.map -module.exports = execa; - -module.exports.sync = (file, args, options) => { - const parsed = handleArgs(file, args, options); - const command = joinCommand(file, args); - - validateInputSync(parsed.options); - let result; - try { - result = childProcess.spawnSync(parsed.file, parsed.args, parsed.options); - } catch (error) { - throw makeError({ - error, - stdout: '', - stderr: '', - all: '', - command, - parsed, - timedOut: false, - isCanceled: false, - killed: false - }); - } +/***/ }), +/* 354 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - const stdout = handleOutput(parsed.options, result.stdout, result.error); - const stderr = handleOutput(parsed.options, result.stderr, result.error); +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return throttleTime; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(215); +/* harmony import */ var _throttle__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(353); +/** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */ - if (result.error || result.status !== 0 || result.signal !== null) { - const error = makeError({ - stdout, - stderr, - error: result.error, - signal: result.signal, - exitCode: result.status, - command, - parsed, - timedOut: result.error && result.error.code === 'ETIMEDOUT', - isCanceled: false, - killed: result.signal !== null - }); - if (!parsed.options.reject) { - return error; - } - throw error; - } - return { - command, - exitCode: 0, - stdout, - stderr, - failed: false, - timedOut: false, - isCanceled: false, - killed: false - }; -}; +function throttleTime(duration, scheduler, config) { + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"]; + } + if (config === void 0) { + config = _throttle__WEBPACK_IMPORTED_MODULE_3__["defaultThrottleConfig"]; + } + return function (source) { return source.lift(new ThrottleTimeOperator(duration, scheduler, config.leading, config.trailing)); }; +} +var ThrottleTimeOperator = /*@__PURE__*/ (function () { + function ThrottleTimeOperator(duration, scheduler, leading, trailing) { + this.duration = duration; + this.scheduler = scheduler; + this.leading = leading; + this.trailing = trailing; + } + ThrottleTimeOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ThrottleTimeSubscriber(subscriber, this.duration, this.scheduler, this.leading, this.trailing)); + }; + return ThrottleTimeOperator; +}()); +var ThrottleTimeSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](ThrottleTimeSubscriber, _super); + function ThrottleTimeSubscriber(destination, duration, scheduler, leading, trailing) { + var _this = _super.call(this, destination) || this; + _this.duration = duration; + _this.scheduler = scheduler; + _this.leading = leading; + _this.trailing = trailing; + _this._hasTrailingValue = false; + _this._trailingValue = null; + return _this; + } + ThrottleTimeSubscriber.prototype._next = function (value) { + if (this.throttled) { + if (this.trailing) { + this._trailingValue = value; + this._hasTrailingValue = true; + } + } + else { + this.add(this.throttled = this.scheduler.schedule(dispatchNext, this.duration, { subscriber: this })); + if (this.leading) { + this.destination.next(value); + } + else if (this.trailing) { + this._trailingValue = value; + this._hasTrailingValue = true; + } + } + }; + ThrottleTimeSubscriber.prototype._complete = function () { + if (this._hasTrailingValue) { + this.destination.next(this._trailingValue); + this.destination.complete(); + } + else { + this.destination.complete(); + } + }; + ThrottleTimeSubscriber.prototype.clearThrottle = function () { + var throttled = this.throttled; + if (throttled) { + if (this.trailing && this._hasTrailingValue) { + this.destination.next(this._trailingValue); + this._trailingValue = null; + this._hasTrailingValue = false; + } + throttled.unsubscribe(); + this.remove(throttled); + this.throttled = null; + } + }; + return ThrottleTimeSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +function dispatchNext(arg) { + var subscriber = arg.subscriber; + subscriber.clearThrottle(); +} +//# sourceMappingURL=throttleTime.js.map -module.exports.command = (command, options) => { - const [file, ...args] = parseCommand(command); - return execa(file, args, options); -}; -module.exports.commandSync = (command, options) => { - const [file, ...args] = parseCommand(command); - return execa.sync(file, args, options); -}; +/***/ }), +/* 355 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -module.exports.node = (scriptPath, args, options = {}) => { - if (args && !Array.isArray(args) && typeof args === 'object') { - options = args; - args = []; - } +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return timeInterval; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TimeInterval", function() { return TimeInterval; }); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(215); +/* harmony import */ var _scan__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(315); +/* harmony import */ var _observable_defer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(250); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(226); +/** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */ - const stdio = normalizeStdio.node(options); - const {nodePath = process.execPath, nodeOptions = process.execArgv} = options; - return execa( - nodePath, - [ - ...nodeOptions, - scriptPath, - ...(Array.isArray(args) ? args : []) - ], - { - ...options, - stdin: undefined, - stdout: undefined, - stderr: undefined, - stdio, - shell: false - } - ); -}; +function timeInterval(scheduler) { + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"]; + } + return function (source) { + return Object(_observable_defer__WEBPACK_IMPORTED_MODULE_2__["defer"])(function () { + return source.pipe(Object(_scan__WEBPACK_IMPORTED_MODULE_1__["scan"])(function (_a, value) { + var current = _a.current; + return ({ value: value, current: scheduler.now(), last: current }); + }, { current: scheduler.now(), value: undefined, last: undefined }), Object(_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (_a) { + var current = _a.current, last = _a.last, value = _a.value; + return new TimeInterval(value, current - last); + })); + }); + }; +} +var TimeInterval = /*@__PURE__*/ (function () { + function TimeInterval(value, interval) { + this.value = value; + this.interval = interval; + } + return TimeInterval; +}()); -/***/ }), -/* 352 */ -/***/ (function(module, exports) { +//# sourceMappingURL=timeInterval.js.map -module.exports = require("child_process"); /***/ }), -/* 353 */ -/***/ (function(module, exports, __webpack_require__) { +/* 356 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return timeout; }); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(215); +/* harmony import */ var _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(224); +/* harmony import */ var _timeoutWith__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(357); +/* harmony import */ var _observable_throwError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(209); +/** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */ -const cp = __webpack_require__(352); -const parse = __webpack_require__(354); -const enoent = __webpack_require__(365); - -function spawn(command, args, options) { - // Parse the arguments - const parsed = parse(command, args, options); - - // Spawn the child process - const spawned = cp.spawn(parsed.command, parsed.args, parsed.options); - - // Hook into child process "exit" event to emit an error if the command - // does not exists, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16 - enoent.hookChildProcess(spawned, parsed); - - return spawned; -} - -function spawnSync(command, args, options) { - // Parse the arguments - const parsed = parse(command, args, options); - - // Spawn the child process - const result = cp.spawnSync(parsed.command, parsed.args, parsed.options); - // Analyze if the command does not exist, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16 - result.error = result.error || enoent.verifyENOENTSync(result.status, parsed); - return result; +function timeout(due, scheduler) { + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"]; + } + return Object(_timeoutWith__WEBPACK_IMPORTED_MODULE_2__["timeoutWith"])(due, Object(_observable_throwError__WEBPACK_IMPORTED_MODULE_3__["throwError"])(new _util_TimeoutError__WEBPACK_IMPORTED_MODULE_1__["TimeoutError"]()), scheduler); } - -module.exports = spawn; -module.exports.spawn = spawn; -module.exports.sync = spawnSync; - -module.exports._parse = parse; -module.exports._enoent = enoent; +//# sourceMappingURL=timeout.js.map /***/ }), -/* 354 */ -/***/ (function(module, exports, __webpack_require__) { +/* 357 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return timeoutWith; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(215); +/* harmony import */ var _util_isDate__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(289); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -const path = __webpack_require__(16); -const resolveCommand = __webpack_require__(355); -const escape = __webpack_require__(361); -const readShebang = __webpack_require__(362); - -const isWin = process.platform === 'win32'; -const isExecutableRegExp = /\.(?:com|exe)$/i; -const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i; - -function detectShebang(parsed) { - parsed.file = resolveCommand(parsed); - const shebang = parsed.file && readShebang(parsed.file); - if (shebang) { - parsed.args.unshift(parsed.file); - parsed.command = shebang; - return resolveCommand(parsed); +function timeoutWith(due, withObservable, scheduler) { + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; } - - return parsed.file; + return function (source) { + var absoluteTimeout = Object(_util_isDate__WEBPACK_IMPORTED_MODULE_2__["isDate"])(due); + var waitFor = absoluteTimeout ? (+due - scheduler.now()) : Math.abs(due); + return source.lift(new TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler)); + }; } - -function parseNonShell(parsed) { - if (!isWin) { - return parsed; +var TimeoutWithOperator = /*@__PURE__*/ (function () { + function TimeoutWithOperator(waitFor, absoluteTimeout, withObservable, scheduler) { + this.waitFor = waitFor; + this.absoluteTimeout = absoluteTimeout; + this.withObservable = withObservable; + this.scheduler = scheduler; } + TimeoutWithOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new TimeoutWithSubscriber(subscriber, this.absoluteTimeout, this.waitFor, this.withObservable, this.scheduler)); + }; + return TimeoutWithOperator; +}()); +var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](TimeoutWithSubscriber, _super); + function TimeoutWithSubscriber(destination, absoluteTimeout, waitFor, withObservable, scheduler) { + var _this = _super.call(this, destination) || this; + _this.absoluteTimeout = absoluteTimeout; + _this.waitFor = waitFor; + _this.withObservable = withObservable; + _this.scheduler = scheduler; + _this.action = null; + _this.scheduleTimeout(); + return _this; + } + TimeoutWithSubscriber.dispatchTimeout = function (subscriber) { + var withObservable = subscriber.withObservable; + subscriber._unsubscribeAndRecycle(); + subscriber.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(subscriber, withObservable)); + }; + TimeoutWithSubscriber.prototype.scheduleTimeout = function () { + var action = this.action; + if (action) { + this.action = action.schedule(this, this.waitFor); + } + else { + this.add(this.action = this.scheduler.schedule(TimeoutWithSubscriber.dispatchTimeout, this.waitFor, this)); + } + }; + TimeoutWithSubscriber.prototype._next = function (value) { + if (!this.absoluteTimeout) { + this.scheduleTimeout(); + } + _super.prototype._next.call(this, value); + }; + TimeoutWithSubscriber.prototype._unsubscribe = function () { + this.action = null; + this.scheduler = null; + this.withObservable = null; + }; + return TimeoutWithSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); +//# sourceMappingURL=timeoutWith.js.map - // Detect & add support for shebangs - const commandFile = detectShebang(parsed); - - // We don't need a shell if the command filename is an executable - const needsShell = !isExecutableRegExp.test(commandFile); - - // If a shell is required, use cmd.exe and take care of escaping everything correctly - // Note that `forceShell` is an hidden option used only in tests - if (parsed.options.forceShell || needsShell) { - // Need to double escape meta chars if the command is a cmd-shim located in `node_modules/.bin/` - // The cmd-shim simply calls execute the package bin file with NodeJS, proxying any argument - // Because the escape of metachars with ^ gets interpreted when the cmd.exe is first called, - // we need to double escape them - const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile); - // Normalize posix paths into OS compatible paths (e.g.: foo/bar -> foo\bar) - // This is necessary otherwise it will always fail with ENOENT in those cases - parsed.command = path.normalize(parsed.command); +/***/ }), +/* 358 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - // Escape command & arguments - parsed.command = escape.command(parsed.command); - parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars)); +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return timestamp; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Timestamp", function() { return Timestamp; }); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(215); +/* harmony import */ var _map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(226); +/** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */ - const shellCommand = [parsed.command].concat(parsed.args).join(' '); - parsed.args = ['/d', '/s', '/c', `"${shellCommand}"`]; - parsed.command = process.env.comspec || 'cmd.exe'; - parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped +function timestamp(scheduler) { + if (scheduler === void 0) { + scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__["async"]; } - - return parsed; + return Object(_map__WEBPACK_IMPORTED_MODULE_1__["map"])(function (value) { return new Timestamp(value, scheduler.now()); }); } - -function parse(command, args, options) { - // Normalize arguments, similar to nodejs - if (args && !Array.isArray(args)) { - options = args; - args = null; +var Timestamp = /*@__PURE__*/ (function () { + function Timestamp(value, timestamp) { + this.value = value; + this.timestamp = timestamp; } + return Timestamp; +}()); - args = args ? args.slice(0) : []; // Clone array to avoid changing the original - options = Object.assign({}, options); // Clone object to avoid changing the original - - // Build our parsed object - const parsed = { - command, - args, - options, - file: undefined, - original: { - command, - args, - }, - }; - - // Delegate further parsing to shell or non-shell - return options.shell ? parsed : parseNonShell(parsed); -} - -module.exports = parse; +//# sourceMappingURL=timestamp.js.map /***/ }), -/* 355 */ -/***/ (function(module, exports, __webpack_require__) { +/* 359 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return toArray; }); +/* harmony import */ var _reduce__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(314); +/** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ - -const path = __webpack_require__(16); -const which = __webpack_require__(356); -const pathKey = __webpack_require__(360)(); - -function resolveCommandAttempt(parsed, withoutPathExt) { - const cwd = process.cwd(); - const hasCustomCwd = parsed.options.cwd != null; - // Worker threads do not have process.chdir() - const shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined; - - // If a custom `cwd` was specified, we need to change the process cwd - // because `which` will do stat calls but does not support a custom cwd - if (shouldSwitchCwd) { - try { - process.chdir(parsed.options.cwd); - } catch (err) { - /* Empty */ - } - } - - let resolved; - - try { - resolved = which.sync(parsed.command, { - path: (parsed.options.env || process.env)[pathKey], - pathExt: withoutPathExt ? path.delimiter : undefined, - }); - } catch (e) { - /* Empty */ - } finally { - if (shouldSwitchCwd) { - process.chdir(cwd); - } - } - - // If we successfully resolved, ensure that an absolute path is returned - // Note that when a custom `cwd` was used, we need to resolve to an absolute path based on it - if (resolved) { - resolved = path.resolve(hasCustomCwd ? parsed.options.cwd : '', resolved); +function toArrayReducer(arr, item, index) { + if (index === 0) { + return [item]; } - - return resolved; + arr.push(item); + return arr; } - -function resolveCommand(parsed) { - return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true); +function toArray() { + return Object(_reduce__WEBPACK_IMPORTED_MODULE_0__["reduce"])(toArrayReducer, []); } - -module.exports = resolveCommand; +//# sourceMappingURL=toArray.js.map /***/ }), -/* 356 */ -/***/ (function(module, exports, __webpack_require__) { - -const isWindows = process.platform === 'win32' || - process.env.OSTYPE === 'cygwin' || - process.env.OSTYPE === 'msys' - -const path = __webpack_require__(16) -const COLON = isWindows ? ';' : ':' -const isexe = __webpack_require__(357) +/* 360 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -const getNotFoundError = (cmd) => - Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' }) +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "window", function() { return window; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -const getPathInfo = (cmd, opt) => { - const colon = opt.colon || COLON - // If it has a slash, then we don't bother searching the pathenv. - // just check the file itself, and that's it. - const pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? [''] - : ( - [ - // windows always checks the cwd first - ...(isWindows ? [process.cwd()] : []), - ...(opt.path || process.env.PATH || - /* istanbul ignore next: very unusual */ '').split(colon), - ] - ) - const pathExtExe = isWindows - ? opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM' - : '' - const pathExt = isWindows ? pathExtExe.split(colon) : [''] - if (isWindows) { - if (cmd.indexOf('.') !== -1 && pathExt[0] !== '') - pathExt.unshift('') - } - return { - pathEnv, - pathExt, - pathExtExe, - } +function window(windowBoundaries) { + return function windowOperatorFunction(source) { + return source.lift(new WindowOperator(windowBoundaries)); + }; } +var WindowOperator = /*@__PURE__*/ (function () { + function WindowOperator(windowBoundaries) { + this.windowBoundaries = windowBoundaries; + } + WindowOperator.prototype.call = function (subscriber, source) { + var windowSubscriber = new WindowSubscriber(subscriber); + var sourceSubscription = source.subscribe(windowSubscriber); + if (!sourceSubscription.closed) { + windowSubscriber.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(windowSubscriber, this.windowBoundaries)); + } + return sourceSubscription; + }; + return WindowOperator; +}()); +var WindowSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super); + function WindowSubscriber(destination) { + var _this = _super.call(this, destination) || this; + _this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); + destination.next(_this.window); + return _this; + } + WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.openWindow(); + }; + WindowSubscriber.prototype.notifyError = function (error, innerSub) { + this._error(error); + }; + WindowSubscriber.prototype.notifyComplete = function (innerSub) { + this._complete(); + }; + WindowSubscriber.prototype._next = function (value) { + this.window.next(value); + }; + WindowSubscriber.prototype._error = function (err) { + this.window.error(err); + this.destination.error(err); + }; + WindowSubscriber.prototype._complete = function () { + this.window.complete(); + this.destination.complete(); + }; + WindowSubscriber.prototype._unsubscribe = function () { + this.window = null; + }; + WindowSubscriber.prototype.openWindow = function () { + var prevWindow = this.window; + if (prevWindow) { + prevWindow.complete(); + } + var destination = this.destination; + var newWindow = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); + destination.next(newWindow); + }; + return WindowSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); +//# sourceMappingURL=window.js.map -const which = (cmd, opt, cb) => { - if (typeof opt === 'function') { - cb = opt - opt = {} - } - if (!opt) - opt = {} - - const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt) - const found = [] - - const step = i => new Promise((resolve, reject) => { - if (i === pathEnv.length) - return opt.all && found.length ? resolve(found) - : reject(getNotFoundError(cmd)) - const ppRaw = pathEnv[i] - const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw +/***/ }), +/* 361 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - const pCmd = path.join(pathPart, cmd) - const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd - : pCmd +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return windowCount; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(172); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(187); +/** PURE_IMPORTS_START tslib,_Subscriber,_Subject PURE_IMPORTS_END */ - resolve(subStep(p, i, 0)) - }) - const subStep = (p, i, ii) => new Promise((resolve, reject) => { - if (ii === pathExt.length) - return resolve(step(i + 1)) - const ext = pathExt[ii] - isexe(p + ext, { pathExt: pathExtExe }, (er, is) => { - if (!er && is) { - if (opt.all) - found.push(p + ext) - else - return resolve(p + ext) - } - return resolve(subStep(p, i, ii + 1)) - }) - }) - return cb ? step(0).then(res => cb(null, res), cb) : step(0) +function windowCount(windowSize, startWindowEvery) { + if (startWindowEvery === void 0) { + startWindowEvery = 0; + } + return function windowCountOperatorFunction(source) { + return source.lift(new WindowCountOperator(windowSize, startWindowEvery)); + }; } - -const whichSync = (cmd, opt) => { - opt = opt || {} - - const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt) - const found = [] - - for (let i = 0; i < pathEnv.length; i ++) { - const ppRaw = pathEnv[i] - const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw - - const pCmd = path.join(pathPart, cmd) - const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd - : pCmd - - for (let j = 0; j < pathExt.length; j ++) { - const cur = p + pathExt[j] - try { - const is = isexe.sync(cur, { pathExt: pathExtExe }) - if (is) { - if (opt.all) - found.push(cur) - else - return cur - } - } catch (ex) {} +var WindowCountOperator = /*@__PURE__*/ (function () { + function WindowCountOperator(windowSize, startWindowEvery) { + this.windowSize = windowSize; + this.startWindowEvery = startWindowEvery; } - } - - if (opt.all && found.length) - return found + WindowCountOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new WindowCountSubscriber(subscriber, this.windowSize, this.startWindowEvery)); + }; + return WindowCountOperator; +}()); +var WindowCountSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowCountSubscriber, _super); + function WindowCountSubscriber(destination, windowSize, startWindowEvery) { + var _this = _super.call(this, destination) || this; + _this.destination = destination; + _this.windowSize = windowSize; + _this.startWindowEvery = startWindowEvery; + _this.windows = [new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"]()]; + _this.count = 0; + destination.next(_this.windows[0]); + return _this; + } + WindowCountSubscriber.prototype._next = function (value) { + var startWindowEvery = (this.startWindowEvery > 0) ? this.startWindowEvery : this.windowSize; + var destination = this.destination; + var windowSize = this.windowSize; + var windows = this.windows; + var len = windows.length; + for (var i = 0; i < len && !this.closed; i++) { + windows[i].next(value); + } + var c = this.count - windowSize + 1; + if (c >= 0 && c % startWindowEvery === 0 && !this.closed) { + windows.shift().complete(); + } + if (++this.count % startWindowEvery === 0 && !this.closed) { + var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_2__["Subject"](); + windows.push(window_1); + destination.next(window_1); + } + }; + WindowCountSubscriber.prototype._error = function (err) { + var windows = this.windows; + if (windows) { + while (windows.length > 0 && !this.closed) { + windows.shift().error(err); + } + } + this.destination.error(err); + }; + WindowCountSubscriber.prototype._complete = function () { + var windows = this.windows; + if (windows) { + while (windows.length > 0 && !this.closed) { + windows.shift().complete(); + } + } + this.destination.complete(); + }; + WindowCountSubscriber.prototype._unsubscribe = function () { + this.count = 0; + this.windows = null; + }; + return WindowCountSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_1__["Subscriber"])); +//# sourceMappingURL=windowCount.js.map - if (opt.nothrow) - return null - throw getNotFoundError(cmd) -} +/***/ }), +/* 362 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -module.exports = which -which.sync = whichSync +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return windowTime; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(215); +/* harmony import */ var _Subscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(172); +/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(257); +/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(205); +/** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */ -/***/ }), -/* 357 */ -/***/ (function(module, exports, __webpack_require__) { -var fs = __webpack_require__(23) -var core -if (process.platform === 'win32' || global.TESTING_WINDOWS) { - core = __webpack_require__(358) -} else { - core = __webpack_require__(359) -} -module.exports = isexe -isexe.sync = sync -function isexe (path, options, cb) { - if (typeof options === 'function') { - cb = options - options = {} - } - if (!cb) { - if (typeof Promise !== 'function') { - throw new TypeError('callback not provided') +function windowTime(windowTimeSpan) { + var scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_2__["async"]; + var windowCreationInterval = null; + var maxWindowSize = Number.POSITIVE_INFINITY; + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[3])) { + scheduler = arguments[3]; } - - return new Promise(function (resolve, reject) { - isexe(path, options || {}, function (er, is) { - if (er) { - reject(er) - } else { - resolve(is) - } - }) - }) - } - - core(path, options || {}, function (er, is) { - // ignore EACCES because that just means we aren't allowed to run it - if (er) { - if (er.code === 'EACCES' || options && options.ignoreErrors) { - er = null - is = false - } + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[2])) { + scheduler = arguments[2]; } - cb(er, is) - }) -} - -function sync (path, options) { - // my kingdom for a filtered catch - try { - return core.sync(path, options || {}) - } catch (er) { - if (options && options.ignoreErrors || er.code === 'EACCES') { - return false - } else { - throw er + else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[2])) { + maxWindowSize = arguments[2]; } - } -} - - -/***/ }), -/* 358 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = isexe -isexe.sync = sync - -var fs = __webpack_require__(23) - -function checkPathExt (path, options) { - var pathext = options.pathExt !== undefined ? - options.pathExt : process.env.PATHEXT - - if (!pathext) { - return true - } - - pathext = pathext.split(';') - if (pathext.indexOf('') !== -1) { - return true - } - for (var i = 0; i < pathext.length; i++) { - var p = pathext[i].toLowerCase() - if (p && path.substr(-p.length).toLowerCase() === p) { - return true + if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(arguments[1])) { + scheduler = arguments[1]; } - } - return false -} - -function checkStat (stat, path, options) { - if (!stat.isSymbolicLink() && !stat.isFile()) { - return false - } - return checkPathExt(path, options) -} - -function isexe (path, options, cb) { - fs.stat(path, function (er, stat) { - cb(er, er ? false : checkStat(stat, path, options)) - }) -} - -function sync (path, options) { - return checkStat(fs.statSync(path), path, options) -} - - -/***/ }), -/* 359 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = isexe -isexe.sync = sync - -var fs = __webpack_require__(23) - -function isexe (path, options, cb) { - fs.stat(path, function (er, stat) { - cb(er, er ? false : checkStat(stat, options)) - }) + else if (Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_4__["isNumeric"])(arguments[1])) { + windowCreationInterval = arguments[1]; + } + return function windowTimeOperatorFunction(source) { + return source.lift(new WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler)); + }; } - -function sync (path, options) { - return checkStat(fs.statSync(path), options) +var WindowTimeOperator = /*@__PURE__*/ (function () { + function WindowTimeOperator(windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) { + this.windowTimeSpan = windowTimeSpan; + this.windowCreationInterval = windowCreationInterval; + this.maxWindowSize = maxWindowSize; + this.scheduler = scheduler; + } + WindowTimeOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new WindowTimeSubscriber(subscriber, this.windowTimeSpan, this.windowCreationInterval, this.maxWindowSize, this.scheduler)); + }; + return WindowTimeOperator; +}()); +var CountedSubject = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](CountedSubject, _super); + function CountedSubject() { + var _this = _super !== null && _super.apply(this, arguments) || this; + _this._numberOfNextedValues = 0; + return _this; + } + CountedSubject.prototype.next = function (value) { + this._numberOfNextedValues++; + _super.prototype.next.call(this, value); + }; + Object.defineProperty(CountedSubject.prototype, "numberOfNextedValues", { + get: function () { + return this._numberOfNextedValues; + }, + enumerable: true, + configurable: true + }); + return CountedSubject; +}(_Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"])); +var WindowTimeSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowTimeSubscriber, _super); + function WindowTimeSubscriber(destination, windowTimeSpan, windowCreationInterval, maxWindowSize, scheduler) { + var _this = _super.call(this, destination) || this; + _this.destination = destination; + _this.windowTimeSpan = windowTimeSpan; + _this.windowCreationInterval = windowCreationInterval; + _this.maxWindowSize = maxWindowSize; + _this.scheduler = scheduler; + _this.windows = []; + var window = _this.openWindow(); + if (windowCreationInterval !== null && windowCreationInterval >= 0) { + var closeState = { subscriber: _this, window: window, context: null }; + var creationState = { windowTimeSpan: windowTimeSpan, windowCreationInterval: windowCreationInterval, subscriber: _this, scheduler: scheduler }; + _this.add(scheduler.schedule(dispatchWindowClose, windowTimeSpan, closeState)); + _this.add(scheduler.schedule(dispatchWindowCreation, windowCreationInterval, creationState)); + } + else { + var timeSpanOnlyState = { subscriber: _this, window: window, windowTimeSpan: windowTimeSpan }; + _this.add(scheduler.schedule(dispatchWindowTimeSpanOnly, windowTimeSpan, timeSpanOnlyState)); + } + return _this; + } + WindowTimeSubscriber.prototype._next = function (value) { + var windows = this.windows; + var len = windows.length; + for (var i = 0; i < len; i++) { + var window_1 = windows[i]; + if (!window_1.closed) { + window_1.next(value); + if (window_1.numberOfNextedValues >= this.maxWindowSize) { + this.closeWindow(window_1); + } + } + } + }; + WindowTimeSubscriber.prototype._error = function (err) { + var windows = this.windows; + while (windows.length > 0) { + windows.shift().error(err); + } + this.destination.error(err); + }; + WindowTimeSubscriber.prototype._complete = function () { + var windows = this.windows; + while (windows.length > 0) { + var window_2 = windows.shift(); + if (!window_2.closed) { + window_2.complete(); + } + } + this.destination.complete(); + }; + WindowTimeSubscriber.prototype.openWindow = function () { + var window = new CountedSubject(); + this.windows.push(window); + var destination = this.destination; + destination.next(window); + return window; + }; + WindowTimeSubscriber.prototype.closeWindow = function (window) { + window.complete(); + var windows = this.windows; + windows.splice(windows.indexOf(window), 1); + }; + return WindowTimeSubscriber; +}(_Subscriber__WEBPACK_IMPORTED_MODULE_3__["Subscriber"])); +function dispatchWindowTimeSpanOnly(state) { + var subscriber = state.subscriber, windowTimeSpan = state.windowTimeSpan, window = state.window; + if (window) { + subscriber.closeWindow(window); + } + state.window = subscriber.openWindow(); + this.schedule(state, windowTimeSpan); } - -function checkStat (stat, options) { - return stat.isFile() && checkMode(stat, options) +function dispatchWindowCreation(state) { + var windowTimeSpan = state.windowTimeSpan, subscriber = state.subscriber, scheduler = state.scheduler, windowCreationInterval = state.windowCreationInterval; + var window = subscriber.openWindow(); + var action = this; + var context = { action: action, subscription: null }; + var timeSpanState = { subscriber: subscriber, window: window, context: context }; + context.subscription = scheduler.schedule(dispatchWindowClose, windowTimeSpan, timeSpanState); + action.add(context.subscription); + action.schedule(state, windowCreationInterval); } - -function checkMode (stat, options) { - var mod = stat.mode - var uid = stat.uid - var gid = stat.gid - - var myUid = options.uid !== undefined ? - options.uid : process.getuid && process.getuid() - var myGid = options.gid !== undefined ? - options.gid : process.getgid && process.getgid() - - var u = parseInt('100', 8) - var g = parseInt('010', 8) - var o = parseInt('001', 8) - var ug = u | g - - var ret = (mod & o) || - (mod & g) && gid === myGid || - (mod & u) && uid === myUid || - (mod & ug) && myUid === 0 - - return ret +function dispatchWindowClose(state) { + var subscriber = state.subscriber, window = state.window, context = state.context; + if (context && context.action && context.subscription) { + context.action.remove(context.subscription); + } + subscriber.closeWindow(window); } +//# sourceMappingURL=windowTime.js.map /***/ }), -/* 360 */ -/***/ (function(module, exports, __webpack_require__) { +/* 363 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return windowToggle; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(177); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_Subject,_Subscription,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -const pathKey = (options = {}) => { - const environment = options.env || process.env; - const platform = options.platform || process.platform; - if (platform !== 'win32') { - return 'PATH'; - } - return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path'; -}; -module.exports = pathKey; -// TODO: Remove this for the next major release -module.exports.default = pathKey; +function windowToggle(openings, closingSelector) { + return function (source) { return source.lift(new WindowToggleOperator(openings, closingSelector)); }; +} +var WindowToggleOperator = /*@__PURE__*/ (function () { + function WindowToggleOperator(openings, closingSelector) { + this.openings = openings; + this.closingSelector = closingSelector; + } + WindowToggleOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new WindowToggleSubscriber(subscriber, this.openings, this.closingSelector)); + }; + return WindowToggleOperator; +}()); +var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowToggleSubscriber, _super); + function WindowToggleSubscriber(destination, openings, closingSelector) { + var _this = _super.call(this, destination) || this; + _this.openings = openings; + _this.closingSelector = closingSelector; + _this.contexts = []; + _this.add(_this.openSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(_this, openings, openings)); + return _this; + } + WindowToggleSubscriber.prototype._next = function (value) { + var contexts = this.contexts; + if (contexts) { + var len = contexts.length; + for (var i = 0; i < len; i++) { + contexts[i].window.next(value); + } + } + }; + WindowToggleSubscriber.prototype._error = function (err) { + var contexts = this.contexts; + this.contexts = null; + if (contexts) { + var len = contexts.length; + var index = -1; + while (++index < len) { + var context_1 = contexts[index]; + context_1.window.error(err); + context_1.subscription.unsubscribe(); + } + } + _super.prototype._error.call(this, err); + }; + WindowToggleSubscriber.prototype._complete = function () { + var contexts = this.contexts; + this.contexts = null; + if (contexts) { + var len = contexts.length; + var index = -1; + while (++index < len) { + var context_2 = contexts[index]; + context_2.window.complete(); + context_2.subscription.unsubscribe(); + } + } + _super.prototype._complete.call(this); + }; + WindowToggleSubscriber.prototype._unsubscribe = function () { + var contexts = this.contexts; + this.contexts = null; + if (contexts) { + var len = contexts.length; + var index = -1; + while (++index < len) { + var context_3 = contexts[index]; + context_3.window.unsubscribe(); + context_3.subscription.unsubscribe(); + } + } + }; + WindowToggleSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + if (outerValue === this.openings) { + var closingNotifier = void 0; + try { + var closingSelector = this.closingSelector; + closingNotifier = closingSelector(innerValue); + } + catch (e) { + return this.error(e); + } + var window_1 = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); + var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_2__["Subscription"](); + var context_4 = { window: window_1, subscription: subscription }; + this.contexts.push(context_4); + var innerSubscription = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_4__["subscribeToResult"])(this, closingNotifier, context_4); + if (innerSubscription.closed) { + this.closeWindow(this.contexts.length - 1); + } + else { + innerSubscription.context = context_4; + subscription.add(innerSubscription); + } + this.destination.next(window_1); + } + else { + this.closeWindow(this.contexts.indexOf(outerValue)); + } + }; + WindowToggleSubscriber.prototype.notifyError = function (err) { + this.error(err); + }; + WindowToggleSubscriber.prototype.notifyComplete = function (inner) { + if (inner !== this.openSubscription) { + this.closeWindow(this.contexts.indexOf(inner.context)); + } + }; + WindowToggleSubscriber.prototype.closeWindow = function (index) { + if (index === -1) { + return; + } + var contexts = this.contexts; + var context = contexts[index]; + var window = context.window, subscription = context.subscription; + contexts.splice(index, 1); + window.complete(); + subscription.unsubscribe(); + }; + return WindowToggleSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_3__["OuterSubscriber"])); +//# sourceMappingURL=windowToggle.js.map /***/ }), -/* 361 */ -/***/ (function(module, exports, __webpack_require__) { +/* 364 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return windowWhen; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _Subject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(187); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -// See http://www.robvanderwoude.com/escapechars.php -const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g; -function escapeCommand(arg) { - // Escape meta chars - arg = arg.replace(metaCharsRegExp, '^$1'); - return arg; +function windowWhen(closingSelector) { + return function windowWhenOperatorFunction(source) { + return source.lift(new WindowOperator(closingSelector)); + }; } - -function escapeArgument(arg, doubleEscapeMetaChars) { - // Convert to string - arg = `${arg}`; - - // Algorithm below is based on https://qntm.org/cmd - - // Sequence of backslashes followed by a double quote: - // double up all the backslashes and escape the double quote - arg = arg.replace(/(\\*)"/g, '$1$1\\"'); - - // Sequence of backslashes followed by the end of the string - // (which will become a double quote later): - // double up all the backslashes - arg = arg.replace(/(\\*)$/, '$1$1'); - - // All other backslashes occur literally - - // Quote the whole thing: - arg = `"${arg}"`; - - // Escape meta chars - arg = arg.replace(metaCharsRegExp, '^$1'); - - // Double escape meta chars if necessary - if (doubleEscapeMetaChars) { - arg = arg.replace(metaCharsRegExp, '^$1'); +var WindowOperator = /*@__PURE__*/ (function () { + function WindowOperator(closingSelector) { + this.closingSelector = closingSelector; } - - return arg; -} - -module.exports.command = escapeCommand; -module.exports.argument = escapeArgument; + WindowOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new WindowSubscriber(subscriber, this.closingSelector)); + }; + return WindowOperator; +}()); +var WindowSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WindowSubscriber, _super); + function WindowSubscriber(destination, closingSelector) { + var _this = _super.call(this, destination) || this; + _this.destination = destination; + _this.closingSelector = closingSelector; + _this.openWindow(); + return _this; + } + WindowSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.openWindow(innerSub); + }; + WindowSubscriber.prototype.notifyError = function (error, innerSub) { + this._error(error); + }; + WindowSubscriber.prototype.notifyComplete = function (innerSub) { + this.openWindow(innerSub); + }; + WindowSubscriber.prototype._next = function (value) { + this.window.next(value); + }; + WindowSubscriber.prototype._error = function (err) { + this.window.error(err); + this.destination.error(err); + this.unsubscribeClosingNotification(); + }; + WindowSubscriber.prototype._complete = function () { + this.window.complete(); + this.destination.complete(); + this.unsubscribeClosingNotification(); + }; + WindowSubscriber.prototype.unsubscribeClosingNotification = function () { + if (this.closingNotification) { + this.closingNotification.unsubscribe(); + } + }; + WindowSubscriber.prototype.openWindow = function (innerSub) { + if (innerSub === void 0) { + innerSub = null; + } + if (innerSub) { + this.remove(innerSub); + innerSub.unsubscribe(); + } + var prevWindow = this.window; + if (prevWindow) { + prevWindow.complete(); + } + var window = this.window = new _Subject__WEBPACK_IMPORTED_MODULE_1__["Subject"](); + this.destination.next(window); + var closingNotifier; + try { + var closingSelector = this.closingSelector; + closingNotifier = closingSelector(); + } + catch (e) { + this.destination.error(e); + this.window.error(e); + return; + } + this.add(this.closingNotification = Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_3__["subscribeToResult"])(this, closingNotifier)); + }; + return WindowSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_2__["OuterSubscriber"])); +//# sourceMappingURL=windowWhen.js.map /***/ }), -/* 362 */ -/***/ (function(module, exports, __webpack_require__) { +/* 365 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return withLatestFrom; }); +/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); +/* harmony import */ var _OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(229); +/* harmony import */ var _util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(230); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ -const fs = __webpack_require__(23); -const shebangCommand = __webpack_require__(363); - -function readShebang(command) { - // Read the first 150 bytes from the file - const size = 150; - const buffer = Buffer.alloc(size); - let fd; - - try { - fd = fs.openSync(command, 'r'); - fs.readSync(fd, buffer, 0, size, 0); - fs.closeSync(fd); - } catch (e) { /* Empty */ } - - // Attempt to extract shebang (null is returned if not a shebang) - return shebangCommand(buffer.toString()); +function withLatestFrom() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; + } + return function (source) { + var project; + if (typeof args[args.length - 1] === 'function') { + project = args.pop(); + } + var observables = args; + return source.lift(new WithLatestFromOperator(observables, project)); + }; } - -module.exports = readShebang; +var WithLatestFromOperator = /*@__PURE__*/ (function () { + function WithLatestFromOperator(observables, project) { + this.observables = observables; + this.project = project; + } + WithLatestFromOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new WithLatestFromSubscriber(subscriber, this.observables, this.project)); + }; + return WithLatestFromOperator; +}()); +var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) { + tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](WithLatestFromSubscriber, _super); + function WithLatestFromSubscriber(destination, observables, project) { + var _this = _super.call(this, destination) || this; + _this.observables = observables; + _this.project = project; + _this.toRespond = []; + var len = observables.length; + _this.values = new Array(len); + for (var i = 0; i < len; i++) { + _this.toRespond.push(i); + } + for (var i = 0; i < len; i++) { + var observable = observables[i]; + _this.add(Object(_util_subscribeToResult__WEBPACK_IMPORTED_MODULE_2__["subscribeToResult"])(_this, observable, observable, i)); + } + return _this; + } + WithLatestFromSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.values[outerIndex] = innerValue; + var toRespond = this.toRespond; + if (toRespond.length > 0) { + var found = toRespond.indexOf(outerIndex); + if (found !== -1) { + toRespond.splice(found, 1); + } + } + }; + WithLatestFromSubscriber.prototype.notifyComplete = function () { + }; + WithLatestFromSubscriber.prototype._next = function (value) { + if (this.toRespond.length === 0) { + var args = [value].concat(this.values); + if (this.project) { + this._tryProject(args); + } + else { + this.destination.next(args); + } + } + }; + WithLatestFromSubscriber.prototype._tryProject = function (args) { + var result; + try { + result = this.project.apply(this, args); + } + catch (err) { + this.destination.error(err); + return; + } + this.destination.next(result); + }; + return WithLatestFromSubscriber; +}(_OuterSubscriber__WEBPACK_IMPORTED_MODULE_1__["OuterSubscriber"])); +//# sourceMappingURL=withLatestFrom.js.map /***/ }), -/* 363 */ -/***/ (function(module, exports, __webpack_require__) { +/* 366 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return zip; }); +/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(269); +/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */ -const shebangRegex = __webpack_require__(364); - -module.exports = (string = '') => { - const match = string.match(shebangRegex); - - if (!match) { - return null; - } - - const [path, argument] = match[0].replace(/#! ?/, '').split(' '); - const binary = path.split('/').pop(); - - if (binary === 'env') { - return argument; - } - - return argument ? `${binary} ${argument}` : binary; -}; +function zip() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; + } + return function zipOperatorFunction(source) { + return source.lift.call(_observable_zip__WEBPACK_IMPORTED_MODULE_0__["zip"].apply(void 0, [source].concat(observables))); + }; +} +//# sourceMappingURL=zip.js.map /***/ }), -/* 364 */ -/***/ (function(module, exports, __webpack_require__) { +/* 367 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +__webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return zipAll; }); +/* harmony import */ var _observable_zip__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(269); +/** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */ -module.exports = /^#!(.*)/; +function zipAll(project) { + return function (source) { return source.lift(new _observable_zip__WEBPACK_IMPORTED_MODULE_0__["ZipOperator"](project)); }; +} +//# sourceMappingURL=zipAll.js.map /***/ }), -/* 365 */ +/* 368 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const isWin = process.platform === 'win32'; - -function notFoundError(original, syscall) { - return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), { - code: 'ENOENT', - errno: 'ENOENT', - syscall: `${syscall} ${original.command}`, - path: original.command, - spawnargs: original.args, - }); -} - -function hookChildProcess(cp, parsed) { - if (!isWin) { - return; - } +const callbacks = new Set(); +let called = false; - const originalEmit = cp.emit; +function exit(exit, signal) { + if (called) { + return; + } - cp.emit = function (name, arg1) { - // If emitting "exit" event and exit code is 1, we need to check if - // the command exists and emit an "error" instead - // See https://github.com/IndigoUnited/node-cross-spawn/issues/16 - if (name === 'exit') { - const err = verifyENOENT(arg1, parsed, 'spawn'); + called = true; - if (err) { - return originalEmit.call(cp, 'error', err); - } - } + for (const callback of callbacks) { + callback(); + } - return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params - }; + if (exit === true) { + process.exit(128 + signal); // eslint-disable-line unicorn/no-process-exit + } } -function verifyENOENT(status, parsed) { - if (isWin && status === 1 && !parsed.file) { - return notFoundError(parsed.original, 'spawn'); - } - - return null; -} +module.exports = callback => { + callbacks.add(callback); -function verifyENOENTSync(status, parsed) { - if (isWin && status === 1 && !parsed.file) { - return notFoundError(parsed.original, 'spawnSync'); - } + if (callbacks.size === 1) { + process.once('exit', exit); + process.once('SIGINT', exit.bind(null, true, 2)); + process.once('SIGTERM', exit.bind(null, true, 15)); - return null; -} + // PM2 Cluster shutdown message. Caught to support async handlers with pm2, needed because + // explicitly calling process.exit() doesn't trigger the beforeExit event, and the exit + // event cannot support async handlers, since the event loop is never called after it. + process.on('message', message => { + if (message === 'shutdown') { + exit(true, -128); + } + }); + } -module.exports = { - hookChildProcess, - verifyENOENT, - verifyENOENTSync, - notFoundError, + return () => { + callbacks.delete(callback); + }; }; /***/ }), -/* 366 */ +/* 369 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +Object.defineProperty(exports, "__esModule", { value: true }); +const $isCliError = Symbol('isCliError'); +function createCliError(message) { + const error = new Error(message); + error[$isCliError] = true; + return error; +} +exports.createCliError = createCliError; +function isCliError(error) { + return error && !!error[$isCliError]; +} +exports.isCliError = isCliError; -module.exports = input => { - const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt(); - const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt(); - if (input[input.length - 1] === LF) { - input = input.slice(0, input.length - 1); - } +/***/ }), +/* 370 */ +/***/ (function(module, exports, __webpack_require__) { - if (input[input.length - 1] === CR) { - input = input.slice(0, input.length - 1); - } +"use strict"; - return input; -}; +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +Object.defineProperty(exports, "__esModule", { value: true }); +const tslib_1 = __webpack_require__(36); +const execa_1 = tslib_1.__importDefault(__webpack_require__(371)); +const fs_1 = __webpack_require__(23); +const Rx = tslib_1.__importStar(__webpack_require__(169)); +const operators_1 = __webpack_require__(270); +const chalk_1 = tslib_1.__importDefault(__webpack_require__(2)); +const tree_kill_1 = tslib_1.__importDefault(__webpack_require__(411)); +const util_1 = __webpack_require__(29); +const treeKillAsync = util_1.promisify((...args) => tree_kill_1.default(...args)); +const observe_lines_1 = __webpack_require__(412); +const errors_1 = __webpack_require__(369); +const SECOND = 1000; +const STOP_TIMEOUT = 30 * SECOND; +async function withTimeout(attempt, ms, onTimeout) { + const TIMEOUT = Symbol('timeout'); + try { + await Promise.race([ + attempt(), + new Promise((_, reject) => setTimeout(() => reject(TIMEOUT), ms)), + ]); + } + catch (error) { + if (error === TIMEOUT) { + await onTimeout(); + } + else { + throw error; + } + } +} +function startProc(name, options, log) { + const { cmd, args, cwd, env, stdin } = options; + log.info('[%s] > %s', name, cmd, args.join(' ')); + // spawn fails with ENOENT when either the + // cmd or cwd don't exist, so we check for the cwd + // ahead of time so that the error is less ambiguous + try { + if (!fs_1.statSync(cwd).isDirectory()) { + throw new Error(`cwd "${cwd}" exists but is not a directory`); + } + } + catch (err) { + if (err.code === 'ENOENT') { + throw new Error(`cwd "${cwd}" does not exist`); + } + } + const childProcess = execa_1.default(cmd, args, { + cwd, + env, + stdio: ['pipe', 'pipe', 'pipe'], + preferLocal: true, + }); + if (stdin) { + childProcess.stdin.end(stdin, 'utf8'); + } + else { + childProcess.stdin.end(); + } + let stopCalled = false; + const outcome$ = Rx.race( + // observe first exit event + Rx.fromEvent(childProcess, 'exit').pipe(operators_1.take(1), operators_1.map(([code]) => { + if (stopCalled) { + return null; + } + // JVM exits with 143 on SIGTERM and 130 on SIGINT, dont' treat then as errors + if (code > 0 && !(code === 143 || code === 130)) { + throw errors_1.createCliError(`[${name}] exited with code ${code}`); + } + return code; + })), + // observe first error event + Rx.fromEvent(childProcess, 'error').pipe(operators_1.take(1), operators_1.mergeMap(err => Rx.throwError(err)))).pipe(operators_1.share()); + const lines$ = Rx.merge(observe_lines_1.observeLines(childProcess.stdout), observe_lines_1.observeLines(childProcess.stderr)).pipe(operators_1.tap(line => log.write(` ${chalk_1.default.gray('proc')} [${chalk_1.default.gray(name)}] ${line}`)), operators_1.share()); + const outcomePromise = Rx.merge(lines$.pipe(operators_1.ignoreElements()), outcome$).toPromise(); + async function stop(signal) { + if (stopCalled) { + return; + } + stopCalled = true; + await withTimeout(async () => { + log.debug(`Sending "${signal}" to proc "${name}"`); + await treeKillAsync(childProcess.pid, signal); + await outcomePromise; + }, STOP_TIMEOUT, async () => { + log.warning(`Proc "${name}" was sent "${signal}" didn't emit the "exit" or "error" events after ${STOP_TIMEOUT} ms, sending SIGKILL`); + await treeKillAsync(childProcess.pid, 'SIGKILL'); + }); + await withTimeout(async () => { + try { + await outcomePromise; + } + catch (error) { + // ignore + } + }, STOP_TIMEOUT, async () => { + throw new Error(`Proc "${name}" was stopped but never emitted either the "exit" or "error" event after ${STOP_TIMEOUT} ms`); + }); + } + return { + name, + lines$, + outcome$, + outcomePromise, + stop, + }; +} +exports.startProc = startProc; /***/ }), -/* 367 */ +/* 371 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; const path = __webpack_require__(16); -const pathKey = __webpack_require__(360); +const childProcess = __webpack_require__(372); +const crossSpawn = __webpack_require__(373); +const stripFinalNewline = __webpack_require__(386); +const npmRunPath = __webpack_require__(387); +const onetime = __webpack_require__(388); +const makeError = __webpack_require__(390); +const normalizeStdio = __webpack_require__(395); +const {spawnedKill, spawnedCancel, setupTimeout, setExitHandler} = __webpack_require__(396); +const {handleInput, getSpawnedResult, makeAllStream, validateInputSync} = __webpack_require__(400); +const {mergePromise, getSpawnedPromise} = __webpack_require__(409); +const {joinCommand, parseCommand} = __webpack_require__(410); -const npmRunPath = options => { - options = { - cwd: process.cwd(), - path: process.env[pathKey()], - execPath: process.execPath, - ...options - }; +const DEFAULT_MAX_BUFFER = 1000 * 1000 * 100; - let previous; - let cwdPath = path.resolve(options.cwd); - const result = []; +const getEnv = ({env: envOption, extendEnv, preferLocal, localDir, execPath}) => { + const env = extendEnv ? {...process.env, ...envOption} : envOption; - while (previous !== cwdPath) { - result.push(path.join(cwdPath, 'node_modules/.bin')); - previous = cwdPath; - cwdPath = path.resolve(cwdPath, '..'); + if (preferLocal) { + return npmRunPath.env({env, cwd: localDir, execPath}); } - // Ensure the running `node` binary is used - const execPathDir = path.resolve(options.cwd, options.execPath, '..'); - result.unshift(execPathDir); - - return result.concat(options.path).join(path.delimiter); + return env; }; -module.exports = npmRunPath; -// TODO: Remove this for the next major release -module.exports.default = npmRunPath; +const handleArgs = (file, args, options = {}) => { + const parsed = crossSpawn._parse(file, args, options); + file = parsed.command; + args = parsed.args; + options = parsed.options; -module.exports.env = options => { options = { - env: process.env, + maxBuffer: DEFAULT_MAX_BUFFER, + buffer: true, + stripFinalNewline: true, + extendEnv: true, + preferLocal: false, + localDir: options.cwd || process.cwd(), + execPath: process.execPath, + encoding: 'utf8', + reject: true, + cleanup: true, + all: false, + windowsHide: true, ...options }; - const env = {...options.env}; - const path = pathKey({env}); + options.env = getEnv(options); - options.path = env[path]; - env[path] = module.exports(options); + options.stdio = normalizeStdio(options); - return env; -}; + if (process.platform === 'win32' && path.basename(file, '.exe') === 'cmd') { + // #116 + args.unshift('/q'); + } + return {file, args, options, parsed}; +}; -/***/ }), -/* 368 */ -/***/ (function(module, exports, __webpack_require__) { +const handleOutput = (options, value, error) => { + if (typeof value !== 'string' && !Buffer.isBuffer(value)) { + // When `execa.sync()` errors, we normalize it to '' to mimic `execa()` + return error === undefined ? undefined : ''; + } -"use strict"; + if (options.stripFinalNewline) { + return stripFinalNewline(value); + } -const mimicFn = __webpack_require__(369); + return value; +}; -const calledFunctions = new WeakMap(); +const execa = (file, args, options) => { + const parsed = handleArgs(file, args, options); + const command = joinCommand(file, args); -const oneTime = (fn, options = {}) => { - if (typeof fn !== 'function') { - throw new TypeError('Expected a function'); + let spawned; + try { + spawned = childProcess.spawn(parsed.file, parsed.args, parsed.options); + } catch (error) { + // Ensure the returned error is always both a promise and a child process + const dummySpawned = new childProcess.ChildProcess(); + const errorPromise = Promise.reject(makeError({ + error, + stdout: '', + stderr: '', + all: '', + command, + parsed, + timedOut: false, + isCanceled: false, + killed: false + })); + return mergePromise(dummySpawned, errorPromise); } - let ret; - let isCalled = false; - let callCount = 0; - const functionName = fn.displayName || fn.name || ''; + const spawnedPromise = getSpawnedPromise(spawned); + const timedPromise = setupTimeout(spawned, parsed.options, spawnedPromise); + const processDone = setExitHandler(spawned, parsed.options, timedPromise); - const onetime = function (...args) { - calledFunctions.set(onetime, ++callCount); + const context = {isCanceled: false}; - if (isCalled) { - if (options.throw === true) { - throw new Error(`Function \`${functionName}\` can only be called once`); - } + spawned.kill = spawnedKill.bind(null, spawned.kill.bind(spawned)); + spawned.cancel = spawnedCancel.bind(null, spawned, context); - return ret; - } + const handlePromise = async () => { + const [{error, exitCode, signal, timedOut}, stdoutResult, stderrResult, allResult] = await getSpawnedResult(spawned, parsed.options, processDone); + const stdout = handleOutput(parsed.options, stdoutResult); + const stderr = handleOutput(parsed.options, stderrResult); + const all = handleOutput(parsed.options, allResult); - isCalled = true; - ret = fn.apply(this, args); - fn = null; + if (error || exitCode !== 0 || signal !== null) { + const returnedError = makeError({ + error, + exitCode, + signal, + stdout, + stderr, + all, + command, + parsed, + timedOut, + isCanceled: context.isCanceled, + killed: spawned.killed + }); - return ret; + if (!parsed.options.reject) { + return returnedError; + } + + throw returnedError; + } + + return { + command, + exitCode: 0, + stdout, + stderr, + all, + failed: false, + timedOut: false, + isCanceled: false, + killed: false + }; }; - mimicFn(onetime, fn); - calledFunctions.set(onetime, callCount); + const handlePromiseOnce = onetime(handlePromise); - return onetime; -}; + crossSpawn._enoent.hookChildProcess(spawned, parsed.parsed); -module.exports = oneTime; -// TODO: Remove this for the next major release -module.exports.default = oneTime; + handleInput(spawned, parsed.options.input); -module.exports.callCount = fn => { - if (!calledFunctions.has(fn)) { - throw new Error(`The given function \`${fn.name}\` is not wrapped by the \`onetime\` package`); - } + spawned.all = makeAllStream(spawned, parsed.options); - return calledFunctions.get(fn); + return mergePromise(spawned, handlePromiseOnce); }; +module.exports = execa; -/***/ }), -/* 369 */ -/***/ (function(module, exports, __webpack_require__) { +module.exports.sync = (file, args, options) => { + const parsed = handleArgs(file, args, options); + const command = joinCommand(file, args); -"use strict"; + validateInputSync(parsed.options); + + let result; + try { + result = childProcess.spawnSync(parsed.file, parsed.args, parsed.options); + } catch (error) { + throw makeError({ + error, + stdout: '', + stderr: '', + all: '', + command, + parsed, + timedOut: false, + isCanceled: false, + killed: false + }); + } + const stdout = handleOutput(parsed.options, result.stdout, result.error); + const stderr = handleOutput(parsed.options, result.stderr, result.error); -const mimicFn = (to, from) => { - for (const prop of Reflect.ownKeys(from)) { - Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop)); + if (result.error || result.status !== 0 || result.signal !== null) { + const error = makeError({ + stdout, + stderr, + error: result.error, + signal: result.signal, + exitCode: result.status, + command, + parsed, + timedOut: result.error && result.error.code === 'ETIMEDOUT', + isCanceled: false, + killed: result.signal !== null + }); + + if (!parsed.options.reject) { + return error; + } + + throw error; } - return to; + return { + command, + exitCode: 0, + stdout, + stderr, + failed: false, + timedOut: false, + isCanceled: false, + killed: false + }; }; -module.exports = mimicFn; -// TODO: Remove this for the next major release -module.exports.default = mimicFn; +module.exports.command = (command, options) => { + const [file, ...args] = parseCommand(command); + return execa(file, args, options); +}; +module.exports.commandSync = (command, options) => { + const [file, ...args] = parseCommand(command); + return execa.sync(file, args, options); +}; -/***/ }), -/* 370 */ -/***/ (function(module, exports, __webpack_require__) { +module.exports.node = (scriptPath, args, options = {}) => { + if (args && !Array.isArray(args) && typeof args === 'object') { + options = args; + args = []; + } -"use strict"; + const stdio = normalizeStdio.node(options); -const {signalsByName} = __webpack_require__(371); + const {nodePath = process.execPath, nodeOptions = process.execArgv} = options; -const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => { - if (timedOut) { - return `timed out after ${timeout} milliseconds`; - } + return execa( + nodePath, + [ + ...nodeOptions, + scriptPath, + ...(Array.isArray(args) ? args : []) + ], + { + ...options, + stdin: undefined, + stdout: undefined, + stderr: undefined, + stdio, + shell: false + } + ); +}; - if (isCanceled) { - return 'was canceled'; - } - if (errorCode !== undefined) { - return `failed with ${errorCode}`; - } +/***/ }), +/* 372 */ +/***/ (function(module, exports) { - if (signal !== undefined) { - return `was killed with ${signal} (${signalDescription})`; - } +module.exports = require("child_process"); - if (exitCode !== undefined) { - return `failed with exit code ${exitCode}`; - } +/***/ }), +/* 373 */ +/***/ (function(module, exports, __webpack_require__) { - return 'failed'; -}; +"use strict"; -const makeError = ({ - stdout, - stderr, - all, - error, - signal, - exitCode, - command, - timedOut, - isCanceled, - killed, - parsed: {options: {timeout}} -}) => { - // `signal` and `exitCode` emitted on `spawned.on('exit')` event can be `null`. - // We normalize them to `undefined` - exitCode = exitCode === null ? undefined : exitCode; - signal = signal === null ? undefined : signal; - const signalDescription = signal === undefined ? undefined : signalsByName[signal].description; - const errorCode = error && error.code; +const cp = __webpack_require__(372); +const parse = __webpack_require__(374); +const enoent = __webpack_require__(385); - const prefix = getErrorPrefix({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}); - const execaMessage = `Command ${prefix}: ${command}`; - const shortMessage = error instanceof Error ? `${execaMessage}\n${error.message}` : execaMessage; - const message = [shortMessage, stderr, stdout].filter(Boolean).join('\n'); +function spawn(command, args, options) { + // Parse the arguments + const parsed = parse(command, args, options); - if (error instanceof Error) { - error.originalMessage = error.message; - error.message = message; - } else { - error = new Error(message); - } + // Spawn the child process + const spawned = cp.spawn(parsed.command, parsed.args, parsed.options); - error.shortMessage = shortMessage; - error.command = command; - error.exitCode = exitCode; - error.signal = signal; - error.signalDescription = signalDescription; - error.stdout = stdout; - error.stderr = stderr; + // Hook into child process "exit" event to emit an error if the command + // does not exists, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16 + enoent.hookChildProcess(spawned, parsed); - if (all !== undefined) { - error.all = all; - } + return spawned; +} - if ('bufferedData' in error) { - delete error.bufferedData; - } +function spawnSync(command, args, options) { + // Parse the arguments + const parsed = parse(command, args, options); - error.failed = true; - error.timedOut = Boolean(timedOut); - error.isCanceled = isCanceled; - error.killed = killed && !timedOut; + // Spawn the child process + const result = cp.spawnSync(parsed.command, parsed.args, parsed.options); - return error; -}; + // Analyze if the command does not exist, see: https://github.com/IndigoUnited/node-cross-spawn/issues/16 + result.error = result.error || enoent.verifyENOENTSync(result.status, parsed); -module.exports = makeError; + return result; +} + +module.exports = spawn; +module.exports.spawn = spawn; +module.exports.sync = spawnSync; + +module.exports._parse = parse; +module.exports._enoent = enoent; /***/ }), -/* 371 */ +/* 374 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(11); -var _signals=__webpack_require__(372); -var _realtime=__webpack_require__(374); +const path = __webpack_require__(16); +const resolveCommand = __webpack_require__(375); +const escape = __webpack_require__(381); +const readShebang = __webpack_require__(382); +const isWin = process.platform === 'win32'; +const isExecutableRegExp = /\.(?:com|exe)$/i; +const isCmdShimRegExp = /node_modules[\\/].bin[\\/][^\\/]+\.cmd$/i; -const getSignalsByName=function(){ -const signals=(0,_signals.getSignals)(); -return signals.reduce(getSignalByName,{}); -}; +function detectShebang(parsed) { + parsed.file = resolveCommand(parsed); -const getSignalByName=function( -signalByNameMemo, -{name,number,description,supported,action,forced,standard}) -{ -return{ -...signalByNameMemo, -[name]:{name,number,description,supported,action,forced,standard}}; + const shebang = parsed.file && readShebang(parsed.file); -}; + if (shebang) { + parsed.args.unshift(parsed.file); + parsed.command = shebang; -const signalsByName=getSignalsByName();exports.signalsByName=signalsByName; + return resolveCommand(parsed); + } + return parsed.file; +} +function parseNonShell(parsed) { + if (!isWin) { + return parsed; + } + // Detect & add support for shebangs + const commandFile = detectShebang(parsed); -const getSignalsByNumber=function(){ -const signals=(0,_signals.getSignals)(); -const length=_realtime.SIGRTMAX+1; -const signalsA=Array.from({length},(value,number)=> -getSignalByNumber(number,signals)); + // We don't need a shell if the command filename is an executable + const needsShell = !isExecutableRegExp.test(commandFile); -return Object.assign({},...signalsA); -}; + // If a shell is required, use cmd.exe and take care of escaping everything correctly + // Note that `forceShell` is an hidden option used only in tests + if (parsed.options.forceShell || needsShell) { + // Need to double escape meta chars if the command is a cmd-shim located in `node_modules/.bin/` + // The cmd-shim simply calls execute the package bin file with NodeJS, proxying any argument + // Because the escape of metachars with ^ gets interpreted when the cmd.exe is first called, + // we need to double escape them + const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile); -const getSignalByNumber=function(number,signals){ -const signal=findSignalByNumber(number,signals); + // Normalize posix paths into OS compatible paths (e.g.: foo/bar -> foo\bar) + // This is necessary otherwise it will always fail with ENOENT in those cases + parsed.command = path.normalize(parsed.command); -if(signal===undefined){ -return{}; -} + // Escape command & arguments + parsed.command = escape.command(parsed.command); + parsed.args = parsed.args.map((arg) => escape.argument(arg, needsDoubleEscapeMetaChars)); -const{name,description,supported,action,forced,standard}=signal; -return{ -[number]:{ -name, -number, -description, -supported, -action, -forced, -standard}}; + const shellCommand = [parsed.command].concat(parsed.args).join(' '); + parsed.args = ['/d', '/s', '/c', `"${shellCommand}"`]; + parsed.command = process.env.comspec || 'cmd.exe'; + parsed.options.windowsVerbatimArguments = true; // Tell node's spawn that the arguments are already escaped + } -}; + return parsed; +} +function parse(command, args, options) { + // Normalize arguments, similar to nodejs + if (args && !Array.isArray(args)) { + options = args; + args = null; + } + args = args ? args.slice(0) : []; // Clone array to avoid changing the original + options = Object.assign({}, options); // Clone object to avoid changing the original -const findSignalByNumber=function(number,signals){ -const signal=signals.find(({name})=>_os.constants.signals[name]===number); + // Build our parsed object + const parsed = { + command, + args, + options, + file: undefined, + original: { + command, + args, + }, + }; -if(signal!==undefined){ -return signal; + // Delegate further parsing to shell or non-shell + return options.shell ? parsed : parseNonShell(parsed); } -return signals.find(signalA=>signalA.number===number); -}; +module.exports = parse; -const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber; -//# sourceMappingURL=main.js.map /***/ }), -/* 372 */ +/* 375 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(11); -var _core=__webpack_require__(373); -var _realtime=__webpack_require__(374); +const path = __webpack_require__(16); +const which = __webpack_require__(376); +const pathKey = __webpack_require__(380)(); +function resolveCommandAttempt(parsed, withoutPathExt) { + const cwd = process.cwd(); + const hasCustomCwd = parsed.options.cwd != null; + // Worker threads do not have process.chdir() + const shouldSwitchCwd = hasCustomCwd && process.chdir !== undefined; -const getSignals=function(){ -const realtimeSignals=(0,_realtime.getRealtimeSignals)(); -const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal); -return signals; -};exports.getSignals=getSignals; + // If a custom `cwd` was specified, we need to change the process cwd + // because `which` will do stat calls but does not support a custom cwd + if (shouldSwitchCwd) { + try { + process.chdir(parsed.options.cwd); + } catch (err) { + /* Empty */ + } + } + let resolved; + try { + resolved = which.sync(parsed.command, { + path: (parsed.options.env || process.env)[pathKey], + pathExt: withoutPathExt ? path.delimiter : undefined, + }); + } catch (e) { + /* Empty */ + } finally { + if (shouldSwitchCwd) { + process.chdir(cwd); + } + } + // If we successfully resolved, ensure that an absolute path is returned + // Note that when a custom `cwd` was used, we need to resolve to an absolute path based on it + if (resolved) { + resolved = path.resolve(hasCustomCwd ? parsed.options.cwd : '', resolved); + } + return resolved; +} +function resolveCommand(parsed) { + return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true); +} +module.exports = resolveCommand; -const normalizeSignal=function({ -name, -number:defaultNumber, -description, -action, -forced=false, -standard}) -{ -const{ -signals:{[name]:constantSignal}}= -_os.constants; -const supported=constantSignal!==undefined; -const number=supported?constantSignal:defaultNumber; -return{name,number,description,supported,action,forced,standard}; -}; -//# sourceMappingURL=signals.js.map /***/ }), -/* 373 */ +/* 376 */ /***/ (function(module, exports, __webpack_require__) { -"use strict"; -Object.defineProperty(exports,"__esModule",{value:true});exports.SIGNALS=void 0; - -const SIGNALS=[ -{ -name:"SIGHUP", -number:1, -action:"terminate", -description:"Terminal closed", -standard:"posix"}, +const isWindows = process.platform === 'win32' || + process.env.OSTYPE === 'cygwin' || + process.env.OSTYPE === 'msys' -{ -name:"SIGINT", -number:2, -action:"terminate", -description:"User interruption with CTRL-C", -standard:"ansi"}, +const path = __webpack_require__(16) +const COLON = isWindows ? ';' : ':' +const isexe = __webpack_require__(377) -{ -name:"SIGQUIT", -number:3, -action:"core", -description:"User interruption with CTRL-\\", -standard:"posix"}, +const getNotFoundError = (cmd) => + Object.assign(new Error(`not found: ${cmd}`), { code: 'ENOENT' }) -{ -name:"SIGILL", -number:4, -action:"core", -description:"Invalid machine instruction", -standard:"ansi"}, +const getPathInfo = (cmd, opt) => { + const colon = opt.colon || COLON -{ -name:"SIGTRAP", -number:5, -action:"core", -description:"Debugger breakpoint", -standard:"posix"}, + // If it has a slash, then we don't bother searching the pathenv. + // just check the file itself, and that's it. + const pathEnv = cmd.match(/\//) || isWindows && cmd.match(/\\/) ? [''] + : ( + [ + // windows always checks the cwd first + ...(isWindows ? [process.cwd()] : []), + ...(opt.path || process.env.PATH || + /* istanbul ignore next: very unusual */ '').split(colon), + ] + ) + const pathExtExe = isWindows + ? opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM' + : '' + const pathExt = isWindows ? pathExtExe.split(colon) : [''] -{ -name:"SIGABRT", -number:6, -action:"core", -description:"Aborted", -standard:"ansi"}, + if (isWindows) { + if (cmd.indexOf('.') !== -1 && pathExt[0] !== '') + pathExt.unshift('') + } -{ -name:"SIGIOT", -number:6, -action:"core", -description:"Aborted", -standard:"bsd"}, + return { + pathEnv, + pathExt, + pathExtExe, + } +} -{ -name:"SIGBUS", -number:7, -action:"core", -description: -"Bus error due to misaligned, non-existing address or paging error", -standard:"bsd"}, +const which = (cmd, opt, cb) => { + if (typeof opt === 'function') { + cb = opt + opt = {} + } + if (!opt) + opt = {} -{ -name:"SIGEMT", -number:7, -action:"terminate", -description:"Command should be emulated but is not implemented", -standard:"other"}, + const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt) + const found = [] -{ -name:"SIGFPE", -number:8, -action:"core", -description:"Floating point arithmetic error", -standard:"ansi"}, + const step = i => new Promise((resolve, reject) => { + if (i === pathEnv.length) + return opt.all && found.length ? resolve(found) + : reject(getNotFoundError(cmd)) -{ -name:"SIGKILL", -number:9, -action:"terminate", -description:"Forced termination", -standard:"posix", -forced:true}, + const ppRaw = pathEnv[i] + const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw -{ -name:"SIGUSR1", -number:10, -action:"terminate", -description:"Application-specific signal", -standard:"posix"}, + const pCmd = path.join(pathPart, cmd) + const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd + : pCmd -{ -name:"SIGSEGV", -number:11, -action:"core", -description:"Segmentation fault", -standard:"ansi"}, + resolve(subStep(p, i, 0)) + }) -{ -name:"SIGUSR2", -number:12, -action:"terminate", -description:"Application-specific signal", -standard:"posix"}, + const subStep = (p, i, ii) => new Promise((resolve, reject) => { + if (ii === pathExt.length) + return resolve(step(i + 1)) + const ext = pathExt[ii] + isexe(p + ext, { pathExt: pathExtExe }, (er, is) => { + if (!er && is) { + if (opt.all) + found.push(p + ext) + else + return resolve(p + ext) + } + return resolve(subStep(p, i, ii + 1)) + }) + }) -{ -name:"SIGPIPE", -number:13, -action:"terminate", -description:"Broken pipe or socket", -standard:"posix"}, + return cb ? step(0).then(res => cb(null, res), cb) : step(0) +} -{ -name:"SIGALRM", -number:14, -action:"terminate", -description:"Timeout or timer", -standard:"posix"}, +const whichSync = (cmd, opt) => { + opt = opt || {} -{ -name:"SIGTERM", -number:15, -action:"terminate", -description:"Termination", -standard:"ansi"}, + const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt) + const found = [] -{ -name:"SIGSTKFLT", -number:16, -action:"terminate", -description:"Stack is empty or overflowed", -standard:"other"}, + for (let i = 0; i < pathEnv.length; i ++) { + const ppRaw = pathEnv[i] + const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw -{ -name:"SIGCHLD", -number:17, -action:"ignore", -description:"Child process terminated, paused or unpaused", -standard:"posix"}, + const pCmd = path.join(pathPart, cmd) + const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd + : pCmd -{ -name:"SIGCLD", -number:17, -action:"ignore", -description:"Child process terminated, paused or unpaused", -standard:"other"}, + for (let j = 0; j < pathExt.length; j ++) { + const cur = p + pathExt[j] + try { + const is = isexe.sync(cur, { pathExt: pathExtExe }) + if (is) { + if (opt.all) + found.push(cur) + else + return cur + } + } catch (ex) {} + } + } -{ -name:"SIGCONT", -number:18, -action:"unpause", -description:"Unpaused", -standard:"posix", -forced:true}, + if (opt.all && found.length) + return found -{ -name:"SIGSTOP", -number:19, -action:"pause", -description:"Paused", -standard:"posix", -forced:true}, + if (opt.nothrow) + return null -{ -name:"SIGTSTP", -number:20, -action:"pause", -description:"Paused using CTRL-Z or \"suspend\"", -standard:"posix"}, + throw getNotFoundError(cmd) +} -{ -name:"SIGTTIN", -number:21, -action:"pause", -description:"Background process cannot read terminal input", -standard:"posix"}, +module.exports = which +which.sync = whichSync -{ -name:"SIGBREAK", -number:21, -action:"terminate", -description:"User interruption with CTRL-BREAK", -standard:"other"}, -{ -name:"SIGTTOU", -number:22, -action:"pause", -description:"Background process cannot write to terminal output", -standard:"posix"}, +/***/ }), +/* 377 */ +/***/ (function(module, exports, __webpack_require__) { -{ -name:"SIGURG", -number:23, -action:"ignore", -description:"Socket received out-of-band data", -standard:"bsd"}, +var fs = __webpack_require__(23) +var core +if (process.platform === 'win32' || global.TESTING_WINDOWS) { + core = __webpack_require__(378) +} else { + core = __webpack_require__(379) +} -{ -name:"SIGXCPU", -number:24, -action:"core", -description:"Process timed out", -standard:"bsd"}, +module.exports = isexe +isexe.sync = sync -{ -name:"SIGXFSZ", -number:25, -action:"core", -description:"File too big", -standard:"bsd"}, +function isexe (path, options, cb) { + if (typeof options === 'function') { + cb = options + options = {} + } -{ -name:"SIGVTALRM", -number:26, -action:"terminate", -description:"Timeout or timer", -standard:"bsd"}, + if (!cb) { + if (typeof Promise !== 'function') { + throw new TypeError('callback not provided') + } -{ -name:"SIGPROF", -number:27, -action:"terminate", -description:"Timeout or timer", -standard:"bsd"}, + return new Promise(function (resolve, reject) { + isexe(path, options || {}, function (er, is) { + if (er) { + reject(er) + } else { + resolve(is) + } + }) + }) + } -{ -name:"SIGWINCH", -number:28, -action:"ignore", -description:"Terminal window size changed", -standard:"bsd"}, + core(path, options || {}, function (er, is) { + // ignore EACCES because that just means we aren't allowed to run it + if (er) { + if (er.code === 'EACCES' || options && options.ignoreErrors) { + er = null + is = false + } + } + cb(er, is) + }) +} -{ -name:"SIGIO", -number:29, -action:"terminate", -description:"I/O is available", -standard:"other"}, +function sync (path, options) { + // my kingdom for a filtered catch + try { + return core.sync(path, options || {}) + } catch (er) { + if (options && options.ignoreErrors || er.code === 'EACCES') { + return false + } else { + throw er + } + } +} -{ -name:"SIGPOLL", -number:29, -action:"terminate", -description:"Watched event", -standard:"other"}, -{ -name:"SIGINFO", -number:29, -action:"ignore", -description:"Request for process information", -standard:"other"}, +/***/ }), +/* 378 */ +/***/ (function(module, exports, __webpack_require__) { -{ -name:"SIGPWR", -number:30, -action:"terminate", -description:"Device running out of power", -standard:"systemv"}, +module.exports = isexe +isexe.sync = sync -{ -name:"SIGSYS", -number:31, -action:"core", -description:"Invalid system call", -standard:"other"}, +var fs = __webpack_require__(23) -{ -name:"SIGUNUSED", -number:31, -action:"terminate", -description:"Invalid system call", -standard:"other"}];exports.SIGNALS=SIGNALS; -//# sourceMappingURL=core.js.map +function checkPathExt (path, options) { + var pathext = options.pathExt !== undefined ? + options.pathExt : process.env.PATHEXT -/***/ }), -/* 374 */ -/***/ (function(module, exports, __webpack_require__) { + if (!pathext) { + return true + } -"use strict"; -Object.defineProperty(exports,"__esModule",{value:true});exports.SIGRTMAX=exports.getRealtimeSignals=void 0; -const getRealtimeSignals=function(){ -const length=SIGRTMAX-SIGRTMIN+1; -return Array.from({length},getRealtimeSignal); -};exports.getRealtimeSignals=getRealtimeSignals; + pathext = pathext.split(';') + if (pathext.indexOf('') !== -1) { + return true + } + for (var i = 0; i < pathext.length; i++) { + var p = pathext[i].toLowerCase() + if (p && path.substr(-p.length).toLowerCase() === p) { + return true + } + } + return false +} -const getRealtimeSignal=function(value,index){ -return{ -name:`SIGRT${index+1}`, -number:SIGRTMIN+index, -action:"terminate", -description:"Application-specific signal (realtime)", -standard:"posix"}; +function checkStat (stat, path, options) { + if (!stat.isSymbolicLink() && !stat.isFile()) { + return false + } + return checkPathExt(path, options) +} -}; +function isexe (path, options, cb) { + fs.stat(path, function (er, stat) { + cb(er, er ? false : checkStat(stat, path, options)) + }) +} + +function sync (path, options) { + return checkStat(fs.statSync(path), path, options) +} -const SIGRTMIN=34; -const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX; -//# sourceMappingURL=realtime.js.map /***/ }), -/* 375 */ +/* 379 */ /***/ (function(module, exports, __webpack_require__) { -"use strict"; +module.exports = isexe +isexe.sync = sync -const aliases = ['stdin', 'stdout', 'stderr']; +var fs = __webpack_require__(23) -const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined); +function isexe (path, options, cb) { + fs.stat(path, function (er, stat) { + cb(er, er ? false : checkStat(stat, options)) + }) +} -const normalizeStdio = opts => { - if (!opts) { - return; - } +function sync (path, options) { + return checkStat(fs.statSync(path), options) +} - const {stdio} = opts; +function checkStat (stat, options) { + return stat.isFile() && checkMode(stat, options) +} - if (stdio === undefined) { - return aliases.map(alias => opts[alias]); - } +function checkMode (stat, options) { + var mod = stat.mode + var uid = stat.uid + var gid = stat.gid - if (hasAlias(opts)) { - throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`); - } + var myUid = options.uid !== undefined ? + options.uid : process.getuid && process.getuid() + var myGid = options.gid !== undefined ? + options.gid : process.getgid && process.getgid() - if (typeof stdio === 'string') { - return stdio; - } + var u = parseInt('100', 8) + var g = parseInt('010', 8) + var o = parseInt('001', 8) + var ug = u | g - if (!Array.isArray(stdio)) { - throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``); - } + var ret = (mod & o) || + (mod & g) && gid === myGid || + (mod & u) && uid === myUid || + (mod & ug) && myUid === 0 - const length = Math.max(stdio.length, aliases.length); - return Array.from({length}, (value, index) => stdio[index]); -}; + return ret +} -module.exports = normalizeStdio; -// `ipc` is pushed unless it is already present -module.exports.node = opts => { - const stdio = normalizeStdio(opts); +/***/ }), +/* 380 */ +/***/ (function(module, exports, __webpack_require__) { - if (stdio === 'ipc') { - return 'ipc'; - } +"use strict"; - if (stdio === undefined || typeof stdio === 'string') { - return [stdio, stdio, stdio, 'ipc']; - } - if (stdio.includes('ipc')) { - return stdio; +const pathKey = (options = {}) => { + const environment = options.env || process.env; + const platform = options.platform || process.platform; + + if (platform !== 'win32') { + return 'PATH'; } - return [...stdio, 'ipc']; + return Object.keys(environment).find(key => key.toUpperCase() === 'PATH') || 'Path'; }; +module.exports = pathKey; +// TODO: Remove this for the next major release +module.exports.default = pathKey; + /***/ }), -/* 376 */ +/* 381 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const os = __webpack_require__(11); -const onExit = __webpack_require__(377); -const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5; +// See http://www.robvanderwoude.com/escapechars.php +const metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g; -// Monkey-patches `childProcess.kill()` to add `forceKillAfterTimeout` behavior -const spawnedKill = (kill, signal = 'SIGTERM', options = {}) => { - const killResult = kill(signal); - setKillTimeout(kill, signal, options, killResult); - return killResult; -}; +function escapeCommand(arg) { + // Escape meta chars + arg = arg.replace(metaCharsRegExp, '^$1'); -const setKillTimeout = (kill, signal, options, killResult) => { - if (!shouldForceKill(signal, options, killResult)) { - return; - } + return arg; +} - const timeout = getForceKillAfterTimeout(options); - const t = setTimeout(() => { - kill('SIGKILL'); - }, timeout); +function escapeArgument(arg, doubleEscapeMetaChars) { + // Convert to string + arg = `${arg}`; - // Guarded because there's no `.unref()` when `execa` is used in the renderer - // process in Electron. This cannot be tested since we don't run tests in - // Electron. - // istanbul ignore else - if (t.unref) { - t.unref(); - } -}; + // Algorithm below is based on https://qntm.org/cmd -const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => { - return isSigterm(signal) && forceKillAfterTimeout !== false && killResult; -}; + // Sequence of backslashes followed by a double quote: + // double up all the backslashes and escape the double quote + arg = arg.replace(/(\\*)"/g, '$1$1\\"'); -const isSigterm = signal => { - return signal === os.constants.signals.SIGTERM || - (typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM'); -}; + // Sequence of backslashes followed by the end of the string + // (which will become a double quote later): + // double up all the backslashes + arg = arg.replace(/(\\*)$/, '$1$1'); -const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => { - if (forceKillAfterTimeout === true) { - return DEFAULT_FORCE_KILL_TIMEOUT; - } + // All other backslashes occur literally - if (!Number.isInteger(forceKillAfterTimeout) || forceKillAfterTimeout < 0) { - throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`); - } + // Quote the whole thing: + arg = `"${arg}"`; - return forceKillAfterTimeout; -}; + // Escape meta chars + arg = arg.replace(metaCharsRegExp, '^$1'); -// `childProcess.cancel()` -const spawnedCancel = (spawned, context) => { - const killResult = spawned.kill(); + // Double escape meta chars if necessary + if (doubleEscapeMetaChars) { + arg = arg.replace(metaCharsRegExp, '^$1'); + } - if (killResult) { - context.isCanceled = true; - } -}; + return arg; +} -const timeoutKill = (spawned, signal, reject) => { - spawned.kill(signal); - reject(Object.assign(new Error('Timed out'), {timedOut: true, signal})); -}; +module.exports.command = escapeCommand; +module.exports.argument = escapeArgument; -// `timeout` option handling -const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => { - if (timeout === 0 || timeout === undefined) { - return spawnedPromise; - } - if (!Number.isInteger(timeout) || timeout < 0) { - throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`); - } +/***/ }), +/* 382 */ +/***/ (function(module, exports, __webpack_require__) { - let timeoutId; - const timeoutPromise = new Promise((resolve, reject) => { - timeoutId = setTimeout(() => { - timeoutKill(spawned, killSignal, reject); - }, timeout); - }); +"use strict"; - const safeSpawnedPromise = spawnedPromise.finally(() => { - clearTimeout(timeoutId); - }); - return Promise.race([timeoutPromise, safeSpawnedPromise]); -}; +const fs = __webpack_require__(23); +const shebangCommand = __webpack_require__(383); -// `cleanup` option handling -const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => { - if (!cleanup || detached) { - return timedPromise; - } +function readShebang(command) { + // Read the first 150 bytes from the file + const size = 150; + const buffer = Buffer.alloc(size); - const removeExitHandler = onExit(() => { - spawned.kill(); - }); + let fd; - return timedPromise.finally(() => { - removeExitHandler(); - }); -}; + try { + fd = fs.openSync(command, 'r'); + fs.readSync(fd, buffer, 0, size, 0); + fs.closeSync(fd); + } catch (e) { /* Empty */ } -module.exports = { - spawnedKill, - spawnedCancel, - setupTimeout, - setExitHandler -}; + // Attempt to extract shebang (null is returned if not a shebang) + return shebangCommand(buffer.toString()); +} + +module.exports = readShebang; /***/ }), -/* 377 */ +/* 383 */ /***/ (function(module, exports, __webpack_require__) { -// Note: since nyc uses this module to output coverage, any lines -// that are in the direct sync flow of nyc's outputCoverage are -// ignored, since we can never get coverage for them. -var assert = __webpack_require__(30) -var signals = __webpack_require__(378) - -var EE = __webpack_require__(379) -/* istanbul ignore if */ -if (typeof EE !== 'function') { - EE = EE.EventEmitter -} - -var emitter -if (process.__signal_exit_emitter__) { - emitter = process.__signal_exit_emitter__ -} else { - emitter = process.__signal_exit_emitter__ = new EE() - emitter.count = 0 - emitter.emitted = {} -} - -// Because this emitter is a global, we have to check to see if a -// previous version of this library failed to enable infinite listeners. -// I know what you're about to say. But literally everything about -// signal-exit is a compromise with evil. Get used to it. -if (!emitter.infinite) { - emitter.setMaxListeners(Infinity) - emitter.infinite = true -} - -module.exports = function (cb, opts) { - assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler') +"use strict"; - if (loaded === false) { - load() - } +const shebangRegex = __webpack_require__(384); - var ev = 'exit' - if (opts && opts.alwaysLast) { - ev = 'afterexit' - } +module.exports = (string = '') => { + const match = string.match(shebangRegex); - var remove = function () { - emitter.removeListener(ev, cb) - if (emitter.listeners('exit').length === 0 && - emitter.listeners('afterexit').length === 0) { - unload() - } - } - emitter.on(ev, cb) + if (!match) { + return null; + } - return remove -} + const [path, argument] = match[0].replace(/#! ?/, '').split(' '); + const binary = path.split('/').pop(); -module.exports.unload = unload -function unload () { - if (!loaded) { - return - } - loaded = false + if (binary === 'env') { + return argument; + } - signals.forEach(function (sig) { - try { - process.removeListener(sig, sigListeners[sig]) - } catch (er) {} - }) - process.emit = originalProcessEmit - process.reallyExit = originalProcessReallyExit - emitter.count -= 1 -} + return argument ? `${binary} ${argument}` : binary; +}; -function emit (event, code, signal) { - if (emitter.emitted[event]) { - return - } - emitter.emitted[event] = true - emitter.emit(event, code, signal) -} -// { : , ... } -var sigListeners = {} -signals.forEach(function (sig) { - sigListeners[sig] = function listener () { - // If there are no other listeners, an exit is coming! - // Simplest way: remove us and then re-send the signal. - // We know that this will kill the process, so we can - // safely emit now. - var listeners = process.listeners(sig) - if (listeners.length === emitter.count) { - unload() - emit('exit', null, sig) - /* istanbul ignore next */ - emit('afterexit', null, sig) - /* istanbul ignore next */ - process.kill(process.pid, sig) - } - } -}) +/***/ }), +/* 384 */ +/***/ (function(module, exports, __webpack_require__) { -module.exports.signals = function () { - return signals -} +"use strict"; -module.exports.load = load +module.exports = /^#!(.*)/; -var loaded = false -function load () { - if (loaded) { - return - } - loaded = true +/***/ }), +/* 385 */ +/***/ (function(module, exports, __webpack_require__) { - // This is the number of onSignalExit's that are in play. - // It's important so that we can count the correct number of - // listeners on signals, and don't wait for the other one to - // handle it instead of us. - emitter.count += 1 +"use strict"; - signals = signals.filter(function (sig) { - try { - process.on(sig, sigListeners[sig]) - return true - } catch (er) { - return false - } - }) - process.emit = processEmit - process.reallyExit = processReallyExit -} +const isWin = process.platform === 'win32'; -var originalProcessReallyExit = process.reallyExit -function processReallyExit (code) { - process.exitCode = code || 0 - emit('exit', process.exitCode, null) - /* istanbul ignore next */ - emit('afterexit', process.exitCode, null) - /* istanbul ignore next */ - originalProcessReallyExit.call(process, process.exitCode) +function notFoundError(original, syscall) { + return Object.assign(new Error(`${syscall} ${original.command} ENOENT`), { + code: 'ENOENT', + errno: 'ENOENT', + syscall: `${syscall} ${original.command}`, + path: original.command, + spawnargs: original.args, + }); } -var originalProcessEmit = process.emit -function processEmit (ev, arg) { - if (ev === 'exit') { - if (arg !== undefined) { - process.exitCode = arg +function hookChildProcess(cp, parsed) { + if (!isWin) { + return; } - var ret = originalProcessEmit.apply(this, arguments) - emit('exit', process.exitCode, null) - /* istanbul ignore next */ - emit('afterexit', process.exitCode, null) - return ret - } else { - return originalProcessEmit.apply(this, arguments) - } -} + const originalEmit = cp.emit; -/***/ }), -/* 378 */ -/***/ (function(module, exports) { + cp.emit = function (name, arg1) { + // If emitting "exit" event and exit code is 1, we need to check if + // the command exists and emit an "error" instead + // See https://github.com/IndigoUnited/node-cross-spawn/issues/16 + if (name === 'exit') { + const err = verifyENOENT(arg1, parsed, 'spawn'); -// This is not the set of all possible signals. -// -// It IS, however, the set of all signals that trigger -// an exit on either Linux or BSD systems. Linux is a -// superset of the signal names supported on BSD, and -// the unknown signals just fail to register, so we can -// catch that easily enough. -// -// Don't bother with SIGKILL. It's uncatchable, which -// means that we can't fire any callbacks anyway. -// -// If a user does happen to register a handler on a non- -// fatal signal like SIGWINCH or something, and then -// exit, it'll end up firing `process.emit('exit')`, so -// the handler will be fired anyway. -// -// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised -// artificially, inherently leave the process in a -// state from which it is not safe to try and enter JS -// listeners. -module.exports = [ - 'SIGABRT', - 'SIGALRM', - 'SIGHUP', - 'SIGINT', - 'SIGTERM' -] + if (err) { + return originalEmit.call(cp, 'error', err); + } + } -if (process.platform !== 'win32') { - module.exports.push( - 'SIGVTALRM', - 'SIGXCPU', - 'SIGXFSZ', - 'SIGUSR2', - 'SIGTRAP', - 'SIGSYS', - 'SIGQUIT', - 'SIGIOT' - // should detect profiler and enable/disable accordingly. - // see #21 - // 'SIGPROF' - ) + return originalEmit.apply(cp, arguments); // eslint-disable-line prefer-rest-params + }; } -if (process.platform === 'linux') { - module.exports.push( - 'SIGIO', - 'SIGPOLL', - 'SIGPWR', - 'SIGSTKFLT', - 'SIGUNUSED' - ) +function verifyENOENT(status, parsed) { + if (isWin && status === 1 && !parsed.file) { + return notFoundError(parsed.original, 'spawn'); + } + + return null; } +function verifyENOENTSync(status, parsed) { + if (isWin && status === 1 && !parsed.file) { + return notFoundError(parsed.original, 'spawnSync'); + } -/***/ }), -/* 379 */ -/***/ (function(module, exports) { + return null; +} + +module.exports = { + hookChildProcess, + verifyENOENT, + verifyENOENTSync, + notFoundError, +}; -module.exports = require("events"); /***/ }), -/* 380 */ +/* 386 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const isStream = __webpack_require__(381); -const getStream = __webpack_require__(382); -const mergeStream = __webpack_require__(388); -// `input` option -const handleInput = (spawned, input) => { - // Checking for stdin is workaround for https://github.com/nodejs/node/issues/26852 - // TODO: Remove `|| spawned.stdin === undefined` once we drop support for Node.js <=12.2.0 - if (input === undefined || spawned.stdin === undefined) { - return; - } +module.exports = input => { + const LF = typeof input === 'string' ? '\n' : '\n'.charCodeAt(); + const CR = typeof input === 'string' ? '\r' : '\r'.charCodeAt(); - if (isStream(input)) { - input.pipe(spawned.stdin); - } else { - spawned.stdin.end(input); + if (input[input.length - 1] === LF) { + input = input.slice(0, input.length - 1); } -}; -// `all` interleaves `stdout` and `stderr` -const makeAllStream = (spawned, {all}) => { - if (!all || (!spawned.stdout && !spawned.stderr)) { - return; + if (input[input.length - 1] === CR) { + input = input.slice(0, input.length - 1); } - const mixed = mergeStream(); + return input; +}; - if (spawned.stdout) { - mixed.add(spawned.stdout); - } - if (spawned.stderr) { - mixed.add(spawned.stderr); - } +/***/ }), +/* 387 */ +/***/ (function(module, exports, __webpack_require__) { - return mixed; -}; +"use strict"; -// On failure, `result.stdout|stderr|all` should contain the currently buffered stream -const getBufferedData = async (stream, streamPromise) => { - if (!stream) { - return; - } +const path = __webpack_require__(16); +const pathKey = __webpack_require__(380); - stream.destroy(); +const npmRunPath = options => { + options = { + cwd: process.cwd(), + path: process.env[pathKey()], + execPath: process.execPath, + ...options + }; - try { - return await streamPromise; - } catch (error) { - return error.bufferedData; - } -}; + let previous; + let cwdPath = path.resolve(options.cwd); + const result = []; -const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => { - if (!stream || !buffer) { - return; + while (previous !== cwdPath) { + result.push(path.join(cwdPath, 'node_modules/.bin')); + previous = cwdPath; + cwdPath = path.resolve(cwdPath, '..'); } - if (encoding) { - return getStream(stream, {encoding, maxBuffer}); - } + // Ensure the running `node` binary is used + const execPathDir = path.resolve(options.cwd, options.execPath, '..'); + result.unshift(execPathDir); - return getStream.buffer(stream, {maxBuffer}); + return result.concat(options.path).join(path.delimiter); }; -// Retrieve result of child process: exit code, signal, error, streams (stdout/stderr/all) -const getSpawnedResult = async ({stdout, stderr, all}, {encoding, buffer, maxBuffer}, processDone) => { - const stdoutPromise = getStreamPromise(stdout, {encoding, buffer, maxBuffer}); - const stderrPromise = getStreamPromise(stderr, {encoding, buffer, maxBuffer}); - const allPromise = getStreamPromise(all, {encoding, buffer, maxBuffer: maxBuffer * 2}); +module.exports = npmRunPath; +// TODO: Remove this for the next major release +module.exports.default = npmRunPath; - try { - return await Promise.all([processDone, stdoutPromise, stderrPromise, allPromise]); - } catch (error) { - return Promise.all([ - {error, signal: error.signal, timedOut: error.timedOut}, - getBufferedData(stdout, stdoutPromise), - getBufferedData(stderr, stderrPromise), - getBufferedData(all, allPromise) - ]); - } -}; +module.exports.env = options => { + options = { + env: process.env, + ...options + }; -const validateInputSync = ({input}) => { - if (isStream(input)) { - throw new TypeError('The `input` option cannot be a stream in sync mode'); - } -}; + const env = {...options.env}; + const path = pathKey({env}); -module.exports = { - handleInput, - makeAllStream, - getSpawnedResult, - validateInputSync -}; + options.path = env[path]; + env[path] = module.exports(options); + return env; +}; /***/ }), -/* 381 */ +/* 388 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; +const mimicFn = __webpack_require__(389); -const isStream = stream => - stream !== null && - typeof stream === 'object' && - typeof stream.pipe === 'function'; - -isStream.writable = stream => - isStream(stream) && - stream.writable !== false && - typeof stream._write === 'function' && - typeof stream._writableState === 'object'; +const calledFunctions = new WeakMap(); -isStream.readable = stream => - isStream(stream) && - stream.readable !== false && - typeof stream._read === 'function' && - typeof stream._readableState === 'object'; +const oneTime = (fn, options = {}) => { + if (typeof fn !== 'function') { + throw new TypeError('Expected a function'); + } -isStream.duplex = stream => - isStream.writable(stream) && - isStream.readable(stream); + let ret; + let isCalled = false; + let callCount = 0; + const functionName = fn.displayName || fn.name || ''; -isStream.transform = stream => - isStream.duplex(stream) && - typeof stream._transform === 'function' && - typeof stream._transformState === 'object'; + const onetime = function (...args) { + calledFunctions.set(onetime, ++callCount); -module.exports = isStream; + if (isCalled) { + if (options.throw === true) { + throw new Error(`Function \`${functionName}\` can only be called once`); + } + return ret; + } -/***/ }), -/* 382 */ -/***/ (function(module, exports, __webpack_require__) { + isCalled = true; + ret = fn.apply(this, args); + fn = null; -"use strict"; + return ret; + }; -const pump = __webpack_require__(383); -const bufferStream = __webpack_require__(387); + mimicFn(onetime, fn); + calledFunctions.set(onetime, callCount); -class MaxBufferError extends Error { - constructor() { - super('maxBuffer exceeded'); - this.name = 'MaxBufferError'; - } -} + return onetime; +}; -async function getStream(inputStream, options) { - if (!inputStream) { - return Promise.reject(new Error('Expected a stream')); - } +module.exports = oneTime; +// TODO: Remove this for the next major release +module.exports.default = oneTime; - options = { - maxBuffer: Infinity, - ...options - }; +module.exports.callCount = fn => { + if (!calledFunctions.has(fn)) { + throw new Error(`The given function \`${fn.name}\` is not wrapped by the \`onetime\` package`); + } - const {maxBuffer} = options; + return calledFunctions.get(fn); +}; - let stream; - await new Promise((resolve, reject) => { - const rejectPromise = error => { - if (error) { // A null check - error.bufferedData = stream.getBufferedValue(); - } - reject(error); - }; +/***/ }), +/* 389 */ +/***/ (function(module, exports, __webpack_require__) { - stream = pump(inputStream, bufferStream(options), error => { - if (error) { - rejectPromise(error); - return; - } +"use strict"; - resolve(); - }); - stream.on('data', () => { - if (stream.getBufferedLength() > maxBuffer) { - rejectPromise(new MaxBufferError()); - } - }); - }); +const mimicFn = (to, from) => { + for (const prop of Reflect.ownKeys(from)) { + Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop)); + } - return stream.getBufferedValue(); -} + return to; +}; -module.exports = getStream; +module.exports = mimicFn; // TODO: Remove this for the next major release -module.exports.default = getStream; -module.exports.buffer = (stream, options) => getStream(stream, {...options, encoding: 'buffer'}); -module.exports.array = (stream, options) => getStream(stream, {...options, array: true}); -module.exports.MaxBufferError = MaxBufferError; +module.exports.default = mimicFn; /***/ }), -/* 383 */ +/* 390 */ /***/ (function(module, exports, __webpack_require__) { -var once = __webpack_require__(384) -var eos = __webpack_require__(386) -var fs = __webpack_require__(23) // we only need fs to get the ReadStream and WriteStream prototypes - -var noop = function () {} -var ancient = /^v?\.0/.test(process.version) +"use strict"; -var isFn = function (fn) { - return typeof fn === 'function' -} +const {signalsByName} = __webpack_require__(391); -var isFS = function (stream) { - if (!ancient) return false // newer node version do not need to care about fs is a special way - if (!fs) return false // browser - return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close) -} +const getErrorPrefix = ({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}) => { + if (timedOut) { + return `timed out after ${timeout} milliseconds`; + } -var isRequest = function (stream) { - return stream.setHeader && isFn(stream.abort) -} + if (isCanceled) { + return 'was canceled'; + } -var destroyer = function (stream, reading, writing, callback) { - callback = once(callback) + if (errorCode !== undefined) { + return `failed with ${errorCode}`; + } - var closed = false - stream.on('close', function () { - closed = true - }) + if (signal !== undefined) { + return `was killed with ${signal} (${signalDescription})`; + } - eos(stream, {readable: reading, writable: writing}, function (err) { - if (err) return callback(err) - closed = true - callback() - }) + if (exitCode !== undefined) { + return `failed with exit code ${exitCode}`; + } - var destroyed = false - return function (err) { - if (closed) return - if (destroyed) return - destroyed = true + return 'failed'; +}; - if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks - if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want +const makeError = ({ + stdout, + stderr, + all, + error, + signal, + exitCode, + command, + timedOut, + isCanceled, + killed, + parsed: {options: {timeout}} +}) => { + // `signal` and `exitCode` emitted on `spawned.on('exit')` event can be `null`. + // We normalize them to `undefined` + exitCode = exitCode === null ? undefined : exitCode; + signal = signal === null ? undefined : signal; + const signalDescription = signal === undefined ? undefined : signalsByName[signal].description; - if (isFn(stream.destroy)) return stream.destroy() + const errorCode = error && error.code; - callback(err || new Error('stream was destroyed')) - } -} + const prefix = getErrorPrefix({timedOut, timeout, errorCode, signal, signalDescription, exitCode, isCanceled}); + const execaMessage = `Command ${prefix}: ${command}`; + const shortMessage = error instanceof Error ? `${execaMessage}\n${error.message}` : execaMessage; + const message = [shortMessage, stderr, stdout].filter(Boolean).join('\n'); -var call = function (fn) { - fn() -} + if (error instanceof Error) { + error.originalMessage = error.message; + error.message = message; + } else { + error = new Error(message); + } -var pipe = function (from, to) { - return from.pipe(to) -} + error.shortMessage = shortMessage; + error.command = command; + error.exitCode = exitCode; + error.signal = signal; + error.signalDescription = signalDescription; + error.stdout = stdout; + error.stderr = stderr; -var pump = function () { - var streams = Array.prototype.slice.call(arguments) - var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop + if (all !== undefined) { + error.all = all; + } - if (Array.isArray(streams[0])) streams = streams[0] - if (streams.length < 2) throw new Error('pump requires two streams per minimum') + if ('bufferedData' in error) { + delete error.bufferedData; + } - var error - var destroys = streams.map(function (stream, i) { - var reading = i < streams.length - 1 - var writing = i > 0 - return destroyer(stream, reading, writing, function (err) { - if (!error) error = err - if (err) destroys.forEach(call) - if (reading) return - destroys.forEach(call) - callback(error) - }) - }) + error.failed = true; + error.timedOut = Boolean(timedOut); + error.isCanceled = isCanceled; + error.killed = killed && !timedOut; - return streams.reduce(pipe) -} + return error; +}; -module.exports = pump +module.exports = makeError; /***/ }), -/* 384 */ +/* 391 */ /***/ (function(module, exports, __webpack_require__) { -var wrappy = __webpack_require__(385) -module.exports = wrappy(once) -module.exports.strict = wrappy(onceStrict) - -once.proto = once(function () { - Object.defineProperty(Function.prototype, 'once', { - value: function () { - return once(this) - }, - configurable: true - }) - - Object.defineProperty(Function.prototype, 'onceStrict', { - value: function () { - return onceStrict(this) - }, - configurable: true - }) -}) - -function once (fn) { - var f = function () { - if (f.called) return f.value - f.called = true - return f.value = fn.apply(this, arguments) - } - f.called = false - return f -} - -function onceStrict (fn) { - var f = function () { - if (f.called) - throw new Error(f.onceError) - f.called = true - return f.value = fn.apply(this, arguments) - } - var name = fn.name || 'Function wrapped with `once`' - f.onceError = name + " shouldn't be called more than once" - f.called = false - return f -} - +"use strict"; +Object.defineProperty(exports,"__esModule",{value:true});exports.signalsByNumber=exports.signalsByName=void 0;var _os=__webpack_require__(11); -/***/ }), -/* 385 */ -/***/ (function(module, exports) { +var _signals=__webpack_require__(392); +var _realtime=__webpack_require__(394); -// Returns a wrapper function that returns a wrapped callback -// The wrapper function should do some stuff, and return a -// presumably different callback function. -// This makes sure that own properties are retained, so that -// decorations and such are not lost along the way. -module.exports = wrappy -function wrappy (fn, cb) { - if (fn && cb) return wrappy(fn)(cb) - if (typeof fn !== 'function') - throw new TypeError('need wrapper function') - Object.keys(fn).forEach(function (k) { - wrapper[k] = fn[k] - }) +const getSignalsByName=function(){ +const signals=(0,_signals.getSignals)(); +return signals.reduce(getSignalByName,{}); +}; - return wrapper +const getSignalByName=function( +signalByNameMemo, +{name,number,description,supported,action,forced,standard}) +{ +return{ +...signalByNameMemo, +[name]:{name,number,description,supported,action,forced,standard}}; - function wrapper() { - var args = new Array(arguments.length) - for (var i = 0; i < args.length; i++) { - args[i] = arguments[i] - } - var ret = fn.apply(this, args) - var cb = args[args.length-1] - if (typeof ret === 'function' && ret !== cb) { - Object.keys(cb).forEach(function (k) { - ret[k] = cb[k] - }) - } - return ret - } -} +}; +const signalsByName=getSignalsByName();exports.signalsByName=signalsByName; -/***/ }), -/* 386 */ -/***/ (function(module, exports, __webpack_require__) { -var once = __webpack_require__(384); -var noop = function() {}; -var isRequest = function(stream) { - return stream.setHeader && typeof stream.abort === 'function'; -}; +const getSignalsByNumber=function(){ +const signals=(0,_signals.getSignals)(); +const length=_realtime.SIGRTMAX+1; +const signalsA=Array.from({length},(value,number)=> +getSignalByNumber(number,signals)); -var isChildProcess = function(stream) { - return stream.stdio && Array.isArray(stream.stdio) && stream.stdio.length === 3 +return Object.assign({},...signalsA); }; -var eos = function(stream, opts, callback) { - if (typeof opts === 'function') return eos(stream, null, opts); - if (!opts) opts = {}; - - callback = once(callback || noop); - - var ws = stream._writableState; - var rs = stream._readableState; - var readable = opts.readable || (opts.readable !== false && stream.readable); - var writable = opts.writable || (opts.writable !== false && stream.writable); - - var onlegacyfinish = function() { - if (!stream.writable) onfinish(); - }; - - var onfinish = function() { - writable = false; - if (!readable) callback.call(stream); - }; +const getSignalByNumber=function(number,signals){ +const signal=findSignalByNumber(number,signals); - var onend = function() { - readable = false; - if (!writable) callback.call(stream); - }; +if(signal===undefined){ +return{}; +} - var onexit = function(exitCode) { - callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null); - }; +const{name,description,supported,action,forced,standard}=signal; +return{ +[number]:{ +name, +number, +description, +supported, +action, +forced, +standard}}; - var onerror = function(err) { - callback.call(stream, err); - }; - var onclose = function() { - if (readable && !(rs && rs.ended)) return callback.call(stream, new Error('premature close')); - if (writable && !(ws && ws.ended)) return callback.call(stream, new Error('premature close')); - }; +}; - var onrequest = function() { - stream.req.on('finish', onfinish); - }; - if (isRequest(stream)) { - stream.on('complete', onfinish); - stream.on('abort', onclose); - if (stream.req) onrequest(); - else stream.on('request', onrequest); - } else if (writable && !ws) { // legacy streams - stream.on('end', onlegacyfinish); - stream.on('close', onlegacyfinish); - } - if (isChildProcess(stream)) stream.on('exit', onexit); +const findSignalByNumber=function(number,signals){ +const signal=signals.find(({name})=>_os.constants.signals[name]===number); - stream.on('end', onend); - stream.on('finish', onfinish); - if (opts.error !== false) stream.on('error', onerror); - stream.on('close', onclose); +if(signal!==undefined){ +return signal; +} - return function() { - stream.removeListener('complete', onfinish); - stream.removeListener('abort', onclose); - stream.removeListener('request', onrequest); - if (stream.req) stream.req.removeListener('finish', onfinish); - stream.removeListener('end', onlegacyfinish); - stream.removeListener('close', onlegacyfinish); - stream.removeListener('finish', onfinish); - stream.removeListener('exit', onexit); - stream.removeListener('end', onend); - stream.removeListener('error', onerror); - stream.removeListener('close', onclose); - }; +return signals.find(signalA=>signalA.number===number); }; -module.exports = eos; - +const signalsByNumber=getSignalsByNumber();exports.signalsByNumber=signalsByNumber; +//# sourceMappingURL=main.js.map /***/ }), -/* 387 */ +/* 392 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; +Object.defineProperty(exports,"__esModule",{value:true});exports.getSignals=void 0;var _os=__webpack_require__(11); -const {PassThrough: PassThroughStream} = __webpack_require__(27); - -module.exports = options => { - options = {...options}; - - const {array} = options; - let {encoding} = options; - const isBuffer = encoding === 'buffer'; - let objectMode = false; - - if (array) { - objectMode = !(encoding || isBuffer); - } else { - encoding = encoding || 'utf8'; - } +var _core=__webpack_require__(393); +var _realtime=__webpack_require__(394); - if (isBuffer) { - encoding = null; - } - const stream = new PassThroughStream({objectMode}); - if (encoding) { - stream.setEncoding(encoding); - } +const getSignals=function(){ +const realtimeSignals=(0,_realtime.getRealtimeSignals)(); +const signals=[..._core.SIGNALS,...realtimeSignals].map(normalizeSignal); +return signals; +};exports.getSignals=getSignals; - let length = 0; - const chunks = []; - stream.on('data', chunk => { - chunks.push(chunk); - if (objectMode) { - length = chunks.length; - } else { - length += chunk.length; - } - }); - stream.getBufferedValue = () => { - if (array) { - return chunks; - } - return isBuffer ? Buffer.concat(chunks, length) : chunks.join(''); - }; - stream.getBufferedLength = () => length; - return stream; +const normalizeSignal=function({ +name, +number:defaultNumber, +description, +action, +forced=false, +standard}) +{ +const{ +signals:{[name]:constantSignal}}= +_os.constants; +const supported=constantSignal!==undefined; +const number=supported?constantSignal:defaultNumber; +return{name,number,description,supported,action,forced,standard}; }; - +//# sourceMappingURL=signals.js.map /***/ }), -/* 388 */ +/* 393 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; +Object.defineProperty(exports,"__esModule",{value:true});exports.SIGNALS=void 0; +const SIGNALS=[ +{ +name:"SIGHUP", +number:1, +action:"terminate", +description:"Terminal closed", +standard:"posix"}, -const { PassThrough } = __webpack_require__(27); - -module.exports = function (/*streams...*/) { - var sources = [] - var output = new PassThrough({objectMode: true}) - - output.setMaxListeners(0) +{ +name:"SIGINT", +number:2, +action:"terminate", +description:"User interruption with CTRL-C", +standard:"ansi"}, - output.add = add - output.isEmpty = isEmpty +{ +name:"SIGQUIT", +number:3, +action:"core", +description:"User interruption with CTRL-\\", +standard:"posix"}, - output.on('unpipe', remove) +{ +name:"SIGILL", +number:4, +action:"core", +description:"Invalid machine instruction", +standard:"ansi"}, - Array.prototype.slice.call(arguments).forEach(add) +{ +name:"SIGTRAP", +number:5, +action:"core", +description:"Debugger breakpoint", +standard:"posix"}, - return output +{ +name:"SIGABRT", +number:6, +action:"core", +description:"Aborted", +standard:"ansi"}, - function add (source) { - if (Array.isArray(source)) { - source.forEach(add) - return this - } +{ +name:"SIGIOT", +number:6, +action:"core", +description:"Aborted", +standard:"bsd"}, - sources.push(source); - source.once('end', remove.bind(null, source)) - source.once('error', output.emit.bind(output, 'error')) - source.pipe(output, {end: false}) - return this - } +{ +name:"SIGBUS", +number:7, +action:"core", +description: +"Bus error due to misaligned, non-existing address or paging error", +standard:"bsd"}, - function isEmpty () { - return sources.length == 0; - } +{ +name:"SIGEMT", +number:7, +action:"terminate", +description:"Command should be emulated but is not implemented", +standard:"other"}, - function remove (source) { - sources = sources.filter(function (it) { return it !== source }) - if (!sources.length && output.readable) { output.end() } - } -} +{ +name:"SIGFPE", +number:8, +action:"core", +description:"Floating point arithmetic error", +standard:"ansi"}, +{ +name:"SIGKILL", +number:9, +action:"terminate", +description:"Forced termination", +standard:"posix", +forced:true}, -/***/ }), -/* 389 */ -/***/ (function(module, exports, __webpack_require__) { +{ +name:"SIGUSR1", +number:10, +action:"terminate", +description:"Application-specific signal", +standard:"posix"}, -"use strict"; +{ +name:"SIGSEGV", +number:11, +action:"core", +description:"Segmentation fault", +standard:"ansi"}, -const mergePromiseProperty = (spawned, promise, property) => { - // Starting the main `promise` is deferred to avoid consuming streams - const value = typeof promise === 'function' ? - (...args) => promise()[property](...args) : - promise[property].bind(promise); +{ +name:"SIGUSR2", +number:12, +action:"terminate", +description:"Application-specific signal", +standard:"posix"}, - Object.defineProperty(spawned, property, { - value, - writable: true, - enumerable: false, - configurable: true - }); -}; +{ +name:"SIGPIPE", +number:13, +action:"terminate", +description:"Broken pipe or socket", +standard:"posix"}, -// The return value is a mixin of `childProcess` and `Promise` -const mergePromise = (spawned, promise) => { - mergePromiseProperty(spawned, promise, 'then'); - mergePromiseProperty(spawned, promise, 'catch'); - mergePromiseProperty(spawned, promise, 'finally'); - return spawned; -}; +{ +name:"SIGALRM", +number:14, +action:"terminate", +description:"Timeout or timer", +standard:"posix"}, -// Use promises instead of `child_process` events -const getSpawnedPromise = spawned => { - return new Promise((resolve, reject) => { - spawned.on('exit', (exitCode, signal) => { - resolve({exitCode, signal}); - }); +{ +name:"SIGTERM", +number:15, +action:"terminate", +description:"Termination", +standard:"ansi"}, - spawned.on('error', error => { - reject(error); - }); +{ +name:"SIGSTKFLT", +number:16, +action:"terminate", +description:"Stack is empty or overflowed", +standard:"other"}, - if (spawned.stdin) { - spawned.stdin.on('error', error => { - reject(error); - }); - } - }); -}; +{ +name:"SIGCHLD", +number:17, +action:"ignore", +description:"Child process terminated, paused or unpaused", +standard:"posix"}, -module.exports = { - mergePromise, - getSpawnedPromise -}; +{ +name:"SIGCLD", +number:17, +action:"ignore", +description:"Child process terminated, paused or unpaused", +standard:"other"}, +{ +name:"SIGCONT", +number:18, +action:"unpause", +description:"Unpaused", +standard:"posix", +forced:true}, +{ +name:"SIGSTOP", +number:19, +action:"pause", +description:"Paused", +standard:"posix", +forced:true}, -/***/ }), -/* 390 */ -/***/ (function(module, exports, __webpack_require__) { +{ +name:"SIGTSTP", +number:20, +action:"pause", +description:"Paused using CTRL-Z or \"suspend\"", +standard:"posix"}, -"use strict"; +{ +name:"SIGTTIN", +number:21, +action:"pause", +description:"Background process cannot read terminal input", +standard:"posix"}, -const SPACES_REGEXP = / +/g; +{ +name:"SIGBREAK", +number:21, +action:"terminate", +description:"User interruption with CTRL-BREAK", +standard:"other"}, -const joinCommand = (file, args = []) => { - if (!Array.isArray(args)) { - return file; - } +{ +name:"SIGTTOU", +number:22, +action:"pause", +description:"Background process cannot write to terminal output", +standard:"posix"}, - return [file, ...args].join(' '); -}; +{ +name:"SIGURG", +number:23, +action:"ignore", +description:"Socket received out-of-band data", +standard:"bsd"}, -// Allow spaces to be escaped by a backslash if not meant as a delimiter -const handleEscaping = (tokens, token, index) => { - if (index === 0) { - return [token]; - } +{ +name:"SIGXCPU", +number:24, +action:"core", +description:"Process timed out", +standard:"bsd"}, - const previousToken = tokens[tokens.length - 1]; +{ +name:"SIGXFSZ", +number:25, +action:"core", +description:"File too big", +standard:"bsd"}, - if (previousToken.endsWith('\\')) { - return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`]; - } +{ +name:"SIGVTALRM", +number:26, +action:"terminate", +description:"Timeout or timer", +standard:"bsd"}, - return [...tokens, token]; -}; +{ +name:"SIGPROF", +number:27, +action:"terminate", +description:"Timeout or timer", +standard:"bsd"}, -// Handle `execa.command()` -const parseCommand = command => { - return command - .trim() - .split(SPACES_REGEXP) - .reduce(handleEscaping, []); -}; +{ +name:"SIGWINCH", +number:28, +action:"ignore", +description:"Terminal window size changed", +standard:"bsd"}, -module.exports = { - joinCommand, - parseCommand -}; +{ +name:"SIGIO", +number:29, +action:"terminate", +description:"I/O is available", +standard:"other"}, +{ +name:"SIGPOLL", +number:29, +action:"terminate", +description:"Watched event", +standard:"other"}, -/***/ }), -/* 391 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +{ +name:"SIGINFO", +number:29, +action:"ignore", +description:"Request for process information", +standard:"other"}, -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony import */ var _internal_Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return _internal_Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"]; }); +{ +name:"SIGPWR", +number:30, +action:"terminate", +description:"Device running out of power", +standard:"systemv"}, -/* harmony import */ var _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(283); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return _internal_observable_ConnectableObservable__WEBPACK_IMPORTED_MODULE_1__["ConnectableObservable"]; }); +{ +name:"SIGSYS", +number:31, +action:"core", +description:"Invalid system call", +standard:"other"}, -/* harmony import */ var _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(264); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return _internal_operators_groupBy__WEBPACK_IMPORTED_MODULE_2__["GroupedObservable"]; }); +{ +name:"SIGUNUSED", +number:31, +action:"terminate", +description:"Invalid system call", +standard:"other"}];exports.SIGNALS=SIGNALS; +//# sourceMappingURL=core.js.map -/* harmony import */ var _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(190); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return _internal_symbol_observable__WEBPACK_IMPORTED_MODULE_3__["observable"]; }); +/***/ }), +/* 394 */ +/***/ (function(module, exports, __webpack_require__) { -/* harmony import */ var _internal_Subject__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(265); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return _internal_Subject__WEBPACK_IMPORTED_MODULE_4__["Subject"]; }); +"use strict"; +Object.defineProperty(exports,"__esModule",{value:true});exports.SIGRTMAX=exports.getRealtimeSignals=void 0; +const getRealtimeSignals=function(){ +const length=SIGRTMAX-SIGRTMIN+1; +return Array.from({length},getRealtimeSignal); +};exports.getRealtimeSignals=getRealtimeSignals; -/* harmony import */ var _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(293); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return _internal_BehaviorSubject__WEBPACK_IMPORTED_MODULE_5__["BehaviorSubject"]; }); +const getRealtimeSignal=function(value,index){ +return{ +name:`SIGRT${index+1}`, +number:SIGRTMIN+index, +action:"terminate", +description:"Application-specific signal (realtime)", +standard:"posix"}; -/* harmony import */ var _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(297); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return _internal_ReplaySubject__WEBPACK_IMPORTED_MODULE_6__["ReplaySubject"]; }); - -/* harmony import */ var _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(295); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return _internal_AsyncSubject__WEBPACK_IMPORTED_MODULE_7__["AsyncSubject"]; }); - -/* harmony import */ var _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(320); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return _internal_scheduler_asap__WEBPACK_IMPORTED_MODULE_8__["asap"]; }); - -/* harmony import */ var _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(199); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return _internal_scheduler_async__WEBPACK_IMPORTED_MODULE_9__["async"]; }); - -/* harmony import */ var _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(298); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return _internal_scheduler_queue__WEBPACK_IMPORTED_MODULE_10__["queue"]; }); - -/* harmony import */ var _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(392); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return _internal_scheduler_animationFrame__WEBPACK_IMPORTED_MODULE_11__["animationFrame"]; }); - -/* harmony import */ var _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(395); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualTimeScheduler"]; }); - -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return _internal_scheduler_VirtualTimeScheduler__WEBPACK_IMPORTED_MODULE_12__["VirtualAction"]; }); - -/* harmony import */ var _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(203); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return _internal_Scheduler__WEBPACK_IMPORTED_MODULE_13__["Scheduler"]; }); - -/* harmony import */ var _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(177); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return _internal_Subscription__WEBPACK_IMPORTED_MODULE_14__["Subscription"]; }); - -/* harmony import */ var _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(172); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return _internal_Subscriber__WEBPACK_IMPORTED_MODULE_15__["Subscriber"]; }); - -/* harmony import */ var _internal_Notification__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(241); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["Notification"]; }); - -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NotificationKind", function() { return _internal_Notification__WEBPACK_IMPORTED_MODULE_16__["NotificationKind"]; }); - -/* harmony import */ var _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(196); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return _internal_util_pipe__WEBPACK_IMPORTED_MODULE_17__["pipe"]; }); - -/* harmony import */ var _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(197); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return _internal_util_noop__WEBPACK_IMPORTED_MODULE_18__["noop"]; }); - -/* harmony import */ var _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(232); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return _internal_util_identity__WEBPACK_IMPORTED_MODULE_19__["identity"]; }); - -/* harmony import */ var _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(396); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return _internal_util_isObservable__WEBPACK_IMPORTED_MODULE_20__["isObservable"]; }); - -/* harmony import */ var _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(250); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return _internal_util_ArgumentOutOfRangeError__WEBPACK_IMPORTED_MODULE_21__["ArgumentOutOfRangeError"]; }); - -/* harmony import */ var _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(253); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return _internal_util_EmptyError__WEBPACK_IMPORTED_MODULE_22__["EmptyError"]; }); - -/* harmony import */ var _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(266); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return _internal_util_ObjectUnsubscribedError__WEBPACK_IMPORTED_MODULE_23__["ObjectUnsubscribedError"]; }); - -/* harmony import */ var _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(180); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return _internal_util_UnsubscriptionError__WEBPACK_IMPORTED_MODULE_24__["UnsubscriptionError"]; }); - -/* harmony import */ var _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(335); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return _internal_util_TimeoutError__WEBPACK_IMPORTED_MODULE_25__["TimeoutError"]; }); - -/* harmony import */ var _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(397); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return _internal_observable_bindCallback__WEBPACK_IMPORTED_MODULE_26__["bindCallback"]; }); - -/* harmony import */ var _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(398); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return _internal_observable_bindNodeCallback__WEBPACK_IMPORTED_MODULE_27__["bindNodeCallback"]; }); - -/* harmony import */ var _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(214); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return _internal_observable_combineLatest__WEBPACK_IMPORTED_MODULE_28__["combineLatest"]; }); - -/* harmony import */ var _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(226); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return _internal_observable_concat__WEBPACK_IMPORTED_MODULE_29__["concat"]; }); - -/* harmony import */ var _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(333); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return _internal_observable_defer__WEBPACK_IMPORTED_MODULE_30__["defer"]; }); - -/* harmony import */ var _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(242); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["empty"]; }); - -/* harmony import */ var _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(399); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return _internal_observable_forkJoin__WEBPACK_IMPORTED_MODULE_32__["forkJoin"]; }); - -/* harmony import */ var _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(218); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "from", function() { return _internal_observable_from__WEBPACK_IMPORTED_MODULE_33__["from"]; }); - -/* harmony import */ var _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(400); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return _internal_observable_fromEvent__WEBPACK_IMPORTED_MODULE_34__["fromEvent"]; }); - -/* harmony import */ var _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(401); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return _internal_observable_fromEventPattern__WEBPACK_IMPORTED_MODULE_35__["fromEventPattern"]; }); - -/* harmony import */ var _internal_observable_generate__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(402); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return _internal_observable_generate__WEBPACK_IMPORTED_MODULE_36__["generate"]; }); - -/* harmony import */ var _internal_observable_iif__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(403); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return _internal_observable_iif__WEBPACK_IMPORTED_MODULE_37__["iif"]; }); - -/* harmony import */ var _internal_observable_interval__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(404); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return _internal_observable_interval__WEBPACK_IMPORTED_MODULE_38__["interval"]; }); - -/* harmony import */ var _internal_observable_merge__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(278); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return _internal_observable_merge__WEBPACK_IMPORTED_MODULE_39__["merge"]; }); - -/* harmony import */ var _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(405); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "never", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["never"]; }); - -/* harmony import */ var _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(227); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "of", function() { return _internal_observable_of__WEBPACK_IMPORTED_MODULE_41__["of"]; }); - -/* harmony import */ var _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(406); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return _internal_observable_onErrorResumeNext__WEBPACK_IMPORTED_MODULE_42__["onErrorResumeNext"]; }); - -/* harmony import */ var _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(407); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return _internal_observable_pairs__WEBPACK_IMPORTED_MODULE_43__["pairs"]; }); - -/* harmony import */ var _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(408); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return _internal_observable_partition__WEBPACK_IMPORTED_MODULE_44__["partition"]; }); - -/* harmony import */ var _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(302); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "race", function() { return _internal_observable_race__WEBPACK_IMPORTED_MODULE_45__["race"]; }); - -/* harmony import */ var _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(409); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "range", function() { return _internal_observable_range__WEBPACK_IMPORTED_MODULE_46__["range"]; }); - -/* harmony import */ var _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(243); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return _internal_observable_throwError__WEBPACK_IMPORTED_MODULE_47__["throwError"]; }); - -/* harmony import */ var _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(204); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return _internal_observable_timer__WEBPACK_IMPORTED_MODULE_48__["timer"]; }); - -/* harmony import */ var _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(410); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "using", function() { return _internal_observable_using__WEBPACK_IMPORTED_MODULE_49__["using"]; }); - -/* harmony import */ var _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(346); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return _internal_observable_zip__WEBPACK_IMPORTED_MODULE_50__["zip"]; }); - -/* harmony import */ var _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(219); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "scheduled", function() { return _internal_scheduled_scheduled__WEBPACK_IMPORTED_MODULE_51__["scheduled"]; }); - -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return _internal_observable_empty__WEBPACK_IMPORTED_MODULE_31__["EMPTY"]; }); - -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return _internal_observable_never__WEBPACK_IMPORTED_MODULE_40__["NEVER"]; }); - -/* harmony import */ var _internal_config__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(175); -/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "config", function() { return _internal_config__WEBPACK_IMPORTED_MODULE_52__["config"]; }); - -/** PURE_IMPORTS_START PURE_IMPORTS_END */ +}; +const SIGRTMIN=34; +const SIGRTMAX=64;exports.SIGRTMAX=SIGRTMAX; +//# sourceMappingURL=realtime.js.map +/***/ }), +/* 395 */ +/***/ (function(module, exports, __webpack_require__) { +"use strict"; +const aliases = ['stdin', 'stdout', 'stderr']; +const hasAlias = opts => aliases.some(alias => opts[alias] !== undefined); +const normalizeStdio = opts => { + if (!opts) { + return; + } + const {stdio} = opts; + if (stdio === undefined) { + return aliases.map(alias => opts[alias]); + } + if (hasAlias(opts)) { + throw new Error(`It's not possible to provide \`stdio\` in combination with one of ${aliases.map(alias => `\`${alias}\``).join(', ')}`); + } + if (typeof stdio === 'string') { + return stdio; + } + if (!Array.isArray(stdio)) { + throw new TypeError(`Expected \`stdio\` to be of type \`string\` or \`Array\`, got \`${typeof stdio}\``); + } + const length = Math.max(stdio.length, aliases.length); + return Array.from({length}, (value, index) => stdio[index]); +}; +module.exports = normalizeStdio; +// `ipc` is pushed unless it is already present +module.exports.node = opts => { + const stdio = normalizeStdio(opts); + if (stdio === 'ipc') { + return 'ipc'; + } + if (stdio === undefined || typeof stdio === 'string') { + return [stdio, stdio, stdio, 'ipc']; + } + if (stdio.includes('ipc')) { + return stdio; + } + return [...stdio, 'ipc']; +}; +/***/ }), +/* 396 */ +/***/ (function(module, exports, __webpack_require__) { +"use strict"; +const os = __webpack_require__(11); +const onExit = __webpack_require__(397); +const DEFAULT_FORCE_KILL_TIMEOUT = 1000 * 5; +// Monkey-patches `childProcess.kill()` to add `forceKillAfterTimeout` behavior +const spawnedKill = (kill, signal = 'SIGTERM', options = {}) => { + const killResult = kill(signal); + setKillTimeout(kill, signal, options, killResult); + return killResult; +}; +const setKillTimeout = (kill, signal, options, killResult) => { + if (!shouldForceKill(signal, options, killResult)) { + return; + } + const timeout = getForceKillAfterTimeout(options); + const t = setTimeout(() => { + kill('SIGKILL'); + }, timeout); + // Guarded because there's no `.unref()` when `execa` is used in the renderer + // process in Electron. This cannot be tested since we don't run tests in + // Electron. + // istanbul ignore else + if (t.unref) { + t.unref(); + } +}; +const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => { + return isSigterm(signal) && forceKillAfterTimeout !== false && killResult; +}; +const isSigterm = signal => { + return signal === os.constants.signals.SIGTERM || + (typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM'); +}; +const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => { + if (forceKillAfterTimeout === true) { + return DEFAULT_FORCE_KILL_TIMEOUT; + } + if (!Number.isInteger(forceKillAfterTimeout) || forceKillAfterTimeout < 0) { + throw new TypeError(`Expected the \`forceKillAfterTimeout\` option to be a non-negative integer, got \`${forceKillAfterTimeout}\` (${typeof forceKillAfterTimeout})`); + } + return forceKillAfterTimeout; +}; +// `childProcess.cancel()` +const spawnedCancel = (spawned, context) => { + const killResult = spawned.kill(); + if (killResult) { + context.isCanceled = true; + } +}; +const timeoutKill = (spawned, signal, reject) => { + spawned.kill(signal); + reject(Object.assign(new Error('Timed out'), {timedOut: true, signal})); +}; +// `timeout` option handling +const setupTimeout = (spawned, {timeout, killSignal = 'SIGTERM'}, spawnedPromise) => { + if (timeout === 0 || timeout === undefined) { + return spawnedPromise; + } + if (!Number.isInteger(timeout) || timeout < 0) { + throw new TypeError(`Expected the \`timeout\` option to be a non-negative integer, got \`${timeout}\` (${typeof timeout})`); + } + let timeoutId; + const timeoutPromise = new Promise((resolve, reject) => { + timeoutId = setTimeout(() => { + timeoutKill(spawned, killSignal, reject); + }, timeout); + }); + const safeSpawnedPromise = spawnedPromise.finally(() => { + clearTimeout(timeoutId); + }); + return Promise.race([timeoutPromise, safeSpawnedPromise]); +}; +// `cleanup` option handling +const setExitHandler = async (spawned, {cleanup, detached}, timedPromise) => { + if (!cleanup || detached) { + return timedPromise; + } + const removeExitHandler = onExit(() => { + spawned.kill(); + }); + return timedPromise.finally(() => { + removeExitHandler(); + }); +}; +module.exports = { + spawnedKill, + spawnedCancel, + setupTimeout, + setExitHandler +}; +/***/ }), +/* 397 */ +/***/ (function(module, exports, __webpack_require__) { +// Note: since nyc uses this module to output coverage, any lines +// that are in the direct sync flow of nyc's outputCoverage are +// ignored, since we can never get coverage for them. +var assert = __webpack_require__(30) +var signals = __webpack_require__(398) +var EE = __webpack_require__(399) +/* istanbul ignore if */ +if (typeof EE !== 'function') { + EE = EE.EventEmitter +} +var emitter +if (process.__signal_exit_emitter__) { + emitter = process.__signal_exit_emitter__ +} else { + emitter = process.__signal_exit_emitter__ = new EE() + emitter.count = 0 + emitter.emitted = {} +} +// Because this emitter is a global, we have to check to see if a +// previous version of this library failed to enable infinite listeners. +// I know what you're about to say. But literally everything about +// signal-exit is a compromise with evil. Get used to it. +if (!emitter.infinite) { + emitter.setMaxListeners(Infinity) + emitter.infinite = true +} +module.exports = function (cb, opts) { + assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler') + if (loaded === false) { + load() + } + var ev = 'exit' + if (opts && opts.alwaysLast) { + ev = 'afterexit' + } + var remove = function () { + emitter.removeListener(ev, cb) + if (emitter.listeners('exit').length === 0 && + emitter.listeners('afterexit').length === 0) { + unload() + } + } + emitter.on(ev, cb) -//# sourceMappingURL=index.js.map + return remove +} +module.exports.unload = unload +function unload () { + if (!loaded) { + return + } + loaded = false -/***/ }), -/* 392 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + signals.forEach(function (sig) { + try { + process.removeListener(sig, sigListeners[sig]) + } catch (er) {} + }) + process.emit = originalProcessEmit + process.reallyExit = originalProcessReallyExit + emitter.count -= 1 +} -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrame", function() { return animationFrame; }); -/* harmony import */ var _AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(393); -/* harmony import */ var _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(394); -/** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */ +function emit (event, code, signal) { + if (emitter.emitted[event]) { + return + } + emitter.emitted[event] = true + emitter.emit(event, code, signal) +} +// { : , ... } +var sigListeners = {} +signals.forEach(function (sig) { + sigListeners[sig] = function listener () { + // If there are no other listeners, an exit is coming! + // Simplest way: remove us and then re-send the signal. + // We know that this will kill the process, so we can + // safely emit now. + var listeners = process.listeners(sig) + if (listeners.length === emitter.count) { + unload() + emit('exit', null, sig) + /* istanbul ignore next */ + emit('afterexit', null, sig) + /* istanbul ignore next */ + process.kill(process.pid, sig) + } + } +}) -var animationFrame = /*@__PURE__*/ new _AnimationFrameScheduler__WEBPACK_IMPORTED_MODULE_1__["AnimationFrameScheduler"](_AnimationFrameAction__WEBPACK_IMPORTED_MODULE_0__["AnimationFrameAction"]); -//# sourceMappingURL=animationFrame.js.map +module.exports.signals = function () { + return signals +} +module.exports.load = load -/***/ }), -/* 393 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +var loaded = false -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameAction", function() { return AnimationFrameAction; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(200); -/** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */ +function load () { + if (loaded) { + return + } + loaded = true + // This is the number of onSignalExit's that are in play. + // It's important so that we can count the correct number of + // listeners on signals, and don't wait for the other one to + // handle it instead of us. + emitter.count += 1 -var AnimationFrameAction = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameAction, _super); - function AnimationFrameAction(scheduler, work) { - var _this = _super.call(this, scheduler, work) || this; - _this.scheduler = scheduler; - _this.work = work; - return _this; + signals = signals.filter(function (sig) { + try { + process.on(sig, sigListeners[sig]) + return true + } catch (er) { + return false } - AnimationFrameAction.prototype.requestAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; - } - if (delay !== null && delay > 0) { - return _super.prototype.requestAsyncId.call(this, scheduler, id, delay); - } - scheduler.actions.push(this); - return scheduler.scheduled || (scheduler.scheduled = requestAnimationFrame(function () { return scheduler.flush(null); })); - }; - AnimationFrameAction.prototype.recycleAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; - } - if ((delay !== null && delay > 0) || (delay === null && this.delay > 0)) { - return _super.prototype.recycleAsyncId.call(this, scheduler, id, delay); - } - if (scheduler.actions.length === 0) { - cancelAnimationFrame(id); - scheduler.scheduled = undefined; - } - return undefined; - }; - return AnimationFrameAction; -}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"])); - -//# sourceMappingURL=AnimationFrameAction.js.map - - -/***/ }), -/* 394 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + }) -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AnimationFrameScheduler", function() { return AnimationFrameScheduler; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(202); -/** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ + process.emit = processEmit + process.reallyExit = processReallyExit +} +var originalProcessReallyExit = process.reallyExit +function processReallyExit (code) { + process.exitCode = code || 0 + emit('exit', process.exitCode, null) + /* istanbul ignore next */ + emit('afterexit', process.exitCode, null) + /* istanbul ignore next */ + originalProcessReallyExit.call(process, process.exitCode) +} -var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](AnimationFrameScheduler, _super); - function AnimationFrameScheduler() { - return _super !== null && _super.apply(this, arguments) || this; +var originalProcessEmit = process.emit +function processEmit (ev, arg) { + if (ev === 'exit') { + if (arg !== undefined) { + process.exitCode = arg } - AnimationFrameScheduler.prototype.flush = function (action) { - this.active = true; - this.scheduled = undefined; - var actions = this.actions; - var error; - var index = -1; - var count = actions.length; - action = action || actions.shift(); - do { - if (error = action.execute(action.state, action.delay)) { - break; - } - } while (++index < count && (action = actions.shift())); - this.active = false; - if (error) { - while (++index < count && (action = actions.shift())) { - action.unsubscribe(); - } - throw error; - } - }; - return AnimationFrameScheduler; -}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_1__["AsyncScheduler"])); - -//# sourceMappingURL=AnimationFrameScheduler.js.map + var ret = originalProcessEmit.apply(this, arguments) + emit('exit', process.exitCode, null) + /* istanbul ignore next */ + emit('afterexit', process.exitCode, null) + return ret + } else { + return originalProcessEmit.apply(this, arguments) + } +} /***/ }), -/* 395 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return VirtualTimeScheduler; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return VirtualAction; }); -/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(36); -/* harmony import */ var _AsyncAction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(200); -/* harmony import */ var _AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(202); -/** PURE_IMPORTS_START tslib,_AsyncAction,_AsyncScheduler PURE_IMPORTS_END */ - - +/* 398 */ +/***/ (function(module, exports) { -var VirtualTimeScheduler = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualTimeScheduler, _super); - function VirtualTimeScheduler(SchedulerAction, maxFrames) { - if (SchedulerAction === void 0) { - SchedulerAction = VirtualAction; - } - if (maxFrames === void 0) { - maxFrames = Number.POSITIVE_INFINITY; - } - var _this = _super.call(this, SchedulerAction, function () { return _this.frame; }) || this; - _this.maxFrames = maxFrames; - _this.frame = 0; - _this.index = -1; - return _this; - } - VirtualTimeScheduler.prototype.flush = function () { - var _a = this, actions = _a.actions, maxFrames = _a.maxFrames; - var error, action; - while ((action = actions[0]) && action.delay <= maxFrames) { - actions.shift(); - this.frame = action.delay; - if (error = action.execute(action.state, action.delay)) { - break; - } - } - if (error) { - while (action = actions.shift()) { - action.unsubscribe(); - } - throw error; - } - }; - VirtualTimeScheduler.frameTimeFactor = 10; - return VirtualTimeScheduler; -}(_AsyncScheduler__WEBPACK_IMPORTED_MODULE_2__["AsyncScheduler"])); +// This is not the set of all possible signals. +// +// It IS, however, the set of all signals that trigger +// an exit on either Linux or BSD systems. Linux is a +// superset of the signal names supported on BSD, and +// the unknown signals just fail to register, so we can +// catch that easily enough. +// +// Don't bother with SIGKILL. It's uncatchable, which +// means that we can't fire any callbacks anyway. +// +// If a user does happen to register a handler on a non- +// fatal signal like SIGWINCH or something, and then +// exit, it'll end up firing `process.emit('exit')`, so +// the handler will be fired anyway. +// +// SIGBUS, SIGFPE, SIGSEGV and SIGILL, when not raised +// artificially, inherently leave the process in a +// state from which it is not safe to try and enter JS +// listeners. +module.exports = [ + 'SIGABRT', + 'SIGALRM', + 'SIGHUP', + 'SIGINT', + 'SIGTERM' +] -var VirtualAction = /*@__PURE__*/ (function (_super) { - tslib__WEBPACK_IMPORTED_MODULE_0__["__extends"](VirtualAction, _super); - function VirtualAction(scheduler, work, index) { - if (index === void 0) { - index = scheduler.index += 1; - } - var _this = _super.call(this, scheduler, work) || this; - _this.scheduler = scheduler; - _this.work = work; - _this.index = index; - _this.active = true; - _this.index = scheduler.index = index; - return _this; - } - VirtualAction.prototype.schedule = function (state, delay) { - if (delay === void 0) { - delay = 0; - } - if (!this.id) { - return _super.prototype.schedule.call(this, state, delay); - } - this.active = false; - var action = new VirtualAction(this.scheduler, this.work); - this.add(action); - return action.schedule(state, delay); - }; - VirtualAction.prototype.requestAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; - } - this.delay = scheduler.frame + delay; - var actions = scheduler.actions; - actions.push(this); - actions.sort(VirtualAction.sortActions); - return true; - }; - VirtualAction.prototype.recycleAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; - } - return undefined; - }; - VirtualAction.prototype._execute = function (state, delay) { - if (this.active === true) { - return _super.prototype._execute.call(this, state, delay); - } - }; - VirtualAction.sortActions = function (a, b) { - if (a.delay === b.delay) { - if (a.index === b.index) { - return 0; - } - else if (a.index > b.index) { - return 1; - } - else { - return -1; - } - } - else if (a.delay > b.delay) { - return 1; - } - else { - return -1; - } - }; - return VirtualAction; -}(_AsyncAction__WEBPACK_IMPORTED_MODULE_1__["AsyncAction"])); +if (process.platform !== 'win32') { + module.exports.push( + 'SIGVTALRM', + 'SIGXCPU', + 'SIGXFSZ', + 'SIGUSR2', + 'SIGTRAP', + 'SIGSYS', + 'SIGQUIT', + 'SIGIOT' + // should detect profiler and enable/disable accordingly. + // see #21 + // 'SIGPROF' + ) +} -//# sourceMappingURL=VirtualTimeScheduler.js.map +if (process.platform === 'linux') { + module.exports.push( + 'SIGIO', + 'SIGPOLL', + 'SIGPWR', + 'SIGSTKFLT', + 'SIGUNUSED' + ) +} /***/ }), -/* 396 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return isObservable; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ - -function isObservable(obj) { - return !!obj && (obj instanceof _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"] || (typeof obj.lift === 'function' && typeof obj.subscribe === 'function')); -} -//# sourceMappingURL=isObservable.js.map +/* 399 */ +/***/ (function(module, exports) { +module.exports = require("events"); /***/ }), -/* 397 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* 400 */ +/***/ (function(module, exports, __webpack_require__) { "use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return bindCallback; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231); -/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(194); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(178); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(206); -/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isArray,_util_isScheduler PURE_IMPORTS_END */ - - - +const isStream = __webpack_require__(401); +const getStream = __webpack_require__(402); +const mergeStream = __webpack_require__(408); +// `input` option +const handleInput = (spawned, input) => { + // Checking for stdin is workaround for https://github.com/nodejs/node/issues/26852 + // TODO: Remove `|| spawned.stdin === undefined` once we drop support for Node.js <=12.2.0 + if (input === undefined || spawned.stdin === undefined) { + return; + } -function bindCallback(callbackFunc, resultSelector, scheduler) { - if (resultSelector) { - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_5__["isScheduler"])(resultSelector)) { - scheduler = resultSelector; - } - else { - return function () { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - return bindCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_4__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); - }; - } - } - return function () { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var context = this; - var subject; - var params = { - context: context, - subject: subject, - callbackFunc: callbackFunc, - scheduler: scheduler, - }; - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - if (!scheduler) { - if (!subject) { - subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"](); - var handler = function () { - var innerArgs = []; - for (var _i = 0; _i < arguments.length; _i++) { - innerArgs[_i] = arguments[_i]; - } - subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs); - subject.complete(); - }; - try { - callbackFunc.apply(context, args.concat([handler])); - } - catch (err) { - if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) { - subject.error(err); - } - else { - console.warn(err); - } - } - } - return subject.subscribe(subscriber); - } - else { - var state = { - args: args, subscriber: subscriber, params: params, - }; - return scheduler.schedule(dispatch, 0, state); - } - }); - }; -} -function dispatch(state) { - var _this = this; - var self = this; - var args = state.args, subscriber = state.subscriber, params = state.params; - var callbackFunc = params.callbackFunc, context = params.context, scheduler = params.scheduler; - var subject = params.subject; - if (!subject) { - subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"](); - var handler = function () { - var innerArgs = []; - for (var _i = 0; _i < arguments.length; _i++) { - innerArgs[_i] = arguments[_i]; - } - var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs; - _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject })); - }; - try { - callbackFunc.apply(context, args.concat([handler])); - } - catch (err) { - subject.error(err); - } - } - this.add(subject.subscribe(subscriber)); -} -function dispatchNext(state) { - var value = state.value, subject = state.subject; - subject.next(value); - subject.complete(); -} -function dispatchError(state) { - var err = state.err, subject = state.subject; - subject.error(err); -} -//# sourceMappingURL=bindCallback.js.map + if (isStream(input)) { + input.pipe(spawned.stdin); + } else { + spawned.stdin.end(input); + } +}; +// `all` interleaves `stdout` and `stderr` +const makeAllStream = (spawned, {all}) => { + if (!all || (!spawned.stdout && !spawned.stderr)) { + return; + } -/***/ }), -/* 398 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + const mixed = mergeStream(); -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return bindNodeCallback; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(295); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231); -/* harmony import */ var _util_canReportError__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(194); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(206); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(178); -/** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_canReportError,_util_isScheduler,_util_isArray PURE_IMPORTS_END */ + if (spawned.stdout) { + mixed.add(spawned.stdout); + } + if (spawned.stderr) { + mixed.add(spawned.stderr); + } + return mixed; +}; +// On failure, `result.stdout|stderr|all` should contain the currently buffered stream +const getBufferedData = async (stream, streamPromise) => { + if (!stream) { + return; + } + stream.destroy(); + try { + return await streamPromise; + } catch (error) { + return error.bufferedData; + } +}; + +const getStreamPromise = (stream, {encoding, buffer, maxBuffer}) => { + if (!stream || !buffer) { + return; + } + + if (encoding) { + return getStream(stream, {encoding, maxBuffer}); + } + + return getStream.buffer(stream, {maxBuffer}); +}; + +// Retrieve result of child process: exit code, signal, error, streams (stdout/stderr/all) +const getSpawnedResult = async ({stdout, stderr, all}, {encoding, buffer, maxBuffer}, processDone) => { + const stdoutPromise = getStreamPromise(stdout, {encoding, buffer, maxBuffer}); + const stderrPromise = getStreamPromise(stderr, {encoding, buffer, maxBuffer}); + const allPromise = getStreamPromise(all, {encoding, buffer, maxBuffer: maxBuffer * 2}); + + try { + return await Promise.all([processDone, stdoutPromise, stderrPromise, allPromise]); + } catch (error) { + return Promise.all([ + {error, signal: error.signal, timedOut: error.timedOut}, + getBufferedData(stdout, stdoutPromise), + getBufferedData(stderr, stderrPromise), + getBufferedData(all, allPromise) + ]); + } +}; + +const validateInputSync = ({input}) => { + if (isStream(input)) { + throw new TypeError('The `input` option cannot be a stream in sync mode'); + } +}; + +module.exports = { + handleInput, + makeAllStream, + getSpawnedResult, + validateInputSync +}; -function bindNodeCallback(callbackFunc, resultSelector, scheduler) { - if (resultSelector) { - if (Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_4__["isScheduler"])(resultSelector)) { - scheduler = resultSelector; - } - else { - return function () { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - return bindNodeCallback(callbackFunc, scheduler).apply(void 0, args).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_5__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); - }; - } - } - return function () { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var params = { - subject: undefined, - args: args, - callbackFunc: callbackFunc, - scheduler: scheduler, - context: this, - }; - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var context = params.context; - var subject = params.subject; - if (!scheduler) { - if (!subject) { - subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"](); - var handler = function () { - var innerArgs = []; - for (var _i = 0; _i < arguments.length; _i++) { - innerArgs[_i] = arguments[_i]; - } - var err = innerArgs.shift(); - if (err) { - subject.error(err); - return; - } - subject.next(innerArgs.length <= 1 ? innerArgs[0] : innerArgs); - subject.complete(); - }; - try { - callbackFunc.apply(context, args.concat([handler])); - } - catch (err) { - if (Object(_util_canReportError__WEBPACK_IMPORTED_MODULE_3__["canReportError"])(subject)) { - subject.error(err); - } - else { - console.warn(err); - } - } - } - return subject.subscribe(subscriber); - } - else { - return scheduler.schedule(dispatch, 0, { params: params, subscriber: subscriber, context: context }); - } - }); - }; -} -function dispatch(state) { - var _this = this; - var params = state.params, subscriber = state.subscriber, context = state.context; - var callbackFunc = params.callbackFunc, args = params.args, scheduler = params.scheduler; - var subject = params.subject; - if (!subject) { - subject = params.subject = new _AsyncSubject__WEBPACK_IMPORTED_MODULE_1__["AsyncSubject"](); - var handler = function () { - var innerArgs = []; - for (var _i = 0; _i < arguments.length; _i++) { - innerArgs[_i] = arguments[_i]; - } - var err = innerArgs.shift(); - if (err) { - _this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject })); - } - else { - var value = innerArgs.length <= 1 ? innerArgs[0] : innerArgs; - _this.add(scheduler.schedule(dispatchNext, 0, { value: value, subject: subject })); - } - }; - try { - callbackFunc.apply(context, args.concat([handler])); - } - catch (err) { - this.add(scheduler.schedule(dispatchError, 0, { err: err, subject: subject })); - } - } - this.add(subject.subscribe(subscriber)); -} -function dispatchNext(arg) { - var value = arg.value, subject = arg.subject; - subject.next(value); - subject.complete(); -} -function dispatchError(arg) { - var err = arg.err, subject = arg.subject; - subject.error(err); -} -//# sourceMappingURL=bindNodeCallback.js.map /***/ }), -/* 399 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* 401 */ +/***/ (function(module, exports, __webpack_require__) { "use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return forkJoin; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(231); -/* harmony import */ var _util_isObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(179); -/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(218); -/** PURE_IMPORTS_START _Observable,_util_isArray,_operators_map,_util_isObject,_from PURE_IMPORTS_END */ +const isStream = stream => + stream !== null && + typeof stream === 'object' && + typeof stream.pipe === 'function'; +isStream.writable = stream => + isStream(stream) && + stream.writable !== false && + typeof stream._write === 'function' && + typeof stream._writableState === 'object'; +isStream.readable = stream => + isStream(stream) && + stream.readable !== false && + typeof stream._read === 'function' && + typeof stream._readableState === 'object'; -function forkJoin() { - var sources = []; - for (var _i = 0; _i < arguments.length; _i++) { - sources[_i] = arguments[_i]; - } - if (sources.length === 1) { - var first_1 = sources[0]; - if (Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(first_1)) { - return forkJoinInternal(first_1, null); - } - if (Object(_util_isObject__WEBPACK_IMPORTED_MODULE_3__["isObject"])(first_1) && Object.getPrototypeOf(first_1) === Object.prototype) { - var keys = Object.keys(first_1); - return forkJoinInternal(keys.map(function (key) { return first_1[key]; }), keys); - } - } - if (typeof sources[sources.length - 1] === 'function') { - var resultSelector_1 = sources.pop(); - sources = (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(sources[0])) ? sources[0] : sources; - return forkJoinInternal(sources, null).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_2__["map"])(function (args) { return resultSelector_1.apply(void 0, args); })); - } - return forkJoinInternal(sources, null); -} -function forkJoinInternal(sources, keys) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var len = sources.length; - if (len === 0) { - subscriber.complete(); - return; - } - var values = new Array(len); - var completed = 0; - var emitted = 0; - var _loop_1 = function (i) { - var source = Object(_from__WEBPACK_IMPORTED_MODULE_4__["from"])(sources[i]); - var hasValue = false; - subscriber.add(source.subscribe({ - next: function (value) { - if (!hasValue) { - hasValue = true; - emitted++; - } - values[i] = value; - }, - error: function (err) { return subscriber.error(err); }, - complete: function () { - completed++; - if (completed === len || !hasValue) { - if (emitted === len) { - subscriber.next(keys ? - keys.reduce(function (result, key, i) { return (result[key] = values[i], result); }, {}) : - values); - } - subscriber.complete(); - } - } - })); - }; - for (var i = 0; i < len; i++) { - _loop_1(i); - } - }); -} -//# sourceMappingURL=forkJoin.js.map +isStream.duplex = stream => + isStream.writable(stream) && + isStream.readable(stream); + +isStream.transform = stream => + isStream.duplex(stream) && + typeof stream._transform === 'function' && + typeof stream._transformState === 'object'; + +module.exports = isStream; /***/ }), -/* 400 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* 402 */ +/***/ (function(module, exports, __webpack_require__) { "use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return fromEvent; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178); -/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(173); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231); -/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */ +const pump = __webpack_require__(403); +const bufferStream = __webpack_require__(407); +class MaxBufferError extends Error { + constructor() { + super('maxBuffer exceeded'); + this.name = 'MaxBufferError'; + } +} +async function getStream(inputStream, options) { + if (!inputStream) { + return Promise.reject(new Error('Expected a stream')); + } -var toString = /*@__PURE__*/ (function () { return Object.prototype.toString; })(); -function fromEvent(target, eventName, options, resultSelector) { - if (Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(options)) { - resultSelector = options; - options = undefined; - } - if (resultSelector) { - return fromEvent(target, eventName, options).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); - } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - function handler(e) { - if (arguments.length > 1) { - subscriber.next(Array.prototype.slice.call(arguments)); - } - else { - subscriber.next(e); - } - } - setupSubscription(target, eventName, handler, subscriber, options); - }); -} -function setupSubscription(sourceObj, eventName, handler, subscriber, options) { - var unsubscribe; - if (isEventTarget(sourceObj)) { - var source_1 = sourceObj; - sourceObj.addEventListener(eventName, handler, options); - unsubscribe = function () { return source_1.removeEventListener(eventName, handler, options); }; - } - else if (isJQueryStyleEventEmitter(sourceObj)) { - var source_2 = sourceObj; - sourceObj.on(eventName, handler); - unsubscribe = function () { return source_2.off(eventName, handler); }; - } - else if (isNodeStyleEventEmitter(sourceObj)) { - var source_3 = sourceObj; - sourceObj.addListener(eventName, handler); - unsubscribe = function () { return source_3.removeListener(eventName, handler); }; - } - else if (sourceObj && sourceObj.length) { - for (var i = 0, len = sourceObj.length; i < len; i++) { - setupSubscription(sourceObj[i], eventName, handler, subscriber, options); - } - } - else { - throw new TypeError('Invalid event target'); - } - subscriber.add(unsubscribe); + options = { + maxBuffer: Infinity, + ...options + }; + + const {maxBuffer} = options; + + let stream; + await new Promise((resolve, reject) => { + const rejectPromise = error => { + if (error) { // A null check + error.bufferedData = stream.getBufferedValue(); + } + + reject(error); + }; + + stream = pump(inputStream, bufferStream(options), error => { + if (error) { + rejectPromise(error); + return; + } + + resolve(); + }); + + stream.on('data', () => { + if (stream.getBufferedLength() > maxBuffer) { + rejectPromise(new MaxBufferError()); + } + }); + }); + + return stream.getBufferedValue(); } -function isNodeStyleEventEmitter(sourceObj) { - return sourceObj && typeof sourceObj.addListener === 'function' && typeof sourceObj.removeListener === 'function'; + +module.exports = getStream; +// TODO: Remove this for the next major release +module.exports.default = getStream; +module.exports.buffer = (stream, options) => getStream(stream, {...options, encoding: 'buffer'}); +module.exports.array = (stream, options) => getStream(stream, {...options, array: true}); +module.exports.MaxBufferError = MaxBufferError; + + +/***/ }), +/* 403 */ +/***/ (function(module, exports, __webpack_require__) { + +var once = __webpack_require__(404) +var eos = __webpack_require__(406) +var fs = __webpack_require__(23) // we only need fs to get the ReadStream and WriteStream prototypes + +var noop = function () {} +var ancient = /^v?\.0/.test(process.version) + +var isFn = function (fn) { + return typeof fn === 'function' } -function isJQueryStyleEventEmitter(sourceObj) { - return sourceObj && typeof sourceObj.on === 'function' && typeof sourceObj.off === 'function'; + +var isFS = function (stream) { + if (!ancient) return false // newer node version do not need to care about fs is a special way + if (!fs) return false // browser + return (stream instanceof (fs.ReadStream || noop) || stream instanceof (fs.WriteStream || noop)) && isFn(stream.close) } -function isEventTarget(sourceObj) { - return sourceObj && typeof sourceObj.addEventListener === 'function' && typeof sourceObj.removeEventListener === 'function'; + +var isRequest = function (stream) { + return stream.setHeader && isFn(stream.abort) } -//# sourceMappingURL=fromEvent.js.map +var destroyer = function (stream, reading, writing, callback) { + callback = once(callback) -/***/ }), -/* 401 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + var closed = false + stream.on('close', function () { + closed = true + }) -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return fromEventPattern; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(178); -/* harmony import */ var _util_isFunction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(173); -/* harmony import */ var _operators_map__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(231); -/** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */ + eos(stream, {readable: reading, writable: writing}, function (err) { + if (err) return callback(err) + closed = true + callback() + }) + var destroyed = false + return function (err) { + if (closed) return + if (destroyed) return + destroyed = true + if (isFS(stream)) return stream.close(noop) // use close for fs streams to avoid fd leaks + if (isRequest(stream)) return stream.abort() // request.destroy just do .end - .abort is what we want + if (isFn(stream.destroy)) return stream.destroy() -function fromEventPattern(addHandler, removeHandler, resultSelector) { - if (resultSelector) { - return fromEventPattern(addHandler, removeHandler).pipe(Object(_operators_map__WEBPACK_IMPORTED_MODULE_3__["map"])(function (args) { return Object(_util_isArray__WEBPACK_IMPORTED_MODULE_1__["isArray"])(args) ? resultSelector.apply(void 0, args) : resultSelector(args); })); - } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var handler = function () { - var e = []; - for (var _i = 0; _i < arguments.length; _i++) { - e[_i] = arguments[_i]; - } - return subscriber.next(e.length === 1 ? e[0] : e); - }; - var retValue; - try { - retValue = addHandler(handler); - } - catch (err) { - subscriber.error(err); - return undefined; - } - if (!Object(_util_isFunction__WEBPACK_IMPORTED_MODULE_2__["isFunction"])(removeHandler)) { - return undefined; - } - return function () { return removeHandler(handler, retValue); }; - }); + callback(err || new Error('stream was destroyed')) + } } -//# sourceMappingURL=fromEventPattern.js.map +var call = function (fn) { + fn() +} -/***/ }), -/* 402 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +var pipe = function (from, to) { + return from.pipe(to) +} -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return generate; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _util_identity__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(232); -/* harmony import */ var _util_isScheduler__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(206); -/** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */ +var pump = function () { + var streams = Array.prototype.slice.call(arguments) + var callback = isFn(streams[streams.length - 1] || noop) && streams.pop() || noop + if (Array.isArray(streams[0])) streams = streams[0] + if (streams.length < 2) throw new Error('pump requires two streams per minimum') + var error + var destroys = streams.map(function (stream, i) { + var reading = i < streams.length - 1 + var writing = i > 0 + return destroyer(stream, reading, writing, function (err) { + if (!error) error = err + if (err) destroys.forEach(call) + if (reading) return + destroys.forEach(call) + callback(error) + }) + }) -function generate(initialStateOrOptions, condition, iterate, resultSelectorOrObservable, scheduler) { - var resultSelector; - var initialState; - if (arguments.length == 1) { - var options = initialStateOrOptions; - initialState = options.initialState; - condition = options.condition; - iterate = options.iterate; - resultSelector = options.resultSelector || _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]; - scheduler = options.scheduler; - } - else if (resultSelectorOrObservable === undefined || Object(_util_isScheduler__WEBPACK_IMPORTED_MODULE_2__["isScheduler"])(resultSelectorOrObservable)) { - initialState = initialStateOrOptions; - resultSelector = _util_identity__WEBPACK_IMPORTED_MODULE_1__["identity"]; - scheduler = resultSelectorOrObservable; - } - else { - initialState = initialStateOrOptions; - resultSelector = resultSelectorOrObservable; - } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var state = initialState; - if (scheduler) { - return scheduler.schedule(dispatch, 0, { - subscriber: subscriber, - iterate: iterate, - condition: condition, - resultSelector: resultSelector, - state: state - }); - } - do { - if (condition) { - var conditionResult = void 0; - try { - conditionResult = condition(state); - } - catch (err) { - subscriber.error(err); - return undefined; - } - if (!conditionResult) { - subscriber.complete(); - break; - } - } - var value = void 0; - try { - value = resultSelector(state); - } - catch (err) { - subscriber.error(err); - return undefined; - } - subscriber.next(value); - if (subscriber.closed) { - break; - } - try { - state = iterate(state); - } - catch (err) { - subscriber.error(err); - return undefined; - } - } while (true); - return undefined; - }); + return streams.reduce(pipe) } -function dispatch(state) { - var subscriber = state.subscriber, condition = state.condition; - if (subscriber.closed) { - return undefined; - } - if (state.needIterate) { - try { - state.state = state.iterate(state.state); - } - catch (err) { - subscriber.error(err); - return undefined; - } - } - else { - state.needIterate = true; - } - if (condition) { - var conditionResult = void 0; - try { - conditionResult = condition(state.state); - } - catch (err) { - subscriber.error(err); - return undefined; - } - if (!conditionResult) { - subscriber.complete(); - return undefined; - } - if (subscriber.closed) { - return undefined; - } - } - var value; - try { - value = state.resultSelector(state.state); - } - catch (err) { - subscriber.error(err); - return undefined; - } - if (subscriber.closed) { - return undefined; - } - subscriber.next(value); - if (subscriber.closed) { - return undefined; - } - return this.schedule(state); + +module.exports = pump + + +/***/ }), +/* 404 */ +/***/ (function(module, exports, __webpack_require__) { + +var wrappy = __webpack_require__(405) +module.exports = wrappy(once) +module.exports.strict = wrappy(onceStrict) + +once.proto = once(function () { + Object.defineProperty(Function.prototype, 'once', { + value: function () { + return once(this) + }, + configurable: true + }) + + Object.defineProperty(Function.prototype, 'onceStrict', { + value: function () { + return onceStrict(this) + }, + configurable: true + }) +}) + +function once (fn) { + var f = function () { + if (f.called) return f.value + f.called = true + return f.value = fn.apply(this, arguments) + } + f.called = false + return f +} + +function onceStrict (fn) { + var f = function () { + if (f.called) + throw new Error(f.onceError) + f.called = true + return f.value = fn.apply(this, arguments) + } + var name = fn.name || 'Function wrapped with `once`' + f.onceError = name + " shouldn't be called more than once" + f.called = false + return f } -//# sourceMappingURL=generate.js.map /***/ }), -/* 403 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* 405 */ +/***/ (function(module, exports) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return iif; }); -/* harmony import */ var _defer__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(333); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(242); -/** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */ +// Returns a wrapper function that returns a wrapped callback +// The wrapper function should do some stuff, and return a +// presumably different callback function. +// This makes sure that own properties are retained, so that +// decorations and such are not lost along the way. +module.exports = wrappy +function wrappy (fn, cb) { + if (fn && cb) return wrappy(fn)(cb) + if (typeof fn !== 'function') + throw new TypeError('need wrapper function') -function iif(condition, trueResult, falseResult) { - if (trueResult === void 0) { - trueResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"]; + Object.keys(fn).forEach(function (k) { + wrapper[k] = fn[k] + }) + + return wrapper + + function wrapper() { + var args = new Array(arguments.length) + for (var i = 0; i < args.length; i++) { + args[i] = arguments[i] } - if (falseResult === void 0) { - falseResult = _empty__WEBPACK_IMPORTED_MODULE_1__["EMPTY"]; + var ret = fn.apply(this, args) + var cb = args[args.length-1] + if (typeof ret === 'function' && ret !== cb) { + Object.keys(cb).forEach(function (k) { + ret[k] = cb[k] + }) } - return Object(_defer__WEBPACK_IMPORTED_MODULE_0__["defer"])(function () { return condition() ? trueResult : falseResult; }); + return ret + } } -//# sourceMappingURL=iif.js.map /***/ }), -/* 404 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* 406 */ +/***/ (function(module, exports, __webpack_require__) { -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return interval; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(199); -/* harmony import */ var _util_isNumeric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(205); -/** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */ +var once = __webpack_require__(404); +var noop = function() {}; +var isRequest = function(stream) { + return stream.setHeader && typeof stream.abort === 'function'; +}; -function interval(period, scheduler) { - if (period === void 0) { - period = 0; - } - if (scheduler === void 0) { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; - } - if (!Object(_util_isNumeric__WEBPACK_IMPORTED_MODULE_2__["isNumeric"])(period) || period < 0) { - period = 0; - } - if (!scheduler || typeof scheduler.schedule !== 'function') { - scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_1__["async"]; - } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - subscriber.add(scheduler.schedule(dispatch, period, { subscriber: subscriber, counter: 0, period: period })); - return subscriber; - }); -} -function dispatch(state) { - var subscriber = state.subscriber, counter = state.counter, period = state.period; - subscriber.next(counter); - this.schedule({ subscriber: subscriber, counter: counter + 1, period: period }, period); -} -//# sourceMappingURL=interval.js.map +var isChildProcess = function(stream) { + return stream.stdio && Array.isArray(stream.stdio) && stream.stdio.length === 3 +}; +var eos = function(stream, opts, callback) { + if (typeof opts === 'function') return eos(stream, null, opts); + if (!opts) opts = {}; -/***/ }), -/* 405 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + callback = once(callback || noop); -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return NEVER; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "never", function() { return never; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _util_noop__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(197); -/** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */ + var ws = stream._writableState; + var rs = stream._readableState; + var readable = opts.readable || (opts.readable !== false && stream.readable); + var writable = opts.writable || (opts.writable !== false && stream.writable); + var onlegacyfinish = function() { + if (!stream.writable) onfinish(); + }; -var NEVER = /*@__PURE__*/ new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](_util_noop__WEBPACK_IMPORTED_MODULE_1__["noop"]); -function never() { - return NEVER; -} -//# sourceMappingURL=never.js.map + var onfinish = function() { + writable = false; + if (!readable) callback.call(stream); + }; + + var onend = function() { + readable = false; + if (!writable) callback.call(stream); + }; + var onexit = function(exitCode) { + callback.call(stream, exitCode ? new Error('exited with error code: ' + exitCode) : null); + }; -/***/ }), -/* 406 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + var onerror = function(err) { + callback.call(stream, err); + }; -"use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return onErrorResumeNext; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218); -/* harmony import */ var _util_isArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(178); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(242); -/** PURE_IMPORTS_START _Observable,_from,_util_isArray,_empty PURE_IMPORTS_END */ + var onclose = function() { + if (readable && !(rs && rs.ended)) return callback.call(stream, new Error('premature close')); + if (writable && !(ws && ws.ended)) return callback.call(stream, new Error('premature close')); + }; + + var onrequest = function() { + stream.req.on('finish', onfinish); + }; + if (isRequest(stream)) { + stream.on('complete', onfinish); + stream.on('abort', onclose); + if (stream.req) onrequest(); + else stream.on('request', onrequest); + } else if (writable && !ws) { // legacy streams + stream.on('end', onlegacyfinish); + stream.on('close', onlegacyfinish); + } + if (isChildProcess(stream)) stream.on('exit', onexit); + stream.on('end', onend); + stream.on('finish', onfinish); + if (opts.error !== false) stream.on('error', onerror); + stream.on('close', onclose); -function onErrorResumeNext() { - var sources = []; - for (var _i = 0; _i < arguments.length; _i++) { - sources[_i] = arguments[_i]; - } - if (sources.length === 0) { - return _empty__WEBPACK_IMPORTED_MODULE_3__["EMPTY"]; - } - var first = sources[0], remainder = sources.slice(1); - if (sources.length === 1 && Object(_util_isArray__WEBPACK_IMPORTED_MODULE_2__["isArray"])(first)) { - return onErrorResumeNext.apply(void 0, first); - } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var subNext = function () { return subscriber.add(onErrorResumeNext.apply(void 0, remainder).subscribe(subscriber)); }; - return Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(first).subscribe({ - next: function (value) { subscriber.next(value); }, - error: subNext, - complete: subNext, - }); - }); -} -//# sourceMappingURL=onErrorResumeNext.js.map + return function() { + stream.removeListener('complete', onfinish); + stream.removeListener('abort', onclose); + stream.removeListener('request', onrequest); + if (stream.req) stream.req.removeListener('finish', onfinish); + stream.removeListener('end', onlegacyfinish); + stream.removeListener('close', onlegacyfinish); + stream.removeListener('finish', onfinish); + stream.removeListener('exit', onexit); + stream.removeListener('end', onend); + stream.removeListener('error', onerror); + stream.removeListener('close', onclose); + }; +}; + +module.exports = eos; /***/ }), /* 407 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/***/ (function(module, exports, __webpack_require__) { "use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return pairs; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dispatch", function() { return dispatch; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _Subscription__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(177); -/** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */ +const {PassThrough: PassThroughStream} = __webpack_require__(27); -function pairs(obj, scheduler) { - if (!scheduler) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var keys = Object.keys(obj); - for (var i = 0; i < keys.length && !subscriber.closed; i++) { - var key = keys[i]; - if (obj.hasOwnProperty(key)) { - subscriber.next([key, obj[key]]); - } - } - subscriber.complete(); - }); - } - else { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var keys = Object.keys(obj); - var subscription = new _Subscription__WEBPACK_IMPORTED_MODULE_1__["Subscription"](); - subscription.add(scheduler.schedule(dispatch, 0, { keys: keys, index: 0, subscriber: subscriber, subscription: subscription, obj: obj })); - return subscription; - }); - } -} -function dispatch(state) { - var keys = state.keys, index = state.index, subscriber = state.subscriber, subscription = state.subscription, obj = state.obj; - if (!subscriber.closed) { - if (index < keys.length) { - var key = keys[index]; - subscriber.next([key, obj[key]]); - subscription.add(this.schedule({ keys: keys, index: index + 1, subscriber: subscriber, subscription: subscription, obj: obj })); - } - else { - subscriber.complete(); - } - } -} -//# sourceMappingURL=pairs.js.map +module.exports = options => { + options = {...options}; + + const {array} = options; + let {encoding} = options; + const isBuffer = encoding === 'buffer'; + let objectMode = false; + + if (array) { + objectMode = !(encoding || isBuffer); + } else { + encoding = encoding || 'utf8'; + } + + if (isBuffer) { + encoding = null; + } + + const stream = new PassThroughStream({objectMode}); + + if (encoding) { + stream.setEncoding(encoding); + } + + let length = 0; + const chunks = []; + + stream.on('data', chunk => { + chunks.push(chunk); + + if (objectMode) { + length = chunks.length; + } else { + length += chunk.length; + } + }); + + stream.getBufferedValue = () => { + if (array) { + return chunks; + } + + return isBuffer ? Buffer.concat(chunks, length) : chunks.join(''); + }; + + stream.getBufferedLength = () => length; + + return stream; +}; /***/ }), /* 408 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/***/ (function(module, exports, __webpack_require__) { "use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return partition; }); -/* harmony import */ var _util_not__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(289); -/* harmony import */ var _util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(184); -/* harmony import */ var _operators_filter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(251); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(193); -/** PURE_IMPORTS_START _util_not,_util_subscribeTo,_operators_filter,_Observable PURE_IMPORTS_END */ +const { PassThrough } = __webpack_require__(27); + +module.exports = function (/*streams...*/) { + var sources = [] + var output = new PassThrough({objectMode: true}) + output.setMaxListeners(0) -function partition(source, predicate, thisArg) { - return [ - Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(predicate, thisArg)(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source))), - Object(_operators_filter__WEBPACK_IMPORTED_MODULE_2__["filter"])(Object(_util_not__WEBPACK_IMPORTED_MODULE_0__["not"])(predicate, thisArg))(new _Observable__WEBPACK_IMPORTED_MODULE_3__["Observable"](Object(_util_subscribeTo__WEBPACK_IMPORTED_MODULE_1__["subscribeTo"])(source))) - ]; + output.add = add + output.isEmpty = isEmpty + + output.on('unpipe', remove) + + Array.prototype.slice.call(arguments).forEach(add) + + return output + + function add (source) { + if (Array.isArray(source)) { + source.forEach(add) + return this + } + + sources.push(source); + source.once('end', remove.bind(null, source)) + source.once('error', output.emit.bind(output, 'error')) + source.pipe(output, {end: false}) + return this + } + + function isEmpty () { + return sources.length == 0; + } + + function remove (source) { + sources = sources.filter(function (it) { return it !== source }) + if (!sources.length && output.readable) { output.end() } + } } -//# sourceMappingURL=partition.js.map /***/ }), /* 409 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/***/ (function(module, exports, __webpack_require__) { "use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "range", function() { return range; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dispatch", function() { return dispatch; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ -function range(start, count, scheduler) { - if (start === void 0) { - start = 0; - } - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - if (count === undefined) { - count = start; - start = 0; - } - var index = 0; - var current = start; - if (scheduler) { - return scheduler.schedule(dispatch, 0, { - index: index, count: count, start: start, subscriber: subscriber - }); - } - else { - do { - if (index++ >= count) { - subscriber.complete(); - break; - } - subscriber.next(current++); - if (subscriber.closed) { - break; - } - } while (true); - } - return undefined; - }); -} -function dispatch(state) { - var start = state.start, index = state.index, count = state.count, subscriber = state.subscriber; - if (index >= count) { - subscriber.complete(); - return; - } - subscriber.next(start); - if (subscriber.closed) { - return; - } - state.index = index + 1; - state.start = start + 1; - this.schedule(state); -} -//# sourceMappingURL=range.js.map +const mergePromiseProperty = (spawned, promise, property) => { + // Starting the main `promise` is deferred to avoid consuming streams + const value = typeof promise === 'function' ? + (...args) => promise()[property](...args) : + promise[property].bind(promise); + + Object.defineProperty(spawned, property, { + value, + writable: true, + enumerable: false, + configurable: true + }); +}; + +// The return value is a mixin of `childProcess` and `Promise` +const mergePromise = (spawned, promise) => { + mergePromiseProperty(spawned, promise, 'then'); + mergePromiseProperty(spawned, promise, 'catch'); + mergePromiseProperty(spawned, promise, 'finally'); + return spawned; +}; + +// Use promises instead of `child_process` events +const getSpawnedPromise = spawned => { + return new Promise((resolve, reject) => { + spawned.on('exit', (exitCode, signal) => { + resolve({exitCode, signal}); + }); + + spawned.on('error', error => { + reject(error); + }); + + if (spawned.stdin) { + spawned.stdin.on('error', error => { + reject(error); + }); + } + }); +}; + +module.exports = { + mergePromise, + getSpawnedPromise +}; + /***/ }), /* 410 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/***/ (function(module, exports, __webpack_require__) { "use strict"; -__webpack_require__.r(__webpack_exports__); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "using", function() { return using; }); -/* harmony import */ var _Observable__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(193); -/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(218); -/* harmony import */ var _empty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(242); -/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */ +const SPACES_REGEXP = / +/g; +const joinCommand = (file, args = []) => { + if (!Array.isArray(args)) { + return file; + } -function using(resourceFactory, observableFactory) { - return new _Observable__WEBPACK_IMPORTED_MODULE_0__["Observable"](function (subscriber) { - var resource; - try { - resource = resourceFactory(); - } - catch (err) { - subscriber.error(err); - return undefined; - } - var result; - try { - result = observableFactory(resource); - } - catch (err) { - subscriber.error(err); - return undefined; - } - var source = result ? Object(_from__WEBPACK_IMPORTED_MODULE_1__["from"])(result) : _empty__WEBPACK_IMPORTED_MODULE_2__["EMPTY"]; - var subscription = source.subscribe(subscriber); - return function () { - subscription.unsubscribe(); - if (resource) { - resource.unsubscribe(); - } - }; - }); -} -//# sourceMappingURL=using.js.map + return [file, ...args].join(' '); +}; + +// Allow spaces to be escaped by a backslash if not meant as a delimiter +const handleEscaping = (tokens, token, index) => { + if (index === 0) { + return [token]; + } + + const previousToken = tokens[tokens.length - 1]; + + if (previousToken.endsWith('\\')) { + return [...tokens.slice(0, -1), `${previousToken.slice(0, -1)} ${token}`]; + } + + return [...tokens, token]; +}; + +// Handle `execa.command()` +const parseCommand = command => { + return command + .trim() + .split(SPACES_REGEXP) + .reduce(handleEscaping, []); +}; + +module.exports = { + joinCommand, + parseCommand +}; /***/ }), @@ -36357,7 +36363,7 @@ function using(resourceFactory, observableFactory) { "use strict"; -var childProcess = __webpack_require__(352); +var childProcess = __webpack_require__(372); var spawn = childProcess.spawn; var exec = childProcess.exec; @@ -36501,8 +36507,8 @@ function buildProcessTree (parentPid, tree, pidsToProcess, spawnChildProcessesLi */ Object.defineProperty(exports, "__esModule", { value: true }); const tslib_1 = __webpack_require__(36); -const Rx = tslib_1.__importStar(__webpack_require__(391)); -const operators_1 = __webpack_require__(169); +const Rx = tslib_1.__importStar(__webpack_require__(169)); +const operators_1 = __webpack_require__(270); const SEP = /\r?\n/; const observe_readable_1 = __webpack_require__(413); /** @@ -36570,8 +36576,8 @@ exports.observeLines = observeLines; */ Object.defineProperty(exports, "__esModule", { value: true }); const tslib_1 = __webpack_require__(36); -const Rx = tslib_1.__importStar(__webpack_require__(391)); -const operators_1 = __webpack_require__(169); +const Rx = tslib_1.__importStar(__webpack_require__(169)); +const operators_1 = __webpack_require__(270); /** * Produces an Observable from a ReadableSteam that: * - completes on the first "end" event @@ -36645,7 +36651,7 @@ exports.ToolingLogCollectingWriter = tooling_log_collecting_writer_1.ToolingLogC */ Object.defineProperty(exports, "__esModule", { value: true }); const tslib_1 = __webpack_require__(36); -const Rx = tslib_1.__importStar(__webpack_require__(391)); +const Rx = tslib_1.__importStar(__webpack_require__(169)); const tooling_log_text_writer_1 = __webpack_require__(416); class ToolingLog { constructor(writerConfig) { @@ -39453,7 +39459,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const tslib_1 = __webpack_require__(36); const util_1 = __webpack_require__(29); // @ts-ignore @types are outdated and module is super simple -const exit_hook_1 = tslib_1.__importDefault(__webpack_require__(348)); +const exit_hook_1 = tslib_1.__importDefault(__webpack_require__(368)); const tooling_log_1 = __webpack_require__(414); const fail_1 = __webpack_require__(446); const flags_1 = __webpack_require__(447); @@ -44319,7 +44325,7 @@ var rp = __webpack_require__(504) var minimatch = __webpack_require__(506) var Minimatch = minimatch.Minimatch var inherits = __webpack_require__(510) -var EE = __webpack_require__(379).EventEmitter +var EE = __webpack_require__(399).EventEmitter var path = __webpack_require__(16) var assert = __webpack_require__(30) var isAbsolute = __webpack_require__(512) @@ -44334,7 +44340,7 @@ var util = __webpack_require__(29) var childrenIgnored = common.childrenIgnored var isIgnored = common.isIgnored -var once = __webpack_require__(384) +var once = __webpack_require__(404) function glob (pattern, options, cb) { if (typeof options === 'function') cb = options, options = {} @@ -47483,9 +47489,9 @@ function childrenIgnored (self, path) { /* 515 */ /***/ (function(module, exports, __webpack_require__) { -var wrappy = __webpack_require__(385) +var wrappy = __webpack_require__(405) var reqs = Object.create(null) -var once = __webpack_require__(384) +var once = __webpack_require__(404) module.exports = wrappy(inflight) @@ -53616,7 +53622,7 @@ module.exports._cleanupOnExit = cleanupOnExit var fs = __webpack_require__(552) var MurmurHash3 = __webpack_require__(556) -var onExit = __webpack_require__(377) +var onExit = __webpack_require__(397) var path = __webpack_require__(16) var activeFiles = {} @@ -55267,7 +55273,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "spawnStreaming", function() { return spawnStreaming; }); /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_0__); -/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(351); +/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(371); /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(565); /* harmony import */ var log_symbols__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(log_symbols__WEBPACK_IMPORTED_MODULE_2__); @@ -56988,7 +56994,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29); /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(351); +/* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(371); /* harmony import */ var execa__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(execa__WEBPACK_IMPORTED_MODULE_3__); /* harmony import */ var _yarn_lock__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(582); /* @@ -59784,7 +59790,7 @@ exports.f = __webpack_require__(33) ? Object.defineProperty : function definePro /* 54 */ /***/ (function(module, exports) { -module.exports = __webpack_require__(379); +module.exports = __webpack_require__(399); /***/ }), /* 55 */ @@ -68254,7 +68260,7 @@ var rp = __webpack_require__(504) var minimatch = __webpack_require__(506) var Minimatch = minimatch.Minimatch var inherits = __webpack_require__(592) -var EE = __webpack_require__(379).EventEmitter +var EE = __webpack_require__(399).EventEmitter var path = __webpack_require__(16) var assert = __webpack_require__(30) var isAbsolute = __webpack_require__(512) @@ -68269,7 +68275,7 @@ var util = __webpack_require__(29) var childrenIgnored = common.childrenIgnored var isIgnored = common.isIgnored -var once = __webpack_require__(384) +var once = __webpack_require__(404) function glob (pattern, options, cb) { if (typeof options === 'function') cb = options, options = {} @@ -74366,7 +74372,7 @@ function callSuccessCallback(callback, entries) { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const events_1 = __webpack_require__(379); +const events_1 = __webpack_require__(399); const fsScandir = __webpack_require__(635); const fastq = __webpack_require__(644); const common = __webpack_require__(646); @@ -78154,7 +78160,7 @@ exports.toggle = (force, stream) => { "use strict"; const onetime = __webpack_require__(682); -const signalExit = __webpack_require__(377); +const signalExit = __webpack_require__(397); module.exports = onetime(() => { signalExit(() => { @@ -78402,8 +78408,8 @@ const WatchCommand = { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "waitUntilWatchIsReady", function() { return waitUntilWatchIsReady; }); -/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(391); -/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(169); +/* harmony import */ var rxjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(169); +/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(270); /* * Licensed to Elasticsearch B.V. under one or more contributor * license agreements. See the NOTICE file distributed with @@ -79570,7 +79576,7 @@ async function copyToBuild(project, kibanaRoot, buildRoot) { "use strict"; -const EventEmitter = __webpack_require__(379); +const EventEmitter = __webpack_require__(399); const path = __webpack_require__(16); const os = __webpack_require__(11); const pAll = __webpack_require__(708); @@ -80107,7 +80113,7 @@ var rp = __webpack_require__(504) var minimatch = __webpack_require__(506) var Minimatch = minimatch.Minimatch var inherits = __webpack_require__(715) -var EE = __webpack_require__(379).EventEmitter +var EE = __webpack_require__(399).EventEmitter var path = __webpack_require__(16) var assert = __webpack_require__(30) var isAbsolute = __webpack_require__(512) @@ -80122,7 +80128,7 @@ var util = __webpack_require__(29) var childrenIgnored = common.childrenIgnored var isIgnored = common.isIgnored -var once = __webpack_require__(384) +var once = __webpack_require__(404) function glob (pattern, options, cb) { if (typeof options === 'function') cb = options, options = {} @@ -104781,7 +104787,7 @@ function readdirSync (dir, options, internalOptions) { const Readable = __webpack_require__(27).Readable; -const EventEmitter = __webpack_require__(379).EventEmitter; +const EventEmitter = __webpack_require__(399).EventEmitter; const path = __webpack_require__(16); const normalizeOptions = __webpack_require__(894); const stat = __webpack_require__(896); @@ -110030,7 +110036,7 @@ function coerce (version, options) { "use strict"; -const EventEmitter = __webpack_require__(379); +const EventEmitter = __webpack_require__(399); const written = new WeakMap(); From 4966b2695a811e83c45513f7ab3761b30d29d63b Mon Sep 17 00:00:00 2001 From: Candace Park <56409205+parkiino@users.noreply.github.com> Date: Mon, 11 May 2020 14:56:05 -0400 Subject: [PATCH 46/65] Fixes #65661 failing endpoint host details policy response test (#66060) * Fixed failing endpoint host details policy response test #65661 --- .../plugins/endpoint/common/generate_data.ts | 24 ++++++++++++------- .../endpoint/view/hosts/index.test.tsx | 24 +++++++++++++++---- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/x-pack/plugins/endpoint/common/generate_data.ts b/x-pack/plugins/endpoint/common/generate_data.ts index ff8add42a50851..1d5ea46dcc08b0 100644 --- a/x-pack/plugins/endpoint/common/generate_data.ts +++ b/x-pack/plugins/endpoint/common/generate_data.ts @@ -536,8 +536,14 @@ export class EndpointDocGenerator { /** * Generates a Host Policy response message */ - public generatePolicyResponse(ts = new Date().getTime()): HostPolicyResponse { + public generatePolicyResponse( + ts = new Date().getTime(), + allStatus?: HostPolicyResponseActionStatus + ): HostPolicyResponse { const policyVersion = this.seededUUIDv4(); + const status = () => { + return allStatus || this.randomHostPolicyResponseActionStatus(); + }; return { '@timestamp': ts, agent: { @@ -588,7 +594,7 @@ export class EndpointDocGenerator { status: HostPolicyResponseActionStatus.success, }, detect_image_load_events: { - message: 'Successfuly started image load event reporting', + message: 'Successfully started image load event reporting', status: HostPolicyResponseActionStatus.success, }, detect_process_events: { @@ -596,15 +602,15 @@ export class EndpointDocGenerator { status: HostPolicyResponseActionStatus.success, }, download_global_artifacts: { - message: 'Failed to download EXE model', + message: 'Succesfully downloaded global artifacts', status: HostPolicyResponseActionStatus.success, }, load_config: { - message: 'successfully parsed configuration', + message: 'Successfully parsed configuration', status: HostPolicyResponseActionStatus.success, }, load_malware_model: { - message: 'Error deserializing EXE model; no valid malware model installed', + message: 'Successfully loaded malware model', status: HostPolicyResponseActionStatus.success, }, read_elasticsearch_config: { @@ -649,19 +655,19 @@ export class EndpointDocGenerator { configurations: { events: { concerned_actions: ['download_model'], - status: this.randomHostPolicyResponseActionStatus(), + status: status(), }, logging: { concerned_actions: this.randomHostPolicyResponseActions(), - status: this.randomHostPolicyResponseActionStatus(), + status: status(), }, malware: { concerned_actions: this.randomHostPolicyResponseActions(), - status: this.randomHostPolicyResponseActionStatus(), + status: status(), }, streaming: { concerned_actions: this.randomHostPolicyResponseActions(), - status: this.randomHostPolicyResponseActionStatus(), + status: status(), }, }, }, diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/index.test.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/index.test.tsx index aaeff935b32b45..808429ccef0c58 100644 --- a/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/index.test.tsx +++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/index.test.tsx @@ -328,8 +328,20 @@ describe('when on the hosts page', () => { expect(statusHealth).not.toBeNull(); expect(message).not.toBeNull(); }); - it('should not show any numbered badges if all actions are succesful', () => { - return renderResult.findByTestId('hostDetailsPolicyResponseAttentionBadge').catch(e => { + it('should not show any numbered badges if all actions are successful', () => { + const policyResponse = docGenerator.generatePolicyResponse( + new Date().getTime(), + HostPolicyResponseActionStatus.success + ); + reactTestingLibrary.act(() => { + store.dispatch({ + type: 'serverReturnedHostPolicyResponse', + payload: { + policy_response: policyResponse, + }, + }); + }); + return renderResult.findAllByTestId('hostDetailsPolicyResponseAttentionBadge').catch(e => { expect(e).not.toBeNull(); }); }); @@ -337,14 +349,18 @@ describe('when on the hosts page', () => { reactTestingLibrary.act(() => { dispatchServerReturnedHostPolicyResponse(HostPolicyResponseActionStatus.failure); }); - const attentionBadge = renderResult.findByTestId('hostDetailsPolicyResponseAttentionBadge'); + const attentionBadge = renderResult.findAllByTestId( + 'hostDetailsPolicyResponseAttentionBadge' + ); expect(attentionBadge).not.toBeNull(); }); it('should show a numbered badge if at least one action has a warning', () => { reactTestingLibrary.act(() => { dispatchServerReturnedHostPolicyResponse(HostPolicyResponseActionStatus.warning); }); - const attentionBadge = renderResult.findByTestId('hostDetailsPolicyResponseAttentionBadge'); + const attentionBadge = renderResult.findAllByTestId( + 'hostDetailsPolicyResponseAttentionBadge' + ); expect(attentionBadge).not.toBeNull(); }); it('should include the back to details link', async () => { From e2d945ff0bacd7cd950b823e0a935429e04cb768 Mon Sep 17 00:00:00 2001 From: Zacqary Adam Xeper Date: Mon, 11 May 2020 14:04:57 -0500 Subject: [PATCH 47/65] [Metrics UI] Add framework for recovery messaging to metric threshold alerts (non-functional) (#65339) --- .../lib/alerting/metric_threshold/messages.ts | 45 ++++++++++++++- .../metric_threshold_executor.test.ts | 55 ++++++++++++++++++- 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/messages.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/messages.ts index 4878574e39d16f..4add0ee9af5d3c 100644 --- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/messages.ts +++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/messages.ts @@ -24,7 +24,6 @@ export const stateToAlertMessage = { [AlertStates.ERROR]: i18n.translate('xpack.infra.metrics.alerting.threshold.errorState', { defaultMessage: 'ERROR', }), - // TODO: Implement recovered message state [AlertStates.OK]: i18n.translate('xpack.infra.metrics.alerting.threshold.okState', { defaultMessage: 'OK [Recovered]', }), @@ -62,6 +61,33 @@ const comparatorToI18n = (comparator: Comparator, threshold: number[], currentVa } }; +const recoveredComparatorToI18n = ( + comparator: Comparator, + threshold: number[], + currentValue: number +) => { + const belowText = i18n.translate('xpack.infra.metrics.alerting.threshold.belowRecovery', { + defaultMessage: 'below', + }); + const aboveText = i18n.translate('xpack.infra.metrics.alerting.threshold.aboveRecovery', { + defaultMessage: 'above', + }); + switch (comparator) { + case Comparator.BETWEEN: + return currentValue < threshold[0] ? belowText : aboveText; + case Comparator.OUTSIDE_RANGE: + return i18n.translate('xpack.infra.metrics.alerting.threshold.betweenRecovery', { + defaultMessage: 'between', + }); + case Comparator.GT: + case Comparator.GT_OR_EQ: + return belowText; + case Comparator.LT: + case Comparator.LT_OR_EQ: + return aboveText; + } +}; + const thresholdToI18n = ([a, b]: number[]) => { if (typeof b === 'undefined') return a; return i18n.translate('xpack.infra.metrics.alerting.threshold.thresholdRange', { @@ -87,6 +113,23 @@ export const buildFiredAlertReason: (alertResult: { }, }); +export const buildRecoveredAlertReason: (alertResult: { + metric: string; + comparator: Comparator; + threshold: number[]; + currentValue: number; +}) => string = ({ metric, comparator, threshold, currentValue }) => + i18n.translate('xpack.infra.metrics.alerting.threshold.recoveredAlertReason', { + defaultMessage: + '{metric} is now {comparator} a threshold of {threshold} (current value is {currentValue})', + values: { + metric, + comparator: recoveredComparatorToI18n(comparator, threshold, currentValue), + threshold: thresholdToI18n(threshold), + currentValue, + }, + }); + export const buildNoDataAlertReason: (alertResult: { metric: string; timeSize: number; diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts index ed5efc1473953f..19efc88e216cab 100644 --- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts +++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts @@ -20,6 +20,8 @@ interface AlertTestInstance { state: any; } +let persistAlertInstances = false; // eslint-disable-line + describe('The metric threshold alert type', () => { describe('querying the entire infrastructure', () => { const instanceID = 'test-*'; @@ -313,6 +315,50 @@ describe('The metric threshold alert type', () => { expect(getState(instanceID).alertState).toBe(AlertStates.NO_DATA); }); }); + + // describe('querying a metric that later recovers', () => { + // const instanceID = 'test-*'; + // const execute = (threshold: number[]) => + // executor({ + // services, + // params: { + // criteria: [ + // { + // ...baseCriterion, + // comparator: Comparator.GT, + // threshold, + // }, + // ], + // }, + // }); + // beforeAll(() => (persistAlertInstances = true)); + // afterAll(() => (persistAlertInstances = false)); + + // test('sends a recovery alert as soon as the metric recovers', async () => { + // await execute([0.5]); + // expect(mostRecentAction(instanceID).id).toBe(FIRED_ACTIONS.id); + // expect(getState(instanceID).alertState).toBe(AlertStates.ALERT); + // await execute([2]); + // expect(mostRecentAction(instanceID).id).toBe(FIRED_ACTIONS.id); + // expect(getState(instanceID).alertState).toBe(AlertStates.OK); + // }); + // test('does not continue to send a recovery alert if the metric is still OK', async () => { + // await execute([2]); + // expect(mostRecentAction(instanceID)).toBe(undefined); + // expect(getState(instanceID).alertState).toBe(AlertStates.OK); + // await execute([2]); + // expect(mostRecentAction(instanceID)).toBe(undefined); + // expect(getState(instanceID).alertState).toBe(AlertStates.OK); + // }); + // test('sends a recovery alert again once the metric alerts and recovers again', async () => { + // await execute([0.5]); + // expect(mostRecentAction(instanceID).id).toBe(FIRED_ACTIONS.id); + // expect(getState(instanceID).alertState).toBe(AlertStates.ALERT); + // await execute([2]); + // expect(mostRecentAction(instanceID).id).toBe(FIRED_ACTIONS.id); + // expect(getState(instanceID).alertState).toBe(AlertStates.OK); + // }); + // }); }); const createMockStaticConfiguration = (sources: any) => ({ @@ -397,12 +443,19 @@ services.savedObjectsClient.get.mockImplementation(async (type: string, sourceId const alertInstances = new Map(); services.alertInstanceFactory.mockImplementation((instanceID: string) => { - const alertInstance: AlertTestInstance = { + const newAlertInstance: AlertTestInstance = { instance: alertsMock.createAlertInstanceFactory(), actionQueue: [], state: {}, }; + const alertInstance: AlertTestInstance = persistAlertInstances + ? alertInstances.get(instanceID) || newAlertInstance + : newAlertInstance; alertInstances.set(instanceID, alertInstance); + + alertInstance.instance.getState.mockImplementation(() => { + return alertInstance.state; + }); alertInstance.instance.replaceState.mockImplementation((newState: any) => { alertInstance.state = newState; return alertInstance.instance; From f4d27b283876405aaa3713f3907ce3c31a467d66 Mon Sep 17 00:00:00 2001 From: Tim Sullivan Date: Mon, 11 May 2020 12:49:19 -0700 Subject: [PATCH 48/65] [Reporting/Test] Add Functional test for download CSV (#65401) * [Reporting/Test] Add Functional test for download CSV * add todo * add fs.existsSync check to find download * debug * handle timeout * validate toast * different way of getting repo_root --- test/functional/services/find.ts | 2 +- .../apps/dashboard/reporting/download_csv.ts | 68 ++++++++++ .../apps/dashboard/reporting/index.ts | 122 +---------------- .../apps/dashboard/reporting/screenshots.ts | 127 ++++++++++++++++++ .../functional/page_objects/reporting_page.ts | 5 +- 5 files changed, 203 insertions(+), 121 deletions(-) create mode 100644 x-pack/test/functional/apps/dashboard/reporting/download_csv.ts create mode 100644 x-pack/test/functional/apps/dashboard/reporting/screenshots.ts diff --git a/test/functional/services/find.ts b/test/functional/services/find.ts index bdcc5ba95e9fbd..09fc32115f6833 100644 --- a/test/functional/services/find.ts +++ b/test/functional/services/find.ts @@ -198,7 +198,7 @@ export async function FindProvider({ getService }: FtrProviderContext) { if (isDisplayed) { return descendant; } else { - throw new Error('Element is not displayed'); + throw new Error(`Element "${selector}" is not displayed`); } } diff --git a/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts b/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts new file mode 100644 index 00000000000000..b66f9d2baeb365 --- /dev/null +++ b/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { REPO_ROOT } from '@kbn/dev-utils'; +import expect from '@kbn/expect'; +import fs from 'fs'; +import path from 'path'; +import * as Rx from 'rxjs'; +import { filter, first, map, timeout } from 'rxjs/operators'; +import { FtrProviderContext } from '../../../ftr_provider_context'; + +const csvPath = path.resolve(REPO_ROOT, 'target/functional-tests/downloads/Ecommerce Data.csv'); + +export default function({ getService, getPageObjects }: FtrProviderContext) { + const esArchiver = getService('esArchiver'); + const browser = getService('browser'); + const dashboardPanelActions = getService('dashboardPanelActions'); + const log = getService('log'); + const testSubjects = getService('testSubjects'); + const PageObjects = getPageObjects(['reporting', 'common', 'dashboard']); + + describe('Reporting Download CSV', () => { + before('initialize tests', async () => { + log.debug('ReportingPage:initTests'); + await esArchiver.loadIfNeeded('reporting/ecommerce'); + await esArchiver.loadIfNeeded('reporting/ecommerce_kibana'); + await browser.setWindowSize(1600, 850); + }); + + after('clean up archives and previous file download', async () => { + await esArchiver.unload('reporting/ecommerce'); + await esArchiver.unload('reporting/ecommerce_kibana'); + try { + fs.unlinkSync(csvPath); + } catch (e) { + // nothing to worry + } + }); + + it('Downloads a CSV export of a saved search panel', async function() { + await PageObjects.common.navigateToApp('dashboard'); + await PageObjects.dashboard.loadSavedDashboard('Ecom Dashboard'); + const savedSearchPanel = await testSubjects.find('embeddablePanelHeading-EcommerceData'); + await dashboardPanelActions.toggleContextMenu(savedSearchPanel); + + await testSubjects.existOrFail('embeddablePanelAction-downloadCsvReport'); // wait for the full panel to display or else the test runner could click the wrong option! + await testSubjects.click('embeddablePanelAction-downloadCsvReport'); + await testSubjects.existOrFail('csvDownloadStarted'); // validate toast panel + + // check every 100ms for the file to exist in the download dir + // just wait up to 5 seconds + const success$ = Rx.interval(100).pipe( + map(() => fs.existsSync(csvPath)), + filter(value => value === true), + first(), + timeout(5000) + ); + + const fileExists = await success$.toPromise(); + expect(fileExists).to.be(true); + + // no need to validate download contents, API Integration tests do that some different variations + }); + }); +} diff --git a/x-pack/test/functional/apps/dashboard/reporting/index.ts b/x-pack/test/functional/apps/dashboard/reporting/index.ts index 796e15b4e270f4..1dc2a958e3dd51 100644 --- a/x-pack/test/functional/apps/dashboard/reporting/index.ts +++ b/x-pack/test/functional/apps/dashboard/reporting/index.ts @@ -3,125 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ - -import expect from '@kbn/expect'; -import fs from 'fs'; -import path from 'path'; -import { promisify } from 'util'; import { FtrProviderContext } from '../../../ftr_provider_context'; -import { checkIfPngsMatch } from './lib/compare_pngs'; - -const writeFileAsync = promisify(fs.writeFile); -const mkdirAsync = promisify(fs.mkdir); - -const REPORTS_FOLDER = path.resolve(__dirname, 'reports'); - -export default function({ getService, getPageObjects }: FtrProviderContext) { - const esArchiver = getService('esArchiver'); - const browser = getService('browser'); - const log = getService('log'); - const config = getService('config'); - const PageObjects = getPageObjects(['reporting', 'common', 'dashboard']); - - describe('Reporting', () => { - before('initialize tests', async () => { - log.debug('ReportingPage:initTests'); - await esArchiver.loadIfNeeded('reporting/ecommerce'); - await esArchiver.loadIfNeeded('reporting/ecommerce_kibana'); - await browser.setWindowSize(1600, 850); - }); - after('clean up archives', async () => { - await esArchiver.unload('reporting/ecommerce'); - await esArchiver.unload('reporting/ecommerce_kibana'); - }); - - describe('Print PDF button', () => { - it('is not available if new', async () => { - await PageObjects.common.navigateToApp('dashboard'); - await PageObjects.dashboard.clickNewDashboard(); - await PageObjects.reporting.openPdfReportingPanel(); - expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be('true'); - }); - - it('becomes available when saved', async () => { - await PageObjects.dashboard.saveDashboard('My PDF Dashboard'); - await PageObjects.reporting.openPdfReportingPanel(); - expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be(null); - }); - }); - - describe('Print Layout', () => { - it('downloads a PDF file', async function() { - // Generating and then comparing reports can take longer than the default 60s timeout because the comparePngs - // function is taking about 15 seconds per comparison in jenkins. - this.timeout(300000); - await PageObjects.common.navigateToApp('dashboard'); - await PageObjects.dashboard.loadSavedDashboard('Ecom Dashboard'); - await PageObjects.reporting.openPdfReportingPanel(); - await PageObjects.reporting.checkUsePrintLayout(); - await PageObjects.reporting.clickGenerateReportButton(); - - const url = await PageObjects.reporting.getReportURL(60000); - const res = await PageObjects.reporting.getResponse(url); - - expect(res.statusCode).to.equal(200); - expect(res.headers['content-type']).to.equal('application/pdf'); - }); - }); - - describe('Print PNG button', () => { - it('is not available if new', async () => { - await PageObjects.common.navigateToApp('dashboard'); - await PageObjects.dashboard.clickNewDashboard(); - await PageObjects.reporting.openPngReportingPanel(); - expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be('true'); - }); - - it('becomes available when saved', async () => { - await PageObjects.dashboard.saveDashboard('My PNG Dash'); - await PageObjects.reporting.openPngReportingPanel(); - expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be(null); - }); - }); - - describe('Preserve Layout', () => { - it('matches baseline report', async function() { - const writeSessionReport = async (name: string, rawPdf: Buffer, reportExt: string) => { - const sessionDirectory = path.resolve(REPORTS_FOLDER, 'session'); - await mkdirAsync(sessionDirectory, { recursive: true }); - const sessionReportPath = path.resolve(sessionDirectory, `${name}.${reportExt}`); - await writeFileAsync(sessionReportPath, rawPdf); - return sessionReportPath; - }; - const getBaselineReportPath = (fileName: string, reportExt: string) => { - const baselineFolder = path.resolve(REPORTS_FOLDER, 'baseline'); - const fullPath = path.resolve(baselineFolder, `${fileName}.${reportExt}`); - log.debug(`getBaselineReportPath (${fullPath})`); - return fullPath; - }; - - this.timeout(300000); - - await PageObjects.common.navigateToApp('dashboard'); - await PageObjects.dashboard.loadSavedDashboard('Ecom Dashboard'); - await PageObjects.reporting.openPngReportingPanel(); - await PageObjects.reporting.forceSharedItemsContainerSize({ width: 1405 }); - await PageObjects.reporting.clickGenerateReportButton(); - await PageObjects.reporting.removeForceSharedItemsContainerSize(); - - const url = await PageObjects.reporting.getReportURL(60000); - const reportData = await PageObjects.reporting.getRawPdfReportData(url); - const reportFileName = 'dashboard_preserve_layout'; - const sessionReportPath = await writeSessionReport(reportFileName, reportData, 'png'); - const percentSimilar = await checkIfPngsMatch( - sessionReportPath, - getBaselineReportPath(reportFileName, 'png'), - config.get('screenshots.directory'), - log - ); - expect(percentSimilar).to.be.lessThan(0.1); - }); - }); +export default function({ loadTestFile }: FtrProviderContext) { + describe('Reporting', function() { + loadTestFile(require.resolve('./screenshots')); + loadTestFile(require.resolve('./download_csv')); }); } diff --git a/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts b/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts new file mode 100644 index 00000000000000..2cc1686b8c7cae --- /dev/null +++ b/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts @@ -0,0 +1,127 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import fs from 'fs'; +import path from 'path'; +import { promisify } from 'util'; +import { FtrProviderContext } from '../../../ftr_provider_context'; +import { checkIfPngsMatch } from './lib/compare_pngs'; + +const writeFileAsync = promisify(fs.writeFile); +const mkdirAsync = promisify(fs.mkdir); + +const REPORTS_FOLDER = path.resolve(__dirname, 'reports'); + +export default function({ getService, getPageObjects }: FtrProviderContext) { + const esArchiver = getService('esArchiver'); + const browser = getService('browser'); + const log = getService('log'); + const config = getService('config'); + const PageObjects = getPageObjects(['reporting', 'common', 'dashboard']); + + describe('Screenshots', () => { + before('initialize tests', async () => { + log.debug('ReportingPage:initTests'); + await esArchiver.loadIfNeeded('reporting/ecommerce'); + await esArchiver.loadIfNeeded('reporting/ecommerce_kibana'); + await browser.setWindowSize(1600, 850); + }); + after('clean up archives', async () => { + await esArchiver.unload('reporting/ecommerce'); + await esArchiver.unload('reporting/ecommerce_kibana'); + }); + + describe('Print PDF button', () => { + it('is not available if new', async () => { + await PageObjects.common.navigateToApp('dashboard'); + await PageObjects.dashboard.clickNewDashboard(); + await PageObjects.reporting.openPdfReportingPanel(); + expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be('true'); + }); + + it('becomes available when saved', async () => { + await PageObjects.dashboard.saveDashboard('My PDF Dashboard'); + await PageObjects.reporting.openPdfReportingPanel(); + expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be(null); + }); + }); + + describe('Print Layout', () => { + it('downloads a PDF file', async function() { + // Generating and then comparing reports can take longer than the default 60s timeout because the comparePngs + // function is taking about 15 seconds per comparison in jenkins. + this.timeout(300000); + await PageObjects.common.navigateToApp('dashboard'); + await PageObjects.dashboard.loadSavedDashboard('Ecom Dashboard'); + await PageObjects.reporting.openPdfReportingPanel(); + await PageObjects.reporting.checkUsePrintLayout(); + await PageObjects.reporting.clickGenerateReportButton(); + + const url = await PageObjects.reporting.getReportURL(60000); + const res = await PageObjects.reporting.getResponse(url); + + expect(res.statusCode).to.equal(200); + expect(res.headers['content-type']).to.equal('application/pdf'); + }); + }); + + describe('Print PNG button', () => { + it('is not available if new', async () => { + await PageObjects.common.navigateToApp('dashboard'); + await PageObjects.dashboard.clickNewDashboard(); + await PageObjects.reporting.openPngReportingPanel(); + expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be('true'); + }); + + it('becomes available when saved', async () => { + await PageObjects.dashboard.saveDashboard('My PNG Dash'); + await PageObjects.reporting.openPngReportingPanel(); + expect(await PageObjects.reporting.isGenerateReportButtonDisabled()).to.be(null); + }); + }); + + describe('Preserve Layout', () => { + it('matches baseline report', async function() { + const writeSessionReport = async (name: string, rawPdf: Buffer, reportExt: string) => { + const sessionDirectory = path.resolve(REPORTS_FOLDER, 'session'); + await mkdirAsync(sessionDirectory, { recursive: true }); + const sessionReportPath = path.resolve(sessionDirectory, `${name}.${reportExt}`); + await writeFileAsync(sessionReportPath, rawPdf); + return sessionReportPath; + }; + const getBaselineReportPath = (fileName: string, reportExt: string) => { + const baselineFolder = path.resolve(REPORTS_FOLDER, 'baseline'); + const fullPath = path.resolve(baselineFolder, `${fileName}.${reportExt}`); + log.debug(`getBaselineReportPath (${fullPath})`); + return fullPath; + }; + + this.timeout(300000); + + await PageObjects.common.navigateToApp('dashboard'); + await PageObjects.dashboard.loadSavedDashboard('Ecom Dashboard'); + await PageObjects.reporting.openPngReportingPanel(); + await PageObjects.reporting.forceSharedItemsContainerSize({ width: 1405 }); + await PageObjects.reporting.clickGenerateReportButton(); + await PageObjects.reporting.removeForceSharedItemsContainerSize(); + + const url = await PageObjects.reporting.getReportURL(60000); + const reportData = await PageObjects.reporting.getRawPdfReportData(url); + const reportFileName = 'dashboard_preserve_layout'; + const sessionReportPath = await writeSessionReport(reportFileName, reportData, 'png'); + const percentSimilar = await checkIfPngsMatch( + sessionReportPath, + getBaselineReportPath(reportFileName, 'png'), + config.get('screenshots.directory'), + log + ); + + expect(percentSimilar).to.be.lessThan(0.1); + }); + }); + }); +} diff --git a/x-pack/test/functional/page_objects/reporting_page.ts b/x-pack/test/functional/page_objects/reporting_page.ts index 2c20519a8d2140..320171f8c89cdf 100644 --- a/x-pack/test/functional/page_objects/reporting_page.ts +++ b/x-pack/test/functional/page_objects/reporting_page.ts @@ -9,10 +9,11 @@ import { FtrProviderContext } from 'test/functional/ftr_provider_context'; import { parse } from 'url'; export function ReportingPageProvider({ getService, getPageObjects }: FtrProviderContext) { - const retry = getService('retry'); + const browser = getService('browser'); const log = getService('log'); + const retry = getService('retry'); const testSubjects = getService('testSubjects'); - const browser = getService('browser'); + const PageObjects = getPageObjects(['common', 'security' as any, 'share', 'timePicker']); // FIXME: Security PageObject is not Typescript class ReportingPage { From 207df60d6cb4447dee58e88adb174d93f44debf9 Mon Sep 17 00:00:00 2001 From: Ryland Herrick Date: Mon, 11 May 2020 14:55:12 -0500 Subject: [PATCH 49/65] [SIEM][Detections] Restrict ML rule modification to ML Admins (#65583) * Move common ML types and functions into siem/common These revolve around capabilities/permissions checks which were previously only used on the client. Now that we have need to make similar checks on the server, we can/should move these up to be shared. * Use ML's Capabilities type in lieu of our own There was already some drift between these types preventing our helpers from being used with the ML services; this will prevent further drift. * Add authorization helpers for ML Some of this responsibility will move to ML services in the near future, but for now we still need to restrict SIEM users from performing certain actions. * Use mlAuthz on our import rule route The tests were a little tricky because the use of spyOn/clear was preventing (rather, clearing the mocks from) the use of jest.mock(). I found a workaround with mockRestore(), which was easy to verify because the mock would throw an error if it wasn't removed, and we'd import multiple rules if a default mock was used. The threading through of ML can go away if/when ML adds their services to the request handler context. * Add mlAuthz checks to remaining rule routes * Remove validateLicenseForRuleType This is now unused and redundant with the mlAuthz module. * Fix failing tests These were missed when the helpers were moved to common/, but are also unneeded. * Cleanup: fixing type errors * Clean up some types from ML A recent upstream refactor in ML added top-level exports; this uses them where possible. * Refactor mlAuthz to defer authz validation until validator is called This prevents us from unnecessarily calling ml services if e.g. we're not dealing with an ML rule. This also adds a failing test for the next-to-be-implemented feature: cashing the async validation for subsequent validator calls. * Cache validation promise The purpose of the `buildMlAuthz` function is to store state (request, license, ml). Since `validateMlAuthz` should be idempotent for the duration of this object's lifecycle, we should cache the result the first time we call it; this is effectively memoization since the arguments do not change. * Make our result caching more explicit Extracts a caching helper function. * Add additional unit tests around some edge cases This is the best form of documentation, thanks Frank! * Remove redundant test setup * Empty messages are invalid If we somehow generate an empty message string, the validation should fail as we were attempting to assign _something_ as a failure message. * Fix validity logic valid: message !== null was the opposite of what I wanted; a validation is valid if it has no message (i.e. it's undefined). * Prevent patching of ML rules by non-ML admins This required refactoring patchRules to accept the rule to be patched, so that we can check its attributes before performing the update. * Fix our update_prepackaged_rules route patchRules no longer does the fetch; we need to perform this ourselves. * Fix update_prepackaged_rules tests This notably synchronizes the entirety of the updates, as our tests were failing due to the asynchronous nature of the updates. * Remove id and ruleId from patchRules parameters Instead of fetching the rule within patchRules, we now pass it in. Co-authored-by: Elastic Machine --- .../empty_ml_capabilities.ts | 15 +- .../has_ml_admin_permissions.test.ts | 2 +- .../has_ml_admin_permissions.ts | 12 +- .../has_ml_user_permissions.test.ts | 2 +- .../has_ml_user_permissions.ts | 4 +- .../helpers.test.ts} | 2 +- .../helpers.ts} | 2 +- .../ml/anomaly/use_anomalies_table_data.ts | 2 +- .../components/ml/api/get_ml_capabilities.ts | 7 +- .../permissions/ml_capabilities_provider.tsx | 6 +- .../ml/tables/anomalies_host_table.tsx | 2 +- .../ml/tables/anomalies_network_table.tsx | 2 +- .../siem/public/components/ml/types.ts | 47 +--- .../components/ml_popover/helpers.test.tsx | 4 - .../ml_popover/hooks/use_siem_jobs.tsx | 2 +- .../ml_popover/jobs_table/job_switch.tsx | 2 +- .../components/ml_popover/ml_popover.test.tsx | 4 - .../components/ml_popover/ml_popover.tsx | 2 +- .../page/hosts/host_overview/index.tsx | 2 +- .../page/network/ip_overview/index.tsx | 2 +- .../detection_engine/rules/all/columns.tsx | 2 +- .../detection_engine/rules/all/index.tsx | 2 +- .../description_step/ml_job_description.tsx | 2 +- .../rules/components/ml_job_select/index.tsx | 2 +- .../components/select_rule_type/index.tsx | 2 +- .../components/step_define_rule/index.tsx | 4 +- .../components/step_define_rule/schema.tsx | 2 +- .../detection_engine/rules/create/helpers.ts | 2 +- .../detection_engine/rules/details/index.tsx | 2 +- .../pages/detection_engine/rules/helpers.tsx | 2 +- .../siem/public/pages/hosts/details/index.tsx | 2 +- .../plugins/siem/public/pages/hosts/hosts.tsx | 2 +- .../siem/public/pages/network/index.tsx | 2 +- .../rules/create_rules_bulk_route.test.ts | 20 +- .../routes/rules/create_rules_bulk_route.ts | 10 +- .../routes/rules/create_rules_route.test.ts | 21 +- .../routes/rules/create_rules_route.ts | 16 +- .../routes/rules/import_rules_route.test.ts | 41 ++- .../routes/rules/import_rules_route.ts | 18 +- .../rules/patch_rules_bulk_route.test.ts | 46 ++- .../routes/rules/patch_rules_bulk_route.ts | 26 +- .../routes/rules/patch_rules_route.test.ts | 43 ++- .../routes/rules/patch_rules_route.ts | 32 ++- .../rules/update_rules_bulk_route.test.ts | 22 +- .../routes/rules/update_rules_bulk_route.ts | 15 +- .../routes/rules/update_rules_route.test.ts | 24 +- .../routes/rules/update_rules_route.ts | 17 +- .../schemas/response/check_type_dependents.ts | 2 +- .../lib/detection_engine/routes/utils.test.ts | 34 --- .../lib/detection_engine/routes/utils.ts | 30 -- .../rules/patch_rules.test.ts | 26 +- .../lib/detection_engine/rules/patch_rules.ts | 5 +- .../lib/detection_engine/rules/types.ts | 6 +- .../rules/update_prepacked_rules.test.ts | 17 +- .../rules/update_prepacked_rules.ts | 120 ++++---- .../signals/signal_rule_alert_type.ts | 2 +- .../server/lib/machine_learning/authz.test.ts | 265 ++++++++++++++++++ .../siem/server/lib/machine_learning/authz.ts | 120 ++++++++ .../server/lib/machine_learning/cache.test.ts | 41 +++ .../siem/server/lib/machine_learning/cache.ts | 24 ++ .../siem/server/lib/machine_learning/mocks.ts | 32 +++ .../lib/machine_learning/validation.test.ts | 36 +++ .../server/lib/machine_learning/validation.ts | 33 +++ x-pack/plugins/siem/server/plugin.ts | 3 +- x-pack/plugins/siem/server/routes/index.ts | 17 +- 65 files changed, 935 insertions(+), 380 deletions(-) rename x-pack/plugins/siem/{public/components/ml => common/machine_learning}/empty_ml_capabilities.ts (76%) rename x-pack/plugins/siem/{public/components/ml/permissions => common/machine_learning}/has_ml_admin_permissions.test.ts (96%) rename x-pack/plugins/siem/{public/components/ml/permissions => common/machine_learning}/has_ml_admin_permissions.ts (79%) rename x-pack/plugins/siem/{public/components/ml/permissions => common/machine_learning}/has_ml_user_permissions.test.ts (94%) rename x-pack/plugins/siem/{public/components/ml/permissions => common/machine_learning}/has_ml_user_permissions.ts (81%) rename x-pack/plugins/siem/common/{detection_engine/ml_helpers.test.ts => machine_learning/helpers.test.ts} (96%) rename x-pack/plugins/siem/common/{detection_engine/ml_helpers.ts => machine_learning/helpers.ts} (95%) create mode 100644 x-pack/plugins/siem/server/lib/machine_learning/authz.test.ts create mode 100644 x-pack/plugins/siem/server/lib/machine_learning/authz.ts create mode 100644 x-pack/plugins/siem/server/lib/machine_learning/cache.test.ts create mode 100644 x-pack/plugins/siem/server/lib/machine_learning/cache.ts create mode 100644 x-pack/plugins/siem/server/lib/machine_learning/mocks.ts create mode 100644 x-pack/plugins/siem/server/lib/machine_learning/validation.test.ts create mode 100644 x-pack/plugins/siem/server/lib/machine_learning/validation.ts diff --git a/x-pack/plugins/siem/public/components/ml/empty_ml_capabilities.ts b/x-pack/plugins/siem/common/machine_learning/empty_ml_capabilities.ts similarity index 76% rename from x-pack/plugins/siem/public/components/ml/empty_ml_capabilities.ts rename to x-pack/plugins/siem/common/machine_learning/empty_ml_capabilities.ts index 9c8610ccd628c5..0d6a13c108b04f 100644 --- a/x-pack/plugins/siem/public/components/ml/empty_ml_capabilities.ts +++ b/x-pack/plugins/siem/common/machine_learning/empty_ml_capabilities.ts @@ -4,10 +4,14 @@ * you may not use this file except in compliance with the Elastic License. */ -import { MlCapabilities } from './types'; +import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities'; -export const emptyMlCapabilities: MlCapabilities = { +export const emptyMlCapabilities: MlCapabilitiesResponse = { capabilities: { + canAccessML: false, + canGetAnnotations: false, + canCreateAnnotation: false, + canDeleteAnnotation: false, canGetJobs: false, canCreateJob: false, canDeleteJob: false, @@ -26,11 +30,8 @@ export const emptyMlCapabilities: MlCapabilities = { canCreateFilter: false, canDeleteFilter: false, canFindFileStructure: false, - canGetDataFrame: false, - canDeleteDataFrame: false, - canPreviewDataFrame: false, - canCreateDataFrame: false, - canStartStopDataFrame: false, + canCreateDatafeed: false, + canDeleteDatafeed: false, canGetDataFrameAnalytics: false, canDeleteDataFrameAnalytics: false, canCreateDataFrameAnalytics: false, diff --git a/x-pack/plugins/siem/public/components/ml/permissions/has_ml_admin_permissions.test.ts b/x-pack/plugins/siem/common/machine_learning/has_ml_admin_permissions.test.ts similarity index 96% rename from x-pack/plugins/siem/public/components/ml/permissions/has_ml_admin_permissions.test.ts rename to x-pack/plugins/siem/common/machine_learning/has_ml_admin_permissions.test.ts index ee237b42bede99..9824ce1232cbe4 100644 --- a/x-pack/plugins/siem/public/components/ml/permissions/has_ml_admin_permissions.test.ts +++ b/x-pack/plugins/siem/common/machine_learning/has_ml_admin_permissions.test.ts @@ -6,7 +6,7 @@ import { hasMlAdminPermissions } from './has_ml_admin_permissions'; import { cloneDeep } from 'lodash/fp'; -import { emptyMlCapabilities } from '../empty_ml_capabilities'; +import { emptyMlCapabilities } from './empty_ml_capabilities'; describe('has_ml_admin_permissions', () => { let mlCapabilities = cloneDeep(emptyMlCapabilities); diff --git a/x-pack/plugins/siem/public/components/ml/permissions/has_ml_admin_permissions.ts b/x-pack/plugins/siem/common/machine_learning/has_ml_admin_permissions.ts similarity index 79% rename from x-pack/plugins/siem/public/components/ml/permissions/has_ml_admin_permissions.ts rename to x-pack/plugins/siem/common/machine_learning/has_ml_admin_permissions.ts index 6fe142cf8e5832..106e9aabbc711d 100644 --- a/x-pack/plugins/siem/public/components/ml/permissions/has_ml_admin_permissions.ts +++ b/x-pack/plugins/siem/common/machine_learning/has_ml_admin_permissions.ts @@ -4,21 +4,21 @@ * you may not use this file except in compliance with the Elastic License. */ -import { MlCapabilities } from '../types'; +import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities'; -export const hasMlAdminPermissions = (capabilities: MlCapabilities): boolean => +export const hasMlAdminPermissions = (capabilities: MlCapabilitiesResponse): boolean => getDataFeedPermissions(capabilities) && getJobPermissions(capabilities) && getFilterPermissions(capabilities) && getCalendarPermissions(capabilities); -const getDataFeedPermissions = ({ capabilities }: MlCapabilities): boolean => +const getDataFeedPermissions = ({ capabilities }: MlCapabilitiesResponse): boolean => capabilities.canGetDatafeeds && capabilities.canStartStopDatafeed && capabilities.canUpdateDatafeed && capabilities.canPreviewDatafeed; -const getJobPermissions = ({ capabilities }: MlCapabilities): boolean => +const getJobPermissions = ({ capabilities }: MlCapabilitiesResponse): boolean => capabilities.canCreateJob && capabilities.canGetJobs && capabilities.canUpdateJob && @@ -27,8 +27,8 @@ const getJobPermissions = ({ capabilities }: MlCapabilities): boolean => capabilities.canCloseJob && capabilities.canForecastJob; -const getFilterPermissions = ({ capabilities }: MlCapabilities) => +const getFilterPermissions = ({ capabilities }: MlCapabilitiesResponse) => capabilities.canGetFilters && capabilities.canCreateFilter && capabilities.canDeleteFilter; -const getCalendarPermissions = ({ capabilities }: MlCapabilities) => +const getCalendarPermissions = ({ capabilities }: MlCapabilitiesResponse) => capabilities.canCreateCalendar && capabilities.canGetCalendars && capabilities.canDeleteCalendar; diff --git a/x-pack/plugins/siem/public/components/ml/permissions/has_ml_user_permissions.test.ts b/x-pack/plugins/siem/common/machine_learning/has_ml_user_permissions.test.ts similarity index 94% rename from x-pack/plugins/siem/public/components/ml/permissions/has_ml_user_permissions.test.ts rename to x-pack/plugins/siem/common/machine_learning/has_ml_user_permissions.test.ts index e3804055f2abbd..4d58cda81d71c5 100644 --- a/x-pack/plugins/siem/public/components/ml/permissions/has_ml_user_permissions.test.ts +++ b/x-pack/plugins/siem/common/machine_learning/has_ml_user_permissions.test.ts @@ -6,7 +6,7 @@ import { cloneDeep } from 'lodash/fp'; import { hasMlUserPermissions } from './has_ml_user_permissions'; -import { emptyMlCapabilities } from '../empty_ml_capabilities'; +import { emptyMlCapabilities } from './empty_ml_capabilities'; describe('has_ml_user_permissions', () => { let mlCapabilities = cloneDeep(emptyMlCapabilities); diff --git a/x-pack/plugins/siem/public/components/ml/permissions/has_ml_user_permissions.ts b/x-pack/plugins/siem/common/machine_learning/has_ml_user_permissions.ts similarity index 81% rename from x-pack/plugins/siem/public/components/ml/permissions/has_ml_user_permissions.ts rename to x-pack/plugins/siem/common/machine_learning/has_ml_user_permissions.ts index 2d55b7d74f93c5..dd746e4737bbc8 100644 --- a/x-pack/plugins/siem/public/components/ml/permissions/has_ml_user_permissions.ts +++ b/x-pack/plugins/siem/common/machine_learning/has_ml_user_permissions.ts @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { MlCapabilities } from '../types'; +import { MlCapabilitiesResponse } from '../../../ml/common/types/capabilities'; -export const hasMlUserPermissions = (capabilities: MlCapabilities): boolean => +export const hasMlUserPermissions = (capabilities: MlCapabilitiesResponse): boolean => capabilities.capabilities.canGetJobs && capabilities.capabilities.canGetDatafeeds && capabilities.capabilities.canGetCalendars; diff --git a/x-pack/plugins/siem/common/detection_engine/ml_helpers.test.ts b/x-pack/plugins/siem/common/machine_learning/helpers.test.ts similarity index 96% rename from x-pack/plugins/siem/common/detection_engine/ml_helpers.test.ts rename to x-pack/plugins/siem/common/machine_learning/helpers.test.ts index ba93b2e4b8a0d8..ce343f75933dcf 100644 --- a/x-pack/plugins/siem/common/detection_engine/ml_helpers.test.ts +++ b/x-pack/plugins/siem/common/machine_learning/helpers.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { isJobStarted, isJobLoading, isJobFailed } from './ml_helpers'; +import { isJobStarted, isJobLoading, isJobFailed } from './helpers'; describe('isJobStarted', () => { test('returns false if only jobState is enabled', () => { diff --git a/x-pack/plugins/siem/common/detection_engine/ml_helpers.ts b/x-pack/plugins/siem/common/machine_learning/helpers.ts similarity index 95% rename from x-pack/plugins/siem/common/detection_engine/ml_helpers.ts rename to x-pack/plugins/siem/common/machine_learning/helpers.ts index e4158d08d448dc..fe3eb79a6f6109 100644 --- a/x-pack/plugins/siem/common/detection_engine/ml_helpers.ts +++ b/x-pack/plugins/siem/common/machine_learning/helpers.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { RuleType } from './types'; +import { RuleType } from '../detection_engine/types'; // Based on ML Job/Datafeed States from x-pack/legacy/plugins/ml/common/constants/states.js const enabledStates = ['started', 'opened']; diff --git a/x-pack/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts b/x-pack/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts index d64bd3a64e941f..67efda67a20a32 100644 --- a/x-pack/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts +++ b/x-pack/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts @@ -9,7 +9,7 @@ import { useState, useEffect } from 'react'; import { DEFAULT_ANOMALY_SCORE } from '../../../../common/constants'; import { anomaliesTableData } from '../api/anomalies_table_data'; import { InfluencerInput, Anomalies, CriteriaFields } from '../types'; -import { hasMlUserPermissions } from '../permissions/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; import { useSiemJobs } from '../../ml_popover/hooks/use_siem_jobs'; import { useMlCapabilities } from '../../ml_popover/hooks/use_ml_capabilities'; import { useStateToaster, errorToToaster } from '../../toasters'; diff --git a/x-pack/plugins/siem/public/components/ml/api/get_ml_capabilities.ts b/x-pack/plugins/siem/public/components/ml/api/get_ml_capabilities.ts index e69abc1a86e0eb..e6a792e779b0cc 100644 --- a/x-pack/plugins/siem/public/components/ml/api/get_ml_capabilities.ts +++ b/x-pack/plugins/siem/public/components/ml/api/get_ml_capabilities.ts @@ -4,8 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { InfluencerInput, MlCapabilities } from '../types'; +import { MlCapabilitiesResponse } from '../../../../../ml/public'; import { KibanaServices } from '../../../lib/kibana'; +import { InfluencerInput } from '../types'; export interface Body { jobIds: string[]; @@ -20,8 +21,8 @@ export interface Body { maxExamples: number; } -export const getMlCapabilities = async (signal: AbortSignal): Promise => { - return KibanaServices.get().http.fetch('/api/ml/ml_capabilities', { +export const getMlCapabilities = async (signal: AbortSignal): Promise => { + return KibanaServices.get().http.fetch('/api/ml/ml_capabilities', { method: 'GET', asSystemRequest: true, signal, diff --git a/x-pack/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx b/x-pack/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx index eee44abb44204d..9326c53b6064da 100644 --- a/x-pack/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx +++ b/x-pack/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx @@ -6,14 +6,14 @@ import React, { useState, useEffect } from 'react'; -import { MlCapabilities } from '../types'; +import { MlCapabilitiesResponse } from '../../../../../ml/public'; +import { emptyMlCapabilities } from '../../../../common/machine_learning/empty_ml_capabilities'; import { getMlCapabilities } from '../api/get_ml_capabilities'; -import { emptyMlCapabilities } from '../empty_ml_capabilities'; import { errorToToaster, useStateToaster } from '../../toasters'; import * as i18n from './translations'; -interface MlCapabilitiesProvider extends MlCapabilities { +interface MlCapabilitiesProvider extends MlCapabilitiesResponse { capabilitiesFetched: boolean; } diff --git a/x-pack/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx b/x-pack/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx index 16bde076ef7636..3272042732dff5 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx +++ b/x-pack/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx @@ -9,13 +9,13 @@ import React from 'react'; import { useAnomaliesTableData } from '../anomaly/use_anomalies_table_data'; import { HeaderSection } from '../../header_section'; +import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; import * as i18n from './translations'; import { getAnomaliesHostTableColumnsCurated } from './get_anomalies_host_table_columns'; import { convertAnomaliesToHosts } from './convert_anomalies_to_hosts'; import { Loader } from '../../loader'; import { getIntervalFromAnomalies } from '../anomaly/get_interval_from_anomalies'; import { AnomaliesHostTableProps } from '../types'; -import { hasMlUserPermissions } from '../permissions/has_ml_user_permissions'; import { useMlCapabilities } from '../../ml_popover/hooks/use_ml_capabilities'; import { BasicTable } from './basic_table'; import { hostEquality } from './host_equality'; diff --git a/x-pack/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx b/x-pack/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx index bba6355f0b8b97..cc3b1196f8432f 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx +++ b/x-pack/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx @@ -8,13 +8,13 @@ import React from 'react'; import { useAnomaliesTableData } from '../anomaly/use_anomalies_table_data'; import { HeaderSection } from '../../header_section'; +import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; import * as i18n from './translations'; import { convertAnomaliesToNetwork } from './convert_anomalies_to_network'; import { Loader } from '../../loader'; import { AnomaliesNetworkTableProps } from '../types'; import { getAnomaliesNetworkTableColumnsCurated } from './get_anomalies_network_table_columns'; import { useMlCapabilities } from '../../ml_popover/hooks/use_ml_capabilities'; -import { hasMlUserPermissions } from '../permissions/has_ml_user_permissions'; import { BasicTable } from './basic_table'; import { networkEquality } from './network_equality'; import { getCriteriaFromNetworkType } from '../criteria/get_criteria_from_network_type'; diff --git a/x-pack/plugins/siem/public/components/ml/types.ts b/x-pack/plugins/siem/public/components/ml/types.ts index 953fb9f761ea86..f70c7d3eb034c8 100644 --- a/x-pack/plugins/siem/public/components/ml/types.ts +++ b/x-pack/plugins/siem/public/components/ml/types.ts @@ -4,15 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ +import { Influencer } from '../../../../ml/public'; + import { HostsType } from '../../store/hosts/model'; import { NetworkType } from '../../store/network/model'; import { FlowTarget } from '../../graphql/types'; -export interface Influencer { - influencer_field_name: string; - influencer_field_values: string[]; -} - export interface Source { job_id: string; result_type: string; @@ -35,11 +32,6 @@ export interface Source { influencers: Influencer[]; } -export interface Influencer { - influencer_field_name: string; - influencer_field_values: string[]; -} - export interface CriteriaFields { fieldName: string; fieldValue: string; @@ -100,41 +92,6 @@ export type AnomaliesNetworkTableProps = HostOrNetworkProps & { flowTarget?: FlowTarget; }; -export interface MlCapabilities { - capabilities: { - canGetJobs: boolean; - canCreateJob: boolean; - canDeleteJob: boolean; - canOpenJob: boolean; - canCloseJob: boolean; - canForecastJob: boolean; - canGetDatafeeds: boolean; - canStartStopDatafeed: boolean; - canUpdateJob: boolean; - canUpdateDatafeed: boolean; - canPreviewDatafeed: boolean; - canGetCalendars: boolean; - canCreateCalendar: boolean; - canDeleteCalendar: boolean; - canGetFilters: boolean; - canCreateFilter: boolean; - canDeleteFilter: boolean; - canFindFileStructure: boolean; - canGetDataFrame: boolean; - canDeleteDataFrame: boolean; - canPreviewDataFrame: boolean; - canCreateDataFrame: boolean; - canStartStopDataFrame: boolean; - canGetDataFrameAnalytics: boolean; - canDeleteDataFrameAnalytics: boolean; - canCreateDataFrameAnalytics: boolean; - canStartStopDataFrameAnalytics: boolean; - }; - isPlatinumOrTrialLicense: boolean; - mlFeatureEnabledInSpace: boolean; - upgradeInProgress: boolean; -} - const sourceOrDestination = ['source.ip', 'destination.ip']; export const isDestinationOrSource = (value: string | null): value is DestinationOrSource => diff --git a/x-pack/plugins/siem/public/components/ml_popover/helpers.test.tsx b/x-pack/plugins/siem/public/components/ml_popover/helpers.test.tsx index 26ebfeb91629bc..0b8da6be57e1b5 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/helpers.test.tsx +++ b/x-pack/plugins/siem/public/components/ml_popover/helpers.test.tsx @@ -7,10 +7,6 @@ import { mockSiemJobs } from './__mocks__/api'; import { filterJobs, getStablePatternTitles, searchFilter } from './helpers'; -jest.mock('../ml/permissions/has_ml_admin_permissions', () => ({ - hasMlAdminPermissions: () => true, -})); - describe('helpers', () => { describe('filterJobs', () => { test('returns all jobs when no filter is suplied', () => { diff --git a/x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx b/x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx index 7bcbf4afa10cc4..98e74208b3dcc1 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx +++ b/x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx @@ -9,7 +9,7 @@ import { useEffect, useState } from 'react'; import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { checkRecognizer, getJobsSummary, getModules } from '../api'; import { SiemJob } from '../types'; -import { hasMlUserPermissions } from '../../ml/permissions/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; import { errorToToaster, useStateToaster } from '../../toasters'; import { useUiSetting$ } from '../../../lib/kibana'; diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx b/x-pack/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx index e7b14f2e80bf24..7de2f0fbfbc544 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx +++ b/x-pack/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx @@ -11,7 +11,7 @@ import { isJobLoading, isJobFailed, isJobStarted, -} from '../../../../common/detection_engine/ml_helpers'; +} from '../../../../common/machine_learning/helpers'; import { SiemJob } from '../types'; const StaticSwitch = styled(EuiSwitch)` diff --git a/x-pack/plugins/siem/public/components/ml_popover/ml_popover.test.tsx b/x-pack/plugins/siem/public/components/ml_popover/ml_popover.test.tsx index 3c93e1c195cd7a..cf4ac87bdb5e77 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/ml_popover.test.tsx +++ b/x-pack/plugins/siem/public/components/ml_popover/ml_popover.test.tsx @@ -11,10 +11,6 @@ import { MlPopover } from './ml_popover'; jest.mock('../../lib/kibana'); -jest.mock('../ml/permissions/has_ml_admin_permissions', () => ({ - hasMlAdminPermissions: () => true, -})); - describe('MlPopover', () => { test('shows upgrade popover on mouse click', () => { const wrapper = mountWithIntl(); diff --git a/x-pack/plugins/siem/public/components/ml_popover/ml_popover.tsx b/x-pack/plugins/siem/public/components/ml_popover/ml_popover.tsx index 6ea5cba4b37e43..e7f7770ee87f80 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/ml_popover.tsx +++ b/x-pack/plugins/siem/public/components/ml_popover/ml_popover.tsx @@ -12,7 +12,7 @@ import styled from 'styled-components'; import { useKibana } from '../../lib/kibana'; import { METRIC_TYPE, TELEMETRY_EVENT, track } from '../../lib/telemetry'; -import { hasMlAdminPermissions } from '../ml/permissions/has_ml_admin_permissions'; +import { hasMlAdminPermissions } from '../../../common/machine_learning/has_ml_admin_permissions'; import { errorToToaster, useStateToaster, ActionToaster } from '../toasters'; import { setupMlJob, startDatafeeds, stopDatafeeds } from './api'; import { filterJobs } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/page/hosts/host_overview/index.tsx b/x-pack/plugins/siem/public/components/page/hosts/host_overview/index.tsx index 4d0e6a737d303f..223a16fec77a0e 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/host_overview/index.tsx +++ b/x-pack/plugins/siem/public/components/page/hosts/host_overview/index.tsx @@ -19,7 +19,7 @@ import { InspectButton, InspectButtonContainer } from '../../../inspect'; import { HostItem } from '../../../../graphql/types'; import { Loader } from '../../../loader'; import { IPDetailsLink } from '../../../links'; -import { hasMlUserPermissions } from '../../../ml/permissions/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions'; import { useMlCapabilities } from '../../../ml_popover/hooks/use_ml_capabilities'; import { AnomalyScores } from '../../../ml/score/anomaly_scores'; import { Anomalies, NarrowDateRange } from '../../../ml/types'; diff --git a/x-pack/plugins/siem/public/components/page/network/ip_overview/index.tsx b/x-pack/plugins/siem/public/components/page/network/ip_overview/index.tsx index 56b59ca97156f6..456deaac0fb154 100644 --- a/x-pack/plugins/siem/public/components/page/network/ip_overview/index.tsx +++ b/x-pack/plugins/siem/public/components/page/network/ip_overview/index.tsx @@ -31,7 +31,7 @@ import { Loader } from '../../../loader'; import { Anomalies, NarrowDateRange } from '../../../ml/types'; import { AnomalyScores } from '../../../ml/score/anomaly_scores'; import { useMlCapabilities } from '../../../ml_popover/hooks/use_ml_capabilities'; -import { hasMlUserPermissions } from '../../../ml/permissions/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions'; import { InspectButton, InspectButtonContainer } from '../../../inspect'; interface OwnProps { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx b/x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx index 8e79f037d82b06..542a004cb37272 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx @@ -19,7 +19,7 @@ import { FormattedRelative } from '@kbn/i18n/react'; import * as H from 'history'; import React, { Dispatch } from 'react'; -import { isMlRule } from '../../../../../common/detection_engine/ml_helpers'; +import { isMlRule } from '../../../../../common/machine_learning/helpers'; import { Rule, RuleStatus } from '../../../../containers/detection_engine/rules'; import { getEmptyTagValue } from '../../../../components/empty_value'; import { FormattedDate } from '../../../../components/formatted_date'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.tsx b/x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.tsx index 18ca4d42bd018d..d9a2fafd144bcb 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.tsx +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.tsx @@ -48,7 +48,7 @@ import { showRulesTable } from './helpers'; import { allRulesReducer, State } from './reducer'; import { RulesTableFilters } from './rules_table_filters/rules_table_filters'; import { useMlCapabilities } from '../../../../components/ml_popover/hooks/use_ml_capabilities'; -import { hasMlAdminPermissions } from '../../../../components/ml/permissions/has_ml_admin_permissions'; +import { hasMlAdminPermissions } from '../../../../../common/machine_learning/has_ml_admin_permissions'; const SORT_FIELD = 'enabled'; const initialState: State = { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx index 79993c37e549c3..33d3dbcba86312 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx @@ -8,7 +8,7 @@ import React from 'react'; import styled from 'styled-components'; import { EuiBadge, EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui'; -import { isJobStarted } from '../../../../../../common/detection_engine/ml_helpers'; +import { isJobStarted } from '../../../../../../common/machine_learning/helpers'; import { useKibana } from '../../../../../lib/kibana'; import { SiemJob } from '../../../../../components/ml_popover/types'; import { ListItems } from './types'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx index 4fb9faaea711c0..c011c06e86542e 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx @@ -17,7 +17,7 @@ import { } from '@elastic/eui'; import styled from 'styled-components'; -import { isJobStarted } from '../../../../../../common/detection_engine/ml_helpers'; +import { isJobStarted } from '../../../../../../common/machine_learning/helpers'; import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../../shared_imports'; import { useSiemJobs } from '../../../../../components/ml_popover/hooks/use_siem_jobs'; import { useKibana } from '../../../../../lib/kibana'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx index 6f3d299da8d452..dc9a832f820ba7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx @@ -16,7 +16,7 @@ import { EuiText, } from '@elastic/eui'; -import { isMlRule } from '../../../../../../common/detection_engine/ml_helpers'; +import { isMlRule } from '../../../../../../common/machine_learning/helpers'; import { RuleType } from '../../../../../../common/detection_engine/types'; import { FieldHook } from '../../../../../shared_imports'; import { useKibana } from '../../../../../lib/kibana'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx index b6887badc56be5..3517c6fb21e695 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx @@ -10,7 +10,7 @@ import styled from 'styled-components'; import deepEqual from 'fast-deep-equal'; import { DEFAULT_INDEX_KEY } from '../../../../../../common/constants'; -import { isMlRule } from '../../../../../../common/detection_engine/ml_helpers'; +import { isMlRule } from '../../../../../../common/machine_learning/helpers'; import { IIndexPattern } from '../../../../../../../../../src/plugins/data/public'; import { useFetchIndexPatterns } from '../../../../../containers/detection_engine/rules'; import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations'; @@ -38,7 +38,7 @@ import { import { schema } from './schema'; import * as i18n from './translations'; import { filterRuleFieldsForType, RuleFields } from '../../create/helpers'; -import { hasMlAdminPermissions } from '../../../../../components/ml/permissions/has_ml_admin_permissions'; +import { hasMlAdminPermissions } from '../../../../../../common/machine_learning/has_ml_admin_permissions'; const CommonUseField = getUseField({ component: Field }); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx index 8915c5f0a224f9..08832c5dfe4f53 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx @@ -9,7 +9,7 @@ import { EuiText } from '@elastic/eui'; import { isEmpty } from 'lodash/fp'; import React from 'react'; -import { isMlRule } from '../../../../../../common/detection_engine/ml_helpers'; +import { isMlRule } from '../../../../../../common/machine_learning/helpers'; import { esKuery } from '../../../../../../../../../src/plugins/data/public'; import { FieldValueQueryBar } from '../query_bar'; import { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts b/x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts index 7ad116c313361d..b912c182a7c658 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts @@ -11,7 +11,7 @@ import deepmerge from 'deepmerge'; import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../common/constants'; import { transformAlertToRuleAction } from '../../../../../common/detection_engine/transform_actions'; import { RuleType } from '../../../../../common/detection_engine/types'; -import { isMlRule } from '../../../../../common/detection_engine/ml_helpers'; +import { isMlRule } from '../../../../../common/machine_learning/helpers'; import { NewRule } from '../../../../containers/detection_engine/rules'; import { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.tsx index 3e45c892e23ddf..6a43c217e5ff5b 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.tsx +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.tsx @@ -69,7 +69,7 @@ import { RuleStatusFailedCallOut } from './status_failed_callout'; import { FailureHistory } from './failure_history'; import { RuleStatus } from '../components/rule_status'; import { useMlCapabilities } from '../../../../components/ml_popover/hooks/use_ml_capabilities'; -import { hasMlAdminPermissions } from '../../../../components/ml/permissions/has_ml_admin_permissions'; +import { hasMlAdminPermissions } from '../../../../../common/machine_learning/has_ml_admin_permissions'; enum RuleDetailTabs { signals = 'signals', diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.tsx b/x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.tsx index 2ccbffd864070e..3dbcf3b2425cc6 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.tsx +++ b/x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.tsx @@ -11,7 +11,7 @@ import memoizeOne from 'memoize-one'; import { useLocation } from 'react-router-dom'; import { RuleAlertAction, RuleType } from '../../../../common/detection_engine/types'; -import { isMlRule } from '../../../../common/detection_engine/ml_helpers'; +import { isMlRule } from '../../../../common/machine_learning/helpers'; import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions'; import { Filter } from '../../../../../../../src/plugins/data/public'; import { Rule } from '../../../containers/detection_engine/rules'; diff --git a/x-pack/plugins/siem/public/pages/hosts/details/index.tsx b/x-pack/plugins/siem/public/pages/hosts/details/index.tsx index 730c93b43709c2..afed0fab0ade7c 100644 --- a/x-pack/plugins/siem/public/pages/hosts/details/index.tsx +++ b/x-pack/plugins/siem/public/pages/hosts/details/index.tsx @@ -15,7 +15,7 @@ import { HeaderPage } from '../../../components/header_page'; import { LastEventTime } from '../../../components/last_event_time'; import { AnomalyTableProvider } from '../../../components/ml/anomaly/anomaly_table_provider'; import { hostToCriteria } from '../../../components/ml/criteria/host_to_criteria'; -import { hasMlUserPermissions } from '../../../components/ml/permissions/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; import { useMlCapabilities } from '../../../components/ml_popover/hooks/use_ml_capabilities'; import { scoreIntervalToDateTime } from '../../../components/ml/score/score_interval_to_datetime'; import { SiemNavigation } from '../../../components/navigation'; diff --git a/x-pack/plugins/siem/public/pages/hosts/hosts.tsx b/x-pack/plugins/siem/public/pages/hosts/hosts.tsx index 2fbbc0d96a1e35..0e29d634d07a62 100644 --- a/x-pack/plugins/siem/public/pages/hosts/hosts.tsx +++ b/x-pack/plugins/siem/public/pages/hosts/hosts.tsx @@ -14,7 +14,7 @@ import { UpdateDateRange } from '../../components/charts/common'; import { FiltersGlobal } from '../../components/filters_global'; import { HeaderPage } from '../../components/header_page'; import { LastEventTime } from '../../components/last_event_time'; -import { hasMlUserPermissions } from '../../components/ml/permissions/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../common/machine_learning/has_ml_user_permissions'; import { SiemNavigation } from '../../components/navigation'; import { KpiHostsComponent } from '../../components/page/hosts'; import { manageQuery } from '../../components/page/manage_query'; diff --git a/x-pack/plugins/siem/public/pages/network/index.tsx b/x-pack/plugins/siem/public/pages/network/index.tsx index babc153823b5a0..412e51e74059e0 100644 --- a/x-pack/plugins/siem/public/pages/network/index.tsx +++ b/x-pack/plugins/siem/public/pages/network/index.tsx @@ -8,7 +8,7 @@ import React, { useMemo } from 'react'; import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom'; import { useMlCapabilities } from '../../components/ml_popover/hooks/use_ml_capabilities'; -import { hasMlUserPermissions } from '../../components/ml/permissions/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../common/machine_learning/has_ml_user_permissions'; import { FlowTarget } from '../../graphql/types'; import { IPDetails } from './ip_details'; diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts index e6facf6f3b7a8b..473d183c8a8f26 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts @@ -5,6 +5,8 @@ */ import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks'; +import { buildMlAuthz } from '../../../machine_learning/authz'; import { typicalPayload, getReadBulkRequest, @@ -19,9 +21,12 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__'; import { createRulesBulkRoute } from './create_rules_bulk_route'; import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags'; +jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create()); + describe('create_rules_bulk', () => { let server: ReturnType; let { clients, context } = requestContextMock.createTools(); + let ml: ReturnType; beforeAll(() => { setFeatureFlagsForTestsOnly(); @@ -34,12 +39,13 @@ describe('create_rules_bulk', () => { beforeEach(() => { server = serverMock.create(); ({ clients, context } = requestContextMock.createTools()); + ml = mlServicesMock.create(); clients.clusterClient.callAsCurrentUser.mockResolvedValue(getNonEmptyIndex()); // index exists clients.alertsClient.find.mockResolvedValue(getEmptyFindResult()); // no existing rules clients.alertsClient.create.mockResolvedValue(getResult()); // successful creation - createRulesBulkRoute(server.router); + createRulesBulkRoute(server.router, ml); }); describe('status codes', () => { @@ -64,16 +70,20 @@ describe('create_rules_bulk', () => { }); describe('unhappy paths', () => { - it('returns an error object if creating an ML rule with an insufficient license', async () => { - (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false); + it('returns a 403 error object if ML Authz fails', async () => { + (buildMlAuthz as jest.Mock).mockReturnValueOnce({ + validateRuleType: jest + .fn() + .mockResolvedValue({ valid: false, message: 'mocked validation message' }), + }); const response = await server.inject(createBulkMlRuleRequest(), context); expect(response.status).toEqual(200); expect(response.body).toEqual([ { error: { - message: 'Your license does not support machine learning. Please upgrade your license.', - status_code: 400, + message: 'mocked validation message', + status_code: 403, }, rule_id: 'rule-1', }, diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts index cf841a9c88b32e..371faccfbe47c9 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts @@ -8,6 +8,9 @@ import uuid from 'uuid'; import { IRouter } from '../../../../../../../../src/core/server'; import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { SetupPlugins } from '../../../../plugin'; +import { buildMlAuthz } from '../../../machine_learning/authz'; +import { throwHttpError } from '../../../machine_learning/validation'; import { createRules } from '../../rules/create_rules'; import { RuleAlertParamsRest } from '../../types'; import { readRules } from '../../rules/read_rules'; @@ -19,13 +22,12 @@ import { createBulkErrorObject, buildRouteValidation, buildSiemResponse, - validateLicenseForRuleType, } from '../utils'; import { createRulesBulkSchema } from '../schemas/create_rules_bulk_schema'; import { rulesBulkSchema } from '../schemas/response/rules_bulk_schema'; import { updateRulesNotifications } from '../../rules/update_rules_notifications'; -export const createRulesBulkRoute = (router: IRouter) => { +export const createRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) => { router.post( { path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`, @@ -47,6 +49,8 @@ export const createRulesBulkRoute = (router: IRouter) => { return siemResponse.error({ statusCode: 404 }); } + const mlAuthz = buildMlAuthz({ license: context.licensing.license, ml, request }); + const ruleDefinitions = request.body; const dupes = getDuplicates(ruleDefinitions, 'rule_id'); @@ -89,7 +93,7 @@ export const createRulesBulkRoute = (router: IRouter) => { } = payloadRule; const ruleIdOrUuid = ruleId ?? uuid.v4(); try { - validateLicenseForRuleType({ license: context.licensing.license, ruleType: type }); + throwHttpError(await mlAuthz.validateRuleType(type)); const finalIndex = outputIndex ?? siemClient.getSignalsIndex(); const indexExists = await getIndexExists(clusterClient.callAsCurrentUser, finalIndex); diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts index f15f47432f8389..afdcda7da251de 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts @@ -16,15 +16,19 @@ import { getFindResultWithSingleHit, createMlRuleRequest, } from '../__mocks__/request_responses'; +import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks'; +import { buildMlAuthz } from '../../../machine_learning/authz'; import { requestContextMock, serverMock, requestMock } from '../__mocks__'; import { createRulesRoute } from './create_rules_route'; import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags'; import { updateRulesNotifications } from '../../rules/update_rules_notifications'; jest.mock('../../rules/update_rules_notifications'); +jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create()); describe('create_rules', () => { let server: ReturnType; let { clients, context } = requestContextMock.createTools(); + let ml: ReturnType; beforeAll(() => { setFeatureFlagsForTestsOnly(); @@ -37,13 +41,14 @@ describe('create_rules', () => { beforeEach(() => { server = serverMock.create(); ({ clients, context } = requestContextMock.createTools()); + ml = mlServicesMock.create(); clients.clusterClient.callAsCurrentUser.mockResolvedValue(getNonEmptyIndex()); // index exists clients.alertsClient.find.mockResolvedValue(getEmptyFindResult()); // no current rules clients.alertsClient.create.mockResolvedValue(getResult()); // creation succeeds clients.savedObjectsClient.find.mockResolvedValue(getFindResultStatus()); // needed to transform - createRulesRoute(server.router); + createRulesRoute(server.router, ml); }); describe('status codes with actionClient and alertClient', () => { @@ -86,14 +91,18 @@ describe('create_rules', () => { expect(response.status).toEqual(200); }); - it('rejects the request if licensing is not platinum', async () => { - (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false); + it('returns a 403 if ML Authz fails', async () => { + (buildMlAuthz as jest.Mock).mockReturnValueOnce({ + validateRuleType: jest + .fn() + .mockResolvedValue({ valid: false, message: 'mocked validation message' }), + }); const response = await server.inject(createMlRuleRequest(), context); - expect(response.status).toEqual(400); + expect(response.status).toEqual(403); expect(response.body).toEqual({ - message: 'Your license does not support machine learning. Please upgrade your license.', - status_code: 400, + message: 'mocked validation message', + status_code: 403, }); }); }); diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts index 6605b5abfcb09f..7cbb22221679a3 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts @@ -8,22 +8,20 @@ import uuid from 'uuid'; import { IRouter } from '../../../../../../../../src/core/server'; import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { SetupPlugins } from '../../../../plugin'; +import { buildMlAuthz } from '../../../machine_learning/authz'; +import { throwHttpError } from '../../../machine_learning/validation'; import { createRules } from '../../rules/create_rules'; import { readRules } from '../../rules/read_rules'; import { RuleAlertParamsRest } from '../../types'; import { transformValidate } from './validate'; import { getIndexExists } from '../../index/get_index_exists'; import { createRulesSchema } from '../schemas/create_rules_schema'; -import { - buildRouteValidation, - transformError, - buildSiemResponse, - validateLicenseForRuleType, -} from '../utils'; +import { buildRouteValidation, transformError, buildSiemResponse } from '../utils'; import { updateRulesNotifications } from '../../rules/update_rules_notifications'; import { ruleStatusSavedObjectsClientFactory } from '../../signals/rule_status_saved_objects_client'; -export const createRulesRoute = (router: IRouter): void => { +export const createRulesRoute = (router: IRouter, ml: SetupPlugins['ml']): void => { router.post( { path: DETECTION_ENGINE_RULES_URL, @@ -70,7 +68,6 @@ export const createRulesRoute = (router: IRouter): void => { const siemResponse = buildSiemResponse(response); try { - validateLicenseForRuleType({ license: context.licensing.license, ruleType: type }); const alertsClient = context.alerting?.getAlertsClient(); const clusterClient = context.core.elasticsearch.dataClient; const savedObjectsClient = context.core.savedObjects.client; @@ -80,6 +77,9 @@ export const createRulesRoute = (router: IRouter): void => { return siemResponse.error({ statusCode: 404 }); } + const mlAuthz = buildMlAuthz({ license: context.licensing.license, ml, request }); + throwHttpError(await mlAuthz.validateRuleType(type)); + const finalIndex = outputIndex ?? siemClient.getSignalsIndex(); const indexExists = await getIndexExists(clusterClient.callAsCurrentUser, finalIndex); if (!indexExists) { diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts index 91685a68a60ae9..c33c917c2e9872 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.test.ts @@ -9,8 +9,6 @@ import { ruleIdsToNdJsonString, rulesToNdJsonString, getSimpleRuleWithId, - getSimpleRule, - getSimpleMlRule, } from '../__mocks__/utils'; import { getImportRulesRequest, @@ -22,10 +20,14 @@ import { getNonEmptyIndex, } from '../__mocks__/request_responses'; import { createMockConfig, requestContextMock, serverMock, requestMock } from '../__mocks__'; +import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks'; +import { buildMlAuthz } from '../../../machine_learning/authz'; import { importRulesRoute } from './import_rules_route'; import * as createRulesStreamFromNdJson from '../../rules/create_rules_stream_from_ndjson'; import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags'; +jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create()); + describe('import_rules_route', () => { beforeAll(() => { setFeatureFlagsForTestsOnly(); @@ -39,25 +41,20 @@ describe('import_rules_route', () => { let server: ReturnType; let request: ReturnType; let { clients, context } = requestContextMock.createTools(); + let ml: ReturnType; beforeEach(() => { - // jest carries state between mocked implementations when using - // spyOn. So now we're doing all three of these. - // https://github.com/facebook/jest/issues/7136#issuecomment-565976599 - jest.resetAllMocks(); - jest.restoreAllMocks(); - jest.clearAllMocks(); - server = serverMock.create(); ({ clients, context } = requestContextMock.createTools()); config = createMockConfig(); const hapiStream = buildHapiStream(ruleIdsToNdJsonString(['rule-1'])); request = getImportRulesRequest(hapiStream); + ml = mlServicesMock.create(); clients.clusterClient.callAsCurrentUser.mockResolvedValue(getNonEmptyIndex()); // index exists clients.alertsClient.find.mockResolvedValue(getEmptyFindResult()); // no extant rules - importRulesRoute(server.router, config); + importRulesRoute(server.router, config, ml); }); describe('status codes', () => { @@ -83,11 +80,12 @@ describe('import_rules_route', () => { }); describe('unhappy paths', () => { - it('returns an error object if creating an ML rule with an insufficient license', async () => { - (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false); - const rules = [getSimpleRule(), getSimpleMlRule('rule-2')]; - const hapiStreamWithMlRule = buildHapiStream(rulesToNdJsonString(rules)); - request = getImportRulesRequest(hapiStreamWithMlRule); + it('returns a 403 error object if ML Authz fails', async () => { + (buildMlAuthz as jest.Mock).mockReturnValueOnce({ + validateRuleType: jest + .fn() + .mockResolvedValue({ valid: false, message: 'mocked validation message' }), + }); const response = await server.inject(request, context); expect(response.status).toEqual(200); @@ -95,20 +93,19 @@ describe('import_rules_route', () => { errors: [ { error: { - message: - 'Your license does not support machine learning. Please upgrade your license.', - status_code: 400, + message: 'mocked validation message', + status_code: 403, }, - rule_id: 'rule-2', + rule_id: 'rule-1', }, ], success: false, - success_count: 1, + success_count: 0, }); }); test('returns error if createPromiseFromStreams throws error', async () => { - jest + const transformMock = jest .spyOn(createRulesStreamFromNdJson, 'createRulesStreamFromNdJson') .mockImplementation(() => { throw new Error('Test error'); @@ -116,6 +113,8 @@ describe('import_rules_route', () => { const response = await server.inject(request, context); expect(response.status).toEqual(500); expect(response.body).toEqual({ message: 'Test error', status_code: 500 }); + + transformMock.mockRestore(); }); test('returns an error if the index does not exist', async () => { diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts index 9ba083ae48086e..00010027f106ba 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts @@ -11,6 +11,9 @@ import { IRouter } from '../../../../../../../../src/core/server'; import { createPromiseFromStreams } from '../../../../../../../../src/legacy/utils/streams'; import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; import { ConfigType } from '../../../../config'; +import { SetupPlugins } from '../../../../plugin'; +import { buildMlAuthz } from '../../../machine_learning/authz'; +import { throwHttpError } from '../../../machine_learning/validation'; import { createRules } from '../../rules/create_rules'; import { ImportRulesRequestParams } from '../../rules/types'; import { readRules } from '../../rules/read_rules'; @@ -24,7 +27,6 @@ import { isImportRegular, transformError, buildSiemResponse, - validateLicenseForRuleType, } from '../utils'; import { ImportRuleAlertRest } from '../../types'; import { patchRules } from '../../rules/patch_rules'; @@ -38,7 +40,7 @@ type PromiseFromStreams = ImportRuleAlertRest | Error; const CHUNK_PARSED_OBJECT_SIZE = 10; -export const importRulesRoute = (router: IRouter, config: ConfigType) => { +export const importRulesRoute = (router: IRouter, config: ConfigType, ml: SetupPlugins['ml']) => { router.post( { path: `${DETECTION_ENGINE_RULES_URL}/_import`, @@ -67,6 +69,8 @@ export const importRulesRoute = (router: IRouter, config: ConfigType) => { return siemResponse.error({ statusCode: 404 }); } + const mlAuthz = buildMlAuthz({ license: context.licensing.license, ml, request }); + const { filename } = request.body.file.hapi; const fileExtension = extname(filename).toLowerCase(); if (fileExtension !== '.ndjson') { @@ -148,10 +152,7 @@ export const importRulesRoute = (router: IRouter, config: ConfigType) => { } = parsedRule; try { - validateLicenseForRuleType({ - license: context.licensing.license, - ruleType: type, - }); + throwHttpError(await mlAuthz.validateRuleType(type)); const rule = await readRules({ alertsClient, ruleId }); if (rule == null) { @@ -207,8 +208,7 @@ export const importRulesRoute = (router: IRouter, config: ConfigType) => { timelineTitle, meta, filters, - id: undefined, - ruleId, + rule, index, interval, maxSignals, @@ -240,7 +240,7 @@ export const importRulesRoute = (router: IRouter, config: ConfigType) => { resolve( createBulkErrorObject({ ruleId, - statusCode: 400, + statusCode: err.statusCode ?? 400, message: err.message, }) ); diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts index a1f39936dd674e..24b2d5631b3a7f 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts @@ -5,6 +5,8 @@ */ import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks'; +import { buildMlAuthz } from '../../../machine_learning/authz'; import { getEmptyFindResult, typicalPayload, @@ -17,9 +19,12 @@ import { serverMock, requestContextMock, requestMock } from '../__mocks__'; import { patchRulesBulkRoute } from './patch_rules_bulk_route'; import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags'; +jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create()); + describe('patch_rules_bulk', () => { let server: ReturnType; let { clients, context } = requestContextMock.createTools(); + let ml: ReturnType; beforeAll(() => { setFeatureFlagsForTestsOnly(); @@ -32,11 +37,12 @@ describe('patch_rules_bulk', () => { beforeEach(() => { server = serverMock.create(); ({ clients, context } = requestContextMock.createTools()); + ml = mlServicesMock.create(); clients.alertsClient.find.mockResolvedValue(getFindResultWithSingleHit()); // rule exists clients.alertsClient.update.mockResolvedValue(getResult()); // update succeeds - patchRulesBulkRoute(server.router); + patchRulesBulkRoute(server.router, ml); }); describe('status codes with actionClient and alertClient', () => { @@ -90,21 +96,51 @@ describe('patch_rules_bulk', () => { expect(response.body).toEqual({ message: 'Not Found', status_code: 404 }); }); - it('rejects patching of an ML rule with an insufficient license', async () => { - (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false); + it('rejects patching a rule to ML if mlAuthz fails', async () => { + (buildMlAuthz as jest.Mock).mockReturnValueOnce({ + validateRuleType: jest + .fn() + .mockResolvedValue({ valid: false, message: 'mocked validation message' }), + }); const request = requestMock.create({ method: 'patch', path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`, body: [typicalMlRulePayload()], }); + const response = await server.inject(request, context); + expect(response.status).toEqual(200); + expect(response.body).toEqual([ + { + error: { + message: 'mocked validation message', + status_code: 403, + }, + rule_id: 'rule-1', + }, + ]); + }); + + it('rejects patching an existing ML rule if mlAuthz fails', async () => { + (buildMlAuthz as jest.Mock).mockReturnValueOnce({ + validateRuleType: jest + .fn() + .mockResolvedValue({ valid: false, message: 'mocked validation message' }), + }); + const { type, ...payloadWithoutType } = typicalMlRulePayload(); + const request = requestMock.create({ + method: 'patch', + path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`, + body: [payloadWithoutType], + }); const response = await server.inject(request, context); + expect(response.status).toEqual(200); expect(response.body).toEqual([ { error: { - message: 'Your license does not support machine learning. Please upgrade your license.', - status_code: 400, + message: 'mocked validation message', + status_code: 403, }, rule_id: 'rule-1', }, diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts index 201e1f823b4cbb..69789fe9466221 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts @@ -6,13 +6,11 @@ import { IRouter } from '../../../../../../../../src/core/server'; import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { SetupPlugins } from '../../../../plugin'; +import { buildMlAuthz } from '../../../machine_learning/authz'; +import { throwHttpError } from '../../../machine_learning/validation'; import { PatchRuleAlertParamsRest } from '../../rules/types'; -import { - transformBulkError, - buildRouteValidation, - buildSiemResponse, - validateLicenseForRuleType, -} from '../utils'; +import { transformBulkError, buildRouteValidation, buildSiemResponse } from '../utils'; import { getIdBulkError } from './utils'; import { transformValidateBulkError, validate } from './validate'; import { patchRulesBulkSchema } from '../schemas/patch_rules_bulk_schema'; @@ -20,8 +18,9 @@ import { rulesBulkSchema } from '../schemas/response/rules_bulk_schema'; import { patchRules } from '../../rules/patch_rules'; import { updateRulesNotifications } from '../../rules/update_rules_notifications'; import { ruleStatusSavedObjectsClientFactory } from '../../signals/rule_status_saved_objects_client'; +import { readRules } from '../../rules/read_rules'; -export const patchRulesBulkRoute = (router: IRouter) => { +export const patchRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) => { router.patch( { path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`, @@ -42,6 +41,7 @@ export const patchRulesBulkRoute = (router: IRouter) => { return siemResponse.error({ statusCode: 404 }); } + const mlAuthz = buildMlAuthz({ license: context.licensing.license, ml, request }); const ruleStatusClient = ruleStatusSavedObjectsClientFactory(savedObjectsClient); const rules = await Promise.all( request.body.map(async payloadRule => { @@ -81,10 +81,18 @@ export const patchRulesBulkRoute = (router: IRouter) => { const idOrRuleIdOrUnknown = id ?? ruleId ?? '(unknown id)'; try { if (type) { - validateLicenseForRuleType({ license: context.licensing.license, ruleType: type }); + // reject an unauthorized "promotion" to ML + throwHttpError(await mlAuthz.validateRuleType(type)); + } + + const existingRule = await readRules({ alertsClient, ruleId, id }); + if (existingRule?.params.type) { + // reject an unauthorized modification of an ML rule + throwHttpError(await mlAuthz.validateRuleType(existingRule?.params.type)); } const rule = await patchRules({ + rule: existingRule, alertsClient, description, enabled, @@ -99,8 +107,6 @@ export const patchRulesBulkRoute = (router: IRouter) => { timelineTitle, meta, filters, - id, - ruleId, index, interval, maxSignals, diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts index dbb0a3bb3e1dae..9ae7e83ef7989a 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts @@ -5,6 +5,8 @@ */ import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks'; +import { buildMlAuthz } from '../../../machine_learning/authz'; import { getEmptyFindResult, getFindResultStatus, @@ -19,9 +21,12 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__'; import { patchRulesRoute } from './patch_rules_route'; import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags'; +jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create()); + describe('patch_rules', () => { let server: ReturnType; let { clients, context } = requestContextMock.createTools(); + let ml: ReturnType; beforeAll(() => { setFeatureFlagsForTestsOnly(); @@ -34,13 +39,14 @@ describe('patch_rules', () => { beforeEach(() => { server = serverMock.create(); ({ clients, context } = requestContextMock.createTools()); + ml = mlServicesMock.create(); clients.alertsClient.get.mockResolvedValue(getResult()); // existing rule clients.alertsClient.find.mockResolvedValue(getFindResultWithSingleHit()); // existing rule clients.alertsClient.update.mockResolvedValue(getResult()); // successful update clients.savedObjectsClient.find.mockResolvedValue(getFindResultStatus()); // successful transform - patchRulesRoute(server.router); + patchRulesRoute(server.router, ml); }); describe('status codes with actionClient and alertClient', () => { @@ -112,8 +118,12 @@ describe('patch_rules', () => { ); }); - it('rejects patching a rule to ML if licensing is not platinum', async () => { - (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false); + it('rejects patching a rule to ML if mlAuthz fails', async () => { + (buildMlAuthz as jest.Mock).mockReturnValueOnce({ + validateRuleType: jest + .fn() + .mockResolvedValue({ valid: false, message: 'mocked validation message' }), + }); const request = requestMock.create({ method: 'patch', path: DETECTION_ENGINE_RULES_URL, @@ -121,10 +131,31 @@ describe('patch_rules', () => { }); const response = await server.inject(request, context); - expect(response.status).toEqual(400); + expect(response.status).toEqual(403); + expect(response.body).toEqual({ + message: 'mocked validation message', + status_code: 403, + }); + }); + + it('rejects patching an ML rule if mlAuthz fails', async () => { + (buildMlAuthz as jest.Mock).mockReturnValueOnce({ + validateRuleType: jest + .fn() + .mockResolvedValue({ valid: false, message: 'mocked validation message' }), + }); + const { type, ...payloadWithoutType } = typicalMlRulePayload(); + const request = requestMock.create({ + method: 'patch', + path: DETECTION_ENGINE_RULES_URL, + body: payloadWithoutType, + }); + const response = await server.inject(request, context); + + expect(response.status).toEqual(403); expect(response.body).toEqual({ - message: 'Your license does not support machine learning. Please upgrade your license.', - status_code: 400, + message: 'mocked validation message', + status_code: 403, }); }); }); diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts index 00ccd3059b38d9..ae23e0efc857d3 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts @@ -6,21 +6,20 @@ import { IRouter } from '../../../../../../../../src/core/server'; import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { SetupPlugins } from '../../../../plugin'; +import { buildMlAuthz } from '../../../machine_learning/authz'; +import { throwHttpError } from '../../../machine_learning/validation'; import { patchRules } from '../../rules/patch_rules'; import { PatchRuleAlertParamsRest } from '../../rules/types'; import { patchRulesSchema } from '../schemas/patch_rules_schema'; -import { - buildRouteValidation, - transformError, - buildSiemResponse, - validateLicenseForRuleType, -} from '../utils'; +import { buildRouteValidation, transformError, buildSiemResponse } from '../utils'; import { getIdError } from './utils'; import { transformValidate } from './validate'; import { updateRulesNotifications } from '../../rules/update_rules_notifications'; import { ruleStatusSavedObjectsClientFactory } from '../../signals/rule_status_saved_objects_client'; +import { readRules } from '../../rules/read_rules'; -export const patchRulesRoute = (router: IRouter) => { +export const patchRulesRoute = (router: IRouter, ml: SetupPlugins['ml']) => { router.patch( { path: DETECTION_ENGINE_RULES_URL, @@ -68,10 +67,6 @@ export const patchRulesRoute = (router: IRouter) => { const siemResponse = buildSiemResponse(response); try { - if (type) { - validateLicenseForRuleType({ license: context.licensing.license, ruleType: type }); - } - const alertsClient = context.alerting?.getAlertsClient(); const savedObjectsClient = context.core.savedObjects.client; @@ -79,6 +74,18 @@ export const patchRulesRoute = (router: IRouter) => { return siemResponse.error({ statusCode: 404 }); } + const mlAuthz = buildMlAuthz({ license: context.licensing.license, ml, request }); + if (type) { + // reject an unauthorized "promotion" to ML + throwHttpError(await mlAuthz.validateRuleType(type)); + } + + const existingRule = await readRules({ alertsClient, ruleId, id }); + if (existingRule?.params.type) { + // reject an unauthorized modification of an ML rule + throwHttpError(await mlAuthz.validateRuleType(existingRule?.params.type)); + } + const ruleStatusClient = ruleStatusSavedObjectsClientFactory(savedObjectsClient); const rule = await patchRules({ alertsClient, @@ -95,8 +102,7 @@ export const patchRulesRoute = (router: IRouter) => { timelineTitle, meta, filters, - id, - ruleId, + rule: existingRule, index, interval, maxSignals, diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts index 332a47d0c0fc25..e48c72ce9579e0 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts @@ -4,6 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ +import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks'; +import { buildMlAuthz } from '../../../machine_learning/authz'; import { getEmptyFindResult, getResult, @@ -16,12 +19,14 @@ import { import { serverMock, requestContextMock, requestMock } from '../__mocks__'; import { updateRulesBulkRoute } from './update_rules_bulk_route'; import { BulkError } from '../utils'; -import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags'; +jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create()); + describe('update_rules_bulk', () => { let server: ReturnType; let { clients, context } = requestContextMock.createTools(); + let ml: ReturnType; beforeAll(() => { setFeatureFlagsForTestsOnly(); @@ -34,12 +39,13 @@ describe('update_rules_bulk', () => { beforeEach(() => { server = serverMock.create(); ({ clients, context } = requestContextMock.createTools()); + ml = mlServicesMock.create(); clients.alertsClient.find.mockResolvedValue(getFindResultWithSingleHit()); clients.alertsClient.update.mockResolvedValue(getResult()); clients.savedObjectsClient.find.mockResolvedValue(getFindResultStatus()); - updateRulesBulkRoute(server.router); + updateRulesBulkRoute(server.router, ml); }); describe('status codes with actionClient and alertClient', () => { @@ -92,8 +98,12 @@ describe('update_rules_bulk', () => { expect(response.body).toEqual(expected); }); - it('returns an error object if creating an ML rule with an insufficient license', async () => { - (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false); + it('returns a 403 error object if mlAuthz fails', async () => { + (buildMlAuthz as jest.Mock).mockReturnValueOnce({ + validateRuleType: jest + .fn() + .mockResolvedValue({ valid: false, message: 'mocked validation message' }), + }); const request = requestMock.create({ method: 'put', path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`, @@ -105,8 +115,8 @@ describe('update_rules_bulk', () => { expect(response.body).toEqual([ { error: { - message: 'Your license does not support machine learning. Please upgrade your license.', - status_code: 400, + message: 'mocked validation message', + status_code: 403, }, rule_id: 'rule-1', }, diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts index 6d8f2243787e87..11892898d214b6 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_bulk_route.ts @@ -6,22 +6,20 @@ import { IRouter } from '../../../../../../../../src/core/server'; import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { SetupPlugins } from '../../../../plugin'; +import { buildMlAuthz } from '../../../machine_learning/authz'; +import { throwHttpError } from '../../../machine_learning/validation'; import { UpdateRuleAlertParamsRest } from '../../rules/types'; import { getIdBulkError } from './utils'; import { transformValidateBulkError, validate } from './validate'; -import { - buildRouteValidation, - transformBulkError, - buildSiemResponse, - validateLicenseForRuleType, -} from '../utils'; +import { buildRouteValidation, transformBulkError, buildSiemResponse } from '../utils'; import { updateRulesBulkSchema } from '../schemas/update_rules_bulk_schema'; import { updateRules } from '../../rules/update_rules'; import { rulesBulkSchema } from '../schemas/response/rules_bulk_schema'; import { updateRulesNotifications } from '../../rules/update_rules_notifications'; import { ruleStatusSavedObjectsClientFactory } from '../../signals/rule_status_saved_objects_client'; -export const updateRulesBulkRoute = (router: IRouter) => { +export const updateRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) => { router.put( { path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`, @@ -43,6 +41,7 @@ export const updateRulesBulkRoute = (router: IRouter) => { return siemResponse.error({ statusCode: 404 }); } + const mlAuthz = buildMlAuthz({ license: context.licensing.license, ml, request }); const ruleStatusClient = ruleStatusSavedObjectsClientFactory(savedObjectsClient); const rules = await Promise.all( request.body.map(async payloadRule => { @@ -83,7 +82,7 @@ export const updateRulesBulkRoute = (router: IRouter) => { const finalIndex = outputIndex ?? siemClient.getSignalsIndex(); const idOrRuleIdOrUnknown = id ?? ruleId ?? '(unknown id)'; try { - validateLicenseForRuleType({ license: context.licensing.license, ruleType: type }); + throwHttpError(await mlAuthz.validateRuleType(type)); const rule = await updateRules({ alertsClient, diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts index 53c52153e84e6e..ce25a0204a6063 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.test.ts @@ -4,7 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { updateRulesRoute } from './update_rules_route'; +import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks'; +import { buildMlAuthz } from '../../../machine_learning/authz'; import { getEmptyFindResult, getResult, @@ -19,11 +20,15 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__'; import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../../feature_flags'; import { updateRulesNotifications } from '../../rules/update_rules_notifications'; +import { updateRulesRoute } from './update_rules_route'; + +jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create()); jest.mock('../../rules/update_rules_notifications'); describe('update_rules', () => { let server: ReturnType; let { clients, context } = requestContextMock.createTools(); + let ml: ReturnType; beforeAll(() => { setFeatureFlagsForTestsOnly(); @@ -36,13 +41,14 @@ describe('update_rules', () => { beforeEach(() => { server = serverMock.create(); ({ clients, context } = requestContextMock.createTools()); + ml = mlServicesMock.create(); clients.alertsClient.get.mockResolvedValue(getResult()); // existing rule clients.alertsClient.find.mockResolvedValue(getFindResultWithSingleHit()); // rule exists clients.alertsClient.update.mockResolvedValue(getResult()); // successful update clients.savedObjectsClient.find.mockResolvedValue(getFindResultStatusEmpty()); // successful transform - updateRulesRoute(server.router); + updateRulesRoute(server.router, ml); }); describe('status codes with actionClient and alertClient', () => { @@ -106,8 +112,12 @@ describe('update_rules', () => { }); }); - it('rejects the request if licensing is not adequate', async () => { - (context.licensing.license.hasAtLeast as jest.Mock).mockReturnValue(false); + it('returns a 403 if mlAuthz fails', async () => { + (buildMlAuthz as jest.Mock).mockReturnValueOnce({ + validateRuleType: jest + .fn() + .mockResolvedValue({ valid: false, message: 'mocked validation message' }), + }); const request = requestMock.create({ method: 'put', path: DETECTION_ENGINE_RULES_URL, @@ -115,10 +125,10 @@ describe('update_rules', () => { }); const response = await server.inject(request, context); - expect(response.status).toEqual(400); + expect(response.status).toEqual(403); expect(response.body).toEqual({ - message: 'Your license does not support machine learning. Please upgrade your license.', - status_code: 400, + message: 'mocked validation message', + status_code: 403, }); }); }); diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts index bfbeef8be2fea3..f15154a09657db 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/update_rules_route.ts @@ -6,21 +6,19 @@ import { IRouter } from '../../../../../../../../src/core/server'; import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants'; +import { SetupPlugins } from '../../../../plugin'; +import { buildMlAuthz } from '../../../machine_learning/authz'; +import { throwHttpError } from '../../../machine_learning/validation'; import { UpdateRuleAlertParamsRest } from '../../rules/types'; import { updateRulesSchema } from '../schemas/update_rules_schema'; -import { - buildRouteValidation, - transformError, - buildSiemResponse, - validateLicenseForRuleType, -} from '../utils'; +import { buildRouteValidation, transformError, buildSiemResponse } from '../utils'; import { getIdError } from './utils'; import { transformValidate } from './validate'; import { updateRules } from '../../rules/update_rules'; import { updateRulesNotifications } from '../../rules/update_rules_notifications'; import { ruleStatusSavedObjectsClientFactory } from '../../signals/rule_status_saved_objects_client'; -export const updateRulesRoute = (router: IRouter) => { +export const updateRulesRoute = (router: IRouter, ml: SetupPlugins['ml']) => { router.put( { path: DETECTION_ENGINE_RULES_URL, @@ -69,8 +67,6 @@ export const updateRulesRoute = (router: IRouter) => { const siemResponse = buildSiemResponse(response); try { - validateLicenseForRuleType({ license: context.licensing.license, ruleType: type }); - const alertsClient = context.alerting?.getAlertsClient(); const savedObjectsClient = context.core.savedObjects.client; const siemClient = context.siem?.getSiemClient(); @@ -80,6 +76,9 @@ export const updateRulesRoute = (router: IRouter) => { return siemResponse.error({ statusCode: 404 }); } + const mlAuthz = buildMlAuthz({ license: context.licensing.license, ml, request }); + throwHttpError(await mlAuthz.validateRuleType(type)); + const finalIndex = outputIndex ?? siemClient.getSignalsIndex(); const rule = await updateRules({ alertsClient, diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/schemas/response/check_type_dependents.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/schemas/response/check_type_dependents.ts index 25e76f367037a4..1c1bee58f0c973 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/schemas/response/check_type_dependents.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/schemas/response/check_type_dependents.ts @@ -8,7 +8,7 @@ import * as t from 'io-ts'; import { Either, left, fold } from 'fp-ts/lib/Either'; import { pipe } from 'fp-ts/lib/pipeable'; -import { isMlRule } from '../../../../../../common/detection_engine/ml_helpers'; +import { isMlRule } from '../../../../../../common/machine_learning/helpers'; import { dependentRulesSchema, RequiredRulesSchema, diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/utils.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/utils.test.ts index 8af5df60569135..fdb1cd148c7fa0 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/utils.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/utils.test.ts @@ -19,11 +19,9 @@ import { transformImportError, convertToSnakeCase, SiemResponseFactory, - validateLicenseForRuleType, } from './utils'; import { responseMock } from './__mocks__'; import { setFeatureFlagsForTestsOnly, unSetFeatureFlagsForTestsOnly } from '../feature_flags'; -import { licensingMock } from '../../../../../licensing/server/mocks'; describe('utils', () => { beforeAll(() => { @@ -361,36 +359,4 @@ describe('utils', () => { ); }); }); - - describe('validateLicenseForRuleType', () => { - let licenseMock: ReturnType; - - beforeEach(() => { - licenseMock = licensingMock.createLicenseMock(); - }); - - it('throws a BadRequestError if operating on an ML Rule with an insufficient license', () => { - licenseMock.hasAtLeast.mockReturnValue(false); - - expect(() => - validateLicenseForRuleType({ license: licenseMock, ruleType: 'machine_learning' }) - ).toThrowError(BadRequestError); - }); - - it('does not throw if operating on an ML Rule with a sufficient license', () => { - licenseMock.hasAtLeast.mockReturnValue(true); - - expect(() => - validateLicenseForRuleType({ license: licenseMock, ruleType: 'machine_learning' }) - ).not.toThrowError(BadRequestError); - }); - - it('does not throw if operating on a query rule', () => { - licenseMock.hasAtLeast.mockReturnValue(false); - - expect(() => - validateLicenseForRuleType({ license: licenseMock, ruleType: 'query' }) - ).not.toThrowError(BadRequestError); - }); - }); }); diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/utils.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/utils.ts index 52493a9be9b8fb..9903840b99c6f0 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/routes/utils.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/routes/utils.ts @@ -7,17 +7,12 @@ import Boom from 'boom'; import Joi from 'joi'; import { has, snakeCase } from 'lodash/fp'; -import { i18n } from '@kbn/i18n'; import { RouteValidationFunction, KibanaResponseFactory, CustomHttpResponseOptions, } from '../../../../../../../src/core/server'; -import { ILicense } from '../../../../../licensing/server'; -import { MINIMUM_ML_LICENSE } from '../../../../common/constants'; -import { RuleType } from '../../../../common/detection_engine/types'; -import { isMlRule } from '../../../../common/detection_engine/ml_helpers'; import { BadRequestError } from '../errors/bad_request_error'; export interface OutputError { @@ -294,28 +289,3 @@ export const convertToSnakeCase = >( return { ...acc, [newKey]: obj[item] }; }, {}); }; - -/** - * Checks the current Kibana License against the rule under operation. - * - * @param license ILicense representing the user license - * @param ruleType the type of the current rule - * - * @throws BadRequestError if rule and license are incompatible - */ -export const validateLicenseForRuleType = ({ - license, - ruleType, -}: { - license: ILicense; - ruleType: RuleType; -}): void => { - if (isMlRule(ruleType) && !license.hasAtLeast(MINIMUM_ML_LICENSE)) { - const message = i18n.translate('xpack.siem.licensing.unsupportedMachineLearningMessage', { - defaultMessage: - 'Your license does not support machine learning. Please upgrade your license.', - }); - - throw new BadRequestError(message); - } -}; diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts index c551eb164ee07f..a42500223012e1 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts @@ -19,14 +19,14 @@ describe('patchRules', () => { }); it('should call alertsClient.disable is the rule was enabled and enabled is false', async () => { - const rule = getResult(); - alertsClient.get.mockResolvedValue(getResult()); + const existingRule = getResult(); + const params = getResult().params; await patchRules({ alertsClient, savedObjectsClient, - id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd', - ...rule.params, + rule: existingRule, + ...params, enabled: false, interval: '', name: '', @@ -35,23 +35,23 @@ describe('patchRules', () => { expect(alertsClient.disable).toHaveBeenCalledWith( expect.objectContaining({ - id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd', + id: existingRule.id, }) ); }); it('should call alertsClient.enable is the rule was disabled and enabled is true', async () => { - const rule = getResult(); - alertsClient.get.mockResolvedValue({ + const existingRule = { ...getResult(), enabled: false, - }); + }; + const params = getResult().params; await patchRules({ alertsClient, savedObjectsClient, - id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd', - ...rule.params, + rule: existingRule, + ...params, enabled: true, interval: '', name: '', @@ -60,13 +60,13 @@ describe('patchRules', () => { expect(alertsClient.enable).toHaveBeenCalledWith( expect.objectContaining({ - id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd', + id: existingRule.id, }) ); }); it('calls the alertsClient with ML params', async () => { - alertsClient.get.mockResolvedValue(getMlResult()); + const existingRule = getMlResult(); const params = { ...getMlResult().params, anomalyThreshold: 55, @@ -76,7 +76,7 @@ describe('patchRules', () => { await patchRules({ alertsClient, savedObjectsClient, - id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd', + rule: existingRule, ...params, }); diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts index da5e90ec14b0b5..6dfb72532afbbf 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts @@ -6,7 +6,6 @@ import { defaults } from 'lodash/fp'; import { PartialAlert } from '../../../../../alerting/server'; -import { readRules } from './read_rules'; import { PatchRuleParams } from './types'; import { addTags } from './add_tags'; import { calculateVersion, calculateName, calculateInterval } from './utils'; @@ -28,12 +27,11 @@ export const patchRules = async ({ filters, from, immutable, - id, - ruleId, index, interval, maxSignals, riskScore, + rule, name, severity, tags, @@ -47,7 +45,6 @@ export const patchRules = async ({ anomalyThreshold, machineLearningJobId, }: PatchRuleParams): Promise => { - const rule = await readRules({ alertsClient, ruleId, id }); if (rule == null) { return null; } diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/types.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/types.ts index b5dbfc92cf528e..217a966478e781 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/rules/types.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/rules/types.ts @@ -14,7 +14,7 @@ import { SavedObjectsClientContract, } from 'kibana/server'; import { AlertsClient, PartialAlert } from '../../../../../alerting/server'; -import { Alert } from '../../../../../alerting/common'; +import { Alert, SanitizedAlert } from '../../../../../alerting/common'; import { SIGNALS_ID } from '../../../../common/constants'; import { RuleAlertParams, RuleTypeParams, RuleAlertParamsRest } from '../types'; @@ -140,8 +140,8 @@ export interface Clients { alertsClient: AlertsClient; } -export type PatchRuleParams = Partial> & { - id: string | undefined | null; +export type PatchRuleParams = Partial> & { + rule: SanitizedAlert | null; savedObjectsClient: SavedObjectsClientContract; } & Clients; diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.test.ts index e8fb4fa96ab512..2d77e9a707f746 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.test.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.test.ts @@ -6,7 +6,10 @@ import { savedObjectsClientMock } from '../../../../../../../src/core/server/mocks'; import { alertsClientMock } from '../../../../../alerting/server/mocks'; -import { mockPrepackagedRule } from '../routes/__mocks__/request_responses'; +import { + mockPrepackagedRule, + getFindResultWithSingleHit, +} from '../routes/__mocks__/request_responses'; import { updatePrepackagedRules } from './update_prepacked_rules'; import { patchRules } from './patch_rules'; jest.mock('./patch_rules'); @@ -31,6 +34,7 @@ describe('updatePrepackagedRules', () => { ]; const outputIndex = 'outputIndex'; const prepackagedRule = mockPrepackagedRule(); + alertsClient.find.mockResolvedValue(getFindResultWithSingleHit()); await updatePrepackagedRules( alertsClient, @@ -40,17 +44,8 @@ describe('updatePrepackagedRules', () => { ); expect(patchRules).toHaveBeenCalledWith( - expect.objectContaining({ - ruleId: 'rule-1', - }) - ); - expect(patchRules).not.toHaveBeenCalledWith( - expect.objectContaining({ + expect.not.objectContaining({ enabled: true, - }) - ); - expect(patchRules).not.toHaveBeenCalledWith( - expect.objectContaining({ actions, }) ); diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts index 4c183c51d16eab..618dee26b4812a 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts @@ -8,6 +8,7 @@ import { SavedObjectsClientContract } from 'kibana/server'; import { AlertsClient } from '../../../../../alerting/server'; import { patchRules } from './patch_rules'; import { PrepackagedRules } from '../types'; +import { readRules } from './read_rules'; export const updatePrepackagedRules = async ( alertsClient: AlertsClient, @@ -15,63 +16,66 @@ export const updatePrepackagedRules = async ( rules: PrepackagedRules[], outputIndex: string ): Promise => { - await rules.forEach(async rule => { - const { - description, - false_positives: falsePositives, - from, - immutable, - query, - language, - saved_id: savedId, - meta, - filters, - rule_id: ruleId, - index, - interval, - max_signals: maxSignals, - risk_score: riskScore, - name, - severity, - tags, - to, - type, - threat, - references, - version, - note, - } = rule; + await Promise.all( + rules.map(async rule => { + const { + description, + false_positives: falsePositives, + from, + immutable, + query, + language, + saved_id: savedId, + meta, + filters, + rule_id: ruleId, + index, + interval, + max_signals: maxSignals, + risk_score: riskScore, + name, + severity, + tags, + to, + type, + threat, + references, + version, + note, + } = rule; - // Note: we do not pass down enabled as we do not want to suddenly disable - // or enable rules on the user when they were not expecting it if a rule updates - return patchRules({ - alertsClient, - description, - falsePositives, - from, - immutable, - query, - language, - outputIndex, - id: undefined, // We never have an id when updating from pre-packaged rules - savedId, - savedObjectsClient, - meta, - filters, - ruleId, - index, - interval, - maxSignals, - riskScore, - name, - severity, - tags, - to, - type, - threat, - references, - version, - note, - }); - }); + const existingRule = await readRules({ alertsClient, ruleId, id: undefined }); + + // Note: we do not pass down enabled as we do not want to suddenly disable + // or enable rules on the user when they were not expecting it if a rule updates + return patchRules({ + alertsClient, + description, + falsePositives, + from, + immutable, + query, + language, + outputIndex, + rule: existingRule, + savedId, + savedObjectsClient, + meta, + filters, + index, + interval, + maxSignals, + riskScore, + name, + severity, + tags, + to, + type, + threat, + references, + version, + note, + }); + }) + ); }; diff --git a/x-pack/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts index ca259b3581720b..6160f34faef3f4 100644 --- a/x-pack/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts +++ b/x-pack/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts @@ -8,7 +8,7 @@ import { performance } from 'perf_hooks'; import { Logger, KibanaRequest } from 'src/core/server'; import { SIGNALS_ID, DEFAULT_SEARCH_AFTER_PAGE_SIZE } from '../../../../common/constants'; -import { isJobStarted, isMlRule } from '../../../../common/detection_engine/ml_helpers'; +import { isJobStarted, isMlRule } from '../../../../common/machine_learning/helpers'; import { SetupPlugins } from '../../../plugin'; import { buildEventsSearchQuery } from './build_events_query'; diff --git a/x-pack/plugins/siem/server/lib/machine_learning/authz.test.ts b/x-pack/plugins/siem/server/lib/machine_learning/authz.test.ts new file mode 100644 index 00000000000000..93c3a74c713782 --- /dev/null +++ b/x-pack/plugins/siem/server/lib/machine_learning/authz.test.ts @@ -0,0 +1,265 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { KibanaRequest } from '../../../../../../src/core/server'; +import { httpServerMock } from '../../../../../../src/core/server/mocks'; +import { hasMlAdminPermissions } from '../../../common/machine_learning/has_ml_admin_permissions'; +import { mlServicesMock } from './mocks'; +import { hasMlLicense, isMlAdmin, buildMlAuthz } from './authz'; +import { licensingMock } from '../../../../licensing/server/mocks'; + +jest.mock('../../../common/machine_learning/has_ml_admin_permissions'); + +describe('isMlAdmin', () => { + it('returns true if hasMlAdminPermissions is true', async () => { + const mockMl = mlServicesMock.create(); + const request = httpServerMock.createKibanaRequest(); + (hasMlAdminPermissions as jest.Mock).mockReturnValue(true); + + expect(await isMlAdmin({ ml: mockMl, request })).toEqual(true); + }); + + it('returns false if hasMlAdminPermissions is false', async () => { + const mockMl = mlServicesMock.create(); + const request = httpServerMock.createKibanaRequest(); + (hasMlAdminPermissions as jest.Mock).mockReturnValue(false); + + expect(await isMlAdmin({ ml: mockMl, request })).toEqual(false); + }); +}); + +describe('hasMlLicense', () => { + let licenseMock: ReturnType; + + beforeEach(() => { + licenseMock = licensingMock.createLicenseMock(); + }); + + it('returns false for an insufficient license', () => { + licenseMock.hasAtLeast.mockReturnValue(false); + + expect(hasMlLicense(licenseMock)).toEqual(false); + }); + + it('returns true for a sufficient license', () => { + licenseMock.hasAtLeast.mockReturnValue(true); + + expect(hasMlLicense(licenseMock)).toEqual(true); + }); +}); + +describe('mlAuthz', () => { + let licenseMock: ReturnType; + let mlMock: ReturnType; + let request: KibanaRequest; + + beforeEach(() => { + licenseMock = licensingMock.createLicenseMock(); + mlMock = mlServicesMock.create(); + request = httpServerMock.createKibanaRequest(); + }); + + describe('#validateRuleType', () => { + it('is valid for a non-ML rule when ML plugin is unavailable', async () => { + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: undefined, + request, + }); + + const validation = await mlAuthz.validateRuleType('query'); + + expect(validation.valid).toEqual(true); + }); + + it('is invalid for an ML rule when ML plugin is unavailable', async () => { + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: undefined, + request, + }); + + const validation = await mlAuthz.validateRuleType('machine_learning'); + + expect(validation.valid).toEqual(false); + expect(validation.message).toEqual( + 'The machine learning plugin is not available. Try enabling the plugin.' + ); + }); + + it('is valid for a non-ML rule when license is insufficient', async () => { + licenseMock.hasAtLeast.mockReturnValue(false); + + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + const validation = await mlAuthz.validateRuleType('query'); + + expect(validation.valid).toEqual(true); + }); + + it('is invalid for an ML rule when license is insufficient', async () => { + licenseMock.hasAtLeast.mockReturnValue(false); + + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + const validation = await mlAuthz.validateRuleType('machine_learning'); + + expect(validation.valid).toEqual(false); + expect(validation.message).toEqual( + 'Your license does not support machine learning. Please upgrade your license.' + ); + }); + + it('is valid for a non-ML rule when not an ML Admin', async () => { + (hasMlAdminPermissions as jest.Mock).mockReturnValue(false); + + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + const validation = await mlAuthz.validateRuleType('query'); + + expect(validation.valid).toEqual(true); + }); + + it('is invalid for an ML rule when not an ML Admin', async () => { + licenseMock.hasAtLeast.mockReturnValue(true); // prevents short-circuit on license check + (hasMlAdminPermissions as jest.Mock).mockReturnValue(false); + + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + const validation = await mlAuthz.validateRuleType('machine_learning'); + + expect(validation.valid).toEqual(false); + expect(validation.message).toEqual( + 'The current user is not a machine learning administrator.' + ); + }); + + it('is valid for an ML rule if ML available, license is sufficient, and an ML Admin', async () => { + licenseMock.hasAtLeast.mockReturnValue(true); + (hasMlAdminPermissions as jest.Mock).mockReturnValue(true); + + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + const validation = await mlAuthz.validateRuleType('machine_learning'); + + expect(validation.valid).toEqual(true); + expect(validation.message).toBeUndefined(); + }); + + it('only calls ml services once for multiple invocations', async () => { + const mockMlCapabilities = jest.fn(); + mlMock.mlSystemProvider.mockImplementation(() => ({ + mlInfo: jest.fn(), + mlSearch: jest.fn(), + mlCapabilities: mockMlCapabilities, + })); + + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + await mlAuthz.validateRuleType('machine_learning'); + await mlAuthz.validateRuleType('machine_learning'); + await mlAuthz.validateRuleType('machine_learning'); + + expect(mockMlCapabilities).toHaveBeenCalledTimes(1); + }); + + it('does not call ml services for non-ML rules', async () => { + const mockMlCapabilities = jest.fn(); + mlMock.mlSystemProvider.mockImplementation(() => ({ + mlInfo: jest.fn(), + mlSearch: jest.fn(), + mlCapabilities: mockMlCapabilities, + })); + + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + await mlAuthz.validateRuleType('query'); + await mlAuthz.validateRuleType('query'); + await mlAuthz.validateRuleType('query'); + + expect(mockMlCapabilities).not.toHaveBeenCalled(); + }); + + it('validates the same cache result per request if permissions change mid-stream', async () => { + licenseMock.hasAtLeast.mockReturnValueOnce(false); + licenseMock.hasAtLeast.mockReturnValueOnce(true); + + const mlAuthz = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + const validationFirst = await mlAuthz.validateRuleType('machine_learning'); + const validationSecond = await mlAuthz.validateRuleType('machine_learning'); + + expect(validationFirst.valid).toEqual(false); + expect(validationFirst.message).toEqual( + 'Your license does not support machine learning. Please upgrade your license.' + ); + expect(validationSecond.valid).toEqual(false); + expect(validationSecond.message).toEqual( + 'Your license does not support machine learning. Please upgrade your license.' + ); + }); + + it('will invalidate the cache result if the builder is called a second time after a license change', async () => { + licenseMock.hasAtLeast.mockReturnValueOnce(false); + licenseMock.hasAtLeast.mockReturnValueOnce(true); + (hasMlAdminPermissions as jest.Mock).mockReturnValueOnce(true); + + const mlAuthzFirst = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + const mlAuthzSecond = buildMlAuthz({ + license: licenseMock, + ml: mlMock, + request, + }); + + const validationFirst = await mlAuthzFirst.validateRuleType('machine_learning'); + const validationSecond = await mlAuthzSecond.validateRuleType('machine_learning'); + + expect(validationFirst.valid).toEqual(false); + expect(validationFirst.message).toEqual( + 'Your license does not support machine learning. Please upgrade your license.' + ); + expect(validationSecond.valid).toEqual(true); + expect(validationSecond.message).toBeUndefined(); + }); + }); +}); diff --git a/x-pack/plugins/siem/server/lib/machine_learning/authz.ts b/x-pack/plugins/siem/server/lib/machine_learning/authz.ts new file mode 100644 index 00000000000000..fb74f46244361c --- /dev/null +++ b/x-pack/plugins/siem/server/lib/machine_learning/authz.ts @@ -0,0 +1,120 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { i18n } from '@kbn/i18n'; + +import { KibanaRequest } from '../../../../../../src/core/server/'; +import { ILicense } from '../../../../licensing/server'; +import { MlPluginSetup } from '../../../../ml/server'; +import { SetupPlugins } from '../../plugin'; +import { MINIMUM_ML_LICENSE } from '../../../common/constants'; +import { hasMlAdminPermissions } from '../../../common/machine_learning/has_ml_admin_permissions'; +import { isMlRule } from '../../../common/machine_learning/helpers'; +import { RuleType } from '../../../common/detection_engine/types'; +import { Validation } from './validation'; +import { cache } from './cache'; + +export interface MlAuthz { + validateRuleType: (type: RuleType) => Promise; +} + +/** + * Builds ML authz services + * + * @param license A {@link ILicense} representing the user license + * @param ml {@link MlPluginSetup} ML services to fetch ML capabilities + * @param request A {@link KibanaRequest} representing the authenticated user + * + * @returns A {@link MLAuthz} service object + */ +export const buildMlAuthz = ({ + license, + ml, + request, +}: { + license: ILicense; + ml: SetupPlugins['ml']; + request: KibanaRequest; +}): MlAuthz => { + const cachedValidate = cache(() => validateMlAuthz({ license, ml, request })); + const validateRuleType = async (type: RuleType): Promise => { + if (!isMlRule(type)) { + return { valid: true, message: undefined }; + } else { + return cachedValidate(); + } + }; + + return { validateRuleType }; +}; + +/** + * Validates ML authorization for the current request + * + * @param license A {@link ILicense} representing the user license + * @param ml {@link MlPluginSetup} ML services to fetch ML capabilities + * @param request A {@link KibanaRequest} representing the authenticated user + * + * @returns A {@link Validation} validation + */ +export const validateMlAuthz = async ({ + license, + ml, + request, +}: { + license: ILicense; + ml: SetupPlugins['ml']; + request: KibanaRequest; +}): Promise => { + let message: string | undefined; + + if (ml == null) { + message = i18n.translate('xpack.siem.authz.mlUnavailable', { + defaultMessage: 'The machine learning plugin is not available. Try enabling the plugin.', + }); + } else if (!hasMlLicense(license)) { + message = i18n.translate('xpack.siem.licensing.unsupportedMachineLearningMessage', { + defaultMessage: + 'Your license does not support machine learning. Please upgrade your license.', + }); + } else if (!(await isMlAdmin({ ml, request }))) { + message = i18n.translate('xpack.siem.authz.userIsNotMlAdminMessage', { + defaultMessage: 'The current user is not a machine learning administrator.', + }); + } + + return { + valid: message === undefined, + message, + }; +}; + +/** + * Whether the license allows ML usage + * + * @param license A {@link ILicense} representing the user license + * + */ +export const hasMlLicense = (license: ILicense): boolean => license.hasAtLeast(MINIMUM_ML_LICENSE); + +/** + * Whether the requesting user is an ML Admin + * + * @param request A {@link KibanaRequest} representing the authenticated user + * @param ml {@link MlPluginSetup} ML services to fetch ML capabilities + * + */ +export const isMlAdmin = async ({ + request, + ml, +}: { + request: KibanaRequest; + ml: MlPluginSetup; +}): Promise => { + const scopedMlClient = ml.mlClient.asScoped(request).callAsCurrentUser; + const mlCapabilities = await ml.mlSystemProvider(scopedMlClient, request).mlCapabilities(); + return hasMlAdminPermissions(mlCapabilities); +}; diff --git a/x-pack/plugins/siem/server/lib/machine_learning/cache.test.ts b/x-pack/plugins/siem/server/lib/machine_learning/cache.test.ts new file mode 100644 index 00000000000000..14e4cfe8ebdda8 --- /dev/null +++ b/x-pack/plugins/siem/server/lib/machine_learning/cache.test.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { cache } from './cache'; + +describe('cache', () => { + it('does not call the function if not invoked', () => { + const fn = jest.fn(); + cache(fn); + + expect(fn).not.toHaveBeenCalled(); + }); + + it('returns the function result', () => { + const fn = jest.fn().mockReturnValue('result'); + const cachedFn = cache(fn); + + expect(cachedFn()).toEqual('result'); + }); + + it('only calls the function once for multiple invocations', () => { + const fn = jest.fn(); + const cachedFn = cache(fn); + + cachedFn(); + cachedFn(); + cachedFn(); + + expect(fn).toHaveBeenCalledTimes(1); + }); + + it('returns the function result on subsequent invocations', () => { + const fn = jest.fn().mockReturnValue('result'); + const cachedFn = cache(fn); + + expect([cachedFn(), cachedFn(), cachedFn()]).toEqual(['result', 'result', 'result']); + }); +}); diff --git a/x-pack/plugins/siem/server/lib/machine_learning/cache.ts b/x-pack/plugins/siem/server/lib/machine_learning/cache.ts new file mode 100644 index 00000000000000..1a7b95f2c5af24 --- /dev/null +++ b/x-pack/plugins/siem/server/lib/machine_learning/cache.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +/** + * Caches the result of a function call + * + * @param fn the function to be invoked + * + * @returns A function that will invoke the given function on its first invocation, + * and then simply return the result on subsequent calls + */ +export const cache = (fn: () => T): (() => T) => { + let result: T | null = null; + + return () => { + if (result === null) { + result = fn(); + } + return result; + }; +}; diff --git a/x-pack/plugins/siem/server/lib/machine_learning/mocks.ts b/x-pack/plugins/siem/server/lib/machine_learning/mocks.ts new file mode 100644 index 00000000000000..f044022d6db69e --- /dev/null +++ b/x-pack/plugins/siem/server/lib/machine_learning/mocks.ts @@ -0,0 +1,32 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { MlPluginSetup } from '../../../../ml/server'; +import { elasticsearchServiceMock } from '../../../../../../src/core/server/mocks'; + +const createMockClient = () => elasticsearchServiceMock.createClusterClient(); +const createMockMlSystemProvider = () => + jest.fn(() => ({ + mlCapabilities: jest.fn(), + })); + +export const mlServicesMock = { + create: () => + (({ + mlSystemProvider: createMockMlSystemProvider(), + mlClient: createMockClient(), + } as unknown) as jest.Mocked), +}; + +const mockValidateRuleType = jest.fn().mockResolvedValue({ valid: true, message: undefined }); +const createBuildMlAuthzMock = () => + jest.fn().mockReturnValue({ validateRuleType: mockValidateRuleType }); + +export const mlAuthzMock = { + create: () => ({ + buildMlAuthz: createBuildMlAuthzMock(), + }), +}; diff --git a/x-pack/plugins/siem/server/lib/machine_learning/validation.test.ts b/x-pack/plugins/siem/server/lib/machine_learning/validation.test.ts new file mode 100644 index 00000000000000..effe59c073c59c --- /dev/null +++ b/x-pack/plugins/siem/server/lib/machine_learning/validation.test.ts @@ -0,0 +1,36 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { toHttpError, throwHttpError } from './validation'; + +describe('toHttpError', () => { + it('returns nothing if validation is valid', () => { + expect(toHttpError({ valid: true, message: undefined })).toBeUndefined(); + }); + + it('returns an HTTP error if validation is invalid', () => { + const error = toHttpError({ valid: false, message: 'validation message' }); + expect(error?.statusCode).toEqual(403); + expect(error?.message).toEqual('validation message'); + }); +}); + +describe('throwHttpError', () => { + it('does nothing if validation is valid', () => { + expect(() => throwHttpError({ valid: true, message: undefined })).not.toThrowError(); + }); + + it('throws an error if validation is invalid', () => { + let error; + try { + throwHttpError({ valid: false, message: 'validation failed' }); + } catch (e) { + error = e; + } + expect(error?.statusCode).toEqual(403); + expect(error?.message).toEqual('validation failed'); + }); +}); diff --git a/x-pack/plugins/siem/server/lib/machine_learning/validation.ts b/x-pack/plugins/siem/server/lib/machine_learning/validation.ts new file mode 100644 index 00000000000000..eab85bbb510be2 --- /dev/null +++ b/x-pack/plugins/siem/server/lib/machine_learning/validation.ts @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface Validation { + valid: boolean; + message: string | undefined; +} + +export class HttpAuthzError extends Error { + public readonly statusCode: number; + + constructor(message: string | undefined) { + super(message); + this.name = 'HttpAuthzError'; + this.statusCode = 403; + } +} + +export const toHttpError = (validation: Validation): HttpAuthzError | undefined => { + if (!validation.valid) { + return new HttpAuthzError(validation.message); + } +}; + +export const throwHttpError = (validation: Validation): void => { + const error = toHttpError(validation); + if (error) { + throw error; + } +}; diff --git a/x-pack/plugins/siem/server/plugin.ts b/x-pack/plugins/siem/server/plugin.ts index 3ef4b39bd0979c..d296ee94e89587 100644 --- a/x-pack/plugins/siem/server/plugin.ts +++ b/x-pack/plugins/siem/server/plugin.ts @@ -98,7 +98,8 @@ export class Plugin implements IPlugin { // Detection Engine Rule routes that have the REST endpoints of /api/detection_engine/rules // All REST rule creation, deletion, updating, etc...... - createRulesRoute(router); + createRulesRoute(router, ml); readRulesRoute(router); - updateRulesRoute(router); - patchRulesRoute(router); + updateRulesRoute(router, ml); + patchRulesRoute(router, ml); deleteRulesRoute(router); findRulesRoute(router); addPrepackedRulesRoute(router); getPrepackagedRulesStatusRoute(router); - createRulesBulkRoute(router); - updateRulesBulkRoute(router); - patchRulesBulkRoute(router); + createRulesBulkRoute(router, ml); + updateRulesBulkRoute(router, ml); + patchRulesBulkRoute(router, ml); deleteRulesBulkRoute(router); createTimelinesRoute(router, config, security); updateTimelinesRoute(router, config, security); - importRulesRoute(router, config); + importRulesRoute(router, config, ml); exportRulesRoute(router, config); importTimelinesRoute(router, config, security); From 7b5c9c04edc6094b4662b375a6917d270b428191 Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 11 May 2020 12:58:24 -0700 Subject: [PATCH 50/65] skip flaky suite (#65741) --- .../__jest__/client_integration/mapped_fields.test.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/mapped_fields.test.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/mapped_fields.test.tsx index 8989e85d9f188d..57040eaeefbdfa 100644 --- a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/mapped_fields.test.tsx +++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/mapped_fields.test.tsx @@ -10,7 +10,8 @@ import { componentHelpers, MappingsEditorTestBed, DomFields, nextTick } from './ const { setup } = componentHelpers.mappingsEditor; const onChangeHandler = jest.fn(); -describe('Mappings editor: mapped fields', () => { +// FLAKY: https://github.com/elastic/kibana/issues/65741 +describe.skip('Mappings editor: mapped fields', () => { afterEach(() => { onChangeHandler.mockReset(); }); From 56c46ae1de66530ccc8eeaba61ac67e63e023af6 Mon Sep 17 00:00:00 2001 From: orfeas0 Date: Mon, 11 May 2020 23:20:03 +0300 Subject: [PATCH 51/65] Add example of of local plugin installation (#65986) --- docs/user/plugins.asciidoc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/user/plugins.asciidoc b/docs/user/plugins.asciidoc index 83c1ab1a842bb4..a96fe811dc84f9 100644 --- a/docs/user/plugins.asciidoc +++ b/docs/user/plugins.asciidoc @@ -33,12 +33,17 @@ $ bin/kibana-plugin install x-pack === Install plugins from an arbitrary URL You can download official Elastic plugins simply by specifying their name. You -can alternatively specify a URL to a specific plugin, as in the following -example: +can alternatively specify a URL or file path to a specific plugin, as in the following +examples: ["source","shell",subs="attributes"] $ bin/kibana-plugin install https://artifacts.elastic.co/downloads/packs/x-pack/x-pack-{version}.zip +or + +["source","shell",subs="attributes"] +$ bin/kibana-plugin install file:///local/path/to/custom_plugin.zip + You can specify URLs that use the HTTP, HTTPS, or `file` protocols. [float] From 20826486784fc2cd154218a773aeef7fafe80fb8 Mon Sep 17 00:00:00 2001 From: Steph Milovic Date: Mon, 11 May 2020 14:27:02 -0600 Subject: [PATCH 52/65] [SIEM] [Cases] Case API tests (#65777) --- .../tests/cases/comments/delete_comment.ts | 76 +++++ .../tests/cases/comments/find_comments.ts | 93 ++++++ .../basic/tests/cases/comments/get_comment.ts | 53 +++ .../tests/cases/comments/patch_comment.ts | 123 +++++++ .../tests/cases/comments/post_comment.ts | 57 ++++ .../basic/tests/cases/delete_cases.ts | 76 +++++ .../basic/tests/cases/find_cases.ts | 158 +++++++++ .../basic/tests/cases/get_case.ts | 52 +++ .../basic/tests/cases/patch_cases.ts | 139 ++++++++ .../basic/tests/cases/post_case.ts | 46 +++ .../basic/tests/cases/push_case.ts | 161 +++++++++ .../tests/cases/reporters/get_reporters.ts | 40 +++ .../basic/tests/cases/status/get_status.ts | 59 ++++ .../basic/tests/cases/tags/get_tags.ts | 43 +++ .../user_actions/get_all_user_actions.ts | 307 ++++++++++++++++++ .../case_api_integration/basic/tests/index.ts | 19 +- .../case_api_integration/common/lib/mock.ts | 50 +++ .../case_api_integration/common/lib/utils.ts | 61 ++-- 18 files changed, 1580 insertions(+), 33 deletions(-) create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/comments/delete_comment.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/comments/find_comments.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/comments/get_comment.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/comments/patch_comment.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/comments/post_comment.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/delete_cases.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/find_cases.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/get_case.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/patch_cases.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/post_case.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/push_case.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/reporters/get_reporters.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/status/get_status.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/tags/get_tags.ts create mode 100644 x-pack/test/case_api_integration/basic/tests/cases/user_actions/get_all_user_actions.ts create mode 100644 x-pack/test/case_api_integration/common/lib/mock.ts diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/delete_comment.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/delete_comment.ts new file mode 100644 index 00000000000000..afae04ae9cf5b5 --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/comments/delete_comment.ts @@ -0,0 +1,76 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../../plugins/case/common/constants'; +import { postCaseReq, postCommentReq } from '../../../../common/lib/mock'; +import { deleteCases, deleteCasesUserActions, deleteComments } from '../../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('delete_comment', () => { + afterEach(async () => { + await deleteCases(es); + await deleteComments(es); + await deleteCasesUserActions(es); + }); + + it('should delete a comment', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + + const { body: comment } = await supertest + .delete(`${CASES_URL}/${postedCase.id}/comments/${patchedCase.comments[0].id}`) + .set('kbn-xsrf', 'true') + .send(); + + expect(comment).to.eql({}); + }); + + it('unhappy path - 404s when comment belongs to different case', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + + const { body } = await supertest + .delete(`${CASES_URL}/fake-id/comments/${patchedCase.comments[0].id}`) + .set('kbn-xsrf', 'true') + .send() + .expect(404); + expect(body.message).to.eql( + `This comment ${patchedCase.comments[0].id} does not exist in fake-id).` + ); + }); + + it('unhappy path - 404s when comment is not there', async () => { + await supertest + .delete(`${CASES_URL}/fake-id/comments/fake-id`) + .set('kbn-xsrf', 'true') + .send() + .expect(404); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/find_comments.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/find_comments.ts new file mode 100644 index 00000000000000..e5c44de90b5a1a --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/comments/find_comments.ts @@ -0,0 +1,93 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../../plugins/case/common/constants'; +import { postCaseReq, postCommentReq } from '../../../../common/lib/mock'; +import { deleteCases, deleteCasesUserActions, deleteComments } from '../../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('find_comments', () => { + afterEach(async () => { + await deleteCases(es); + await deleteComments(es); + await deleteCasesUserActions(es); + }); + + it('should find all case comment', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + // post 2 comments + await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + + const { body: caseComments } = await supertest + .get(`${CASES_URL}/${postedCase.id}/comments/_find`) + .set('kbn-xsrf', 'true') + .send(); + + expect(caseComments.comments).to.eql(patchedCase.comments); + }); + + it('should filter case comments', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + // post 2 comments + await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send({ comment: 'unique' }); + + const { body: caseComments } = await supertest + .get(`${CASES_URL}/${postedCase.id}/comments/_find?search=unique`) + .set('kbn-xsrf', 'true') + .send(); + + expect(caseComments.comments).to.eql([patchedCase.comments[1]]); + }); + + it('unhappy path - 400s when query is bad', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + await supertest + .get(`${CASES_URL}/${postedCase.id}/comments/_find?perPage=true`) + .set('kbn-xsrf', 'true') + .send() + .expect(400); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/get_comment.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/get_comment.ts new file mode 100644 index 00000000000000..53da0ef1d2b166 --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/comments/get_comment.ts @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../../plugins/case/common/constants'; +import { postCaseReq, postCommentReq } from '../../../../common/lib/mock'; +import { deleteCases, deleteCasesUserActions, deleteComments } from '../../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('get_comment', () => { + afterEach(async () => { + await deleteCases(es); + await deleteComments(es); + await deleteCasesUserActions(es); + }); + + it('should get a comment', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + + const { body: comment } = await supertest + .get(`${CASES_URL}/${postedCase.id}/comments/${patchedCase.comments[0].id}`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + expect(comment).to.eql(patchedCase.comments[0]); + }); + it('unhappy path - 404s when comment is not there', async () => { + await supertest + .get(`${CASES_URL}/fake-id/comments/fake-comment`) + .set('kbn-xsrf', 'true') + .send() + .expect(404); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/patch_comment.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/patch_comment.ts new file mode 100644 index 00000000000000..73aeeb0fb989a0 --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/comments/patch_comment.ts @@ -0,0 +1,123 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../../plugins/case/common/constants'; +import { defaultUser, postCaseReq, postCommentReq } from '../../../../common/lib/mock'; +import { deleteCases, deleteCasesUserActions, deleteComments } from '../../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('patch_comment', () => { + afterEach(async () => { + await deleteCases(es); + await deleteComments(es); + await deleteCasesUserActions(es); + }); + + it('should patch a comment', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + const newComment = 'Well I decided to update my comment. So what? Deal with it.'; + const { body } = await supertest + .patch(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send({ + id: patchedCase.comments[0].id, + version: patchedCase.comments[0].version, + comment: newComment, + }); + expect(body.comments[0].comment).to.eql(newComment); + expect(body.updated_by).to.eql(defaultUser); + }); + + it('unhappy path - 404s when comment is not there', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + await supertest + .patch(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send({ + id: 'id', + version: 'version', + comment: 'comment', + }) + .expect(404); + }); + + it('unhappy path - 404s when case is not there', async () => { + await supertest + .patch(`${CASES_URL}/fake-id/comments`) + .set('kbn-xsrf', 'true') + .send({ + id: 'id', + version: 'version', + comment: 'comment', + }) + .expect(404); + }); + + it('unhappy path - 400s when patch body is bad', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + await supertest + .patch(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send({ + id: patchedCase.comments[0].id, + version: patchedCase.comments[0].version, + comment: true, + }) + .expect(400); + }); + + it('unhappy path - 409s when conflict', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + const newComment = 'Well I decided to update my comment. So what? Deal with it.'; + await supertest + .patch(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send({ + id: patchedCase.comments[0].id, + version: 'version-mismatch', + comment: newComment, + }) + .expect(409); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/post_comment.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/post_comment.ts new file mode 100644 index 00000000000000..6e8353f8ea86a5 --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/comments/post_comment.ts @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../../plugins/case/common/constants'; +import { defaultUser, postCaseReq, postCommentReq } from '../../../../common/lib/mock'; +import { deleteCases, deleteCasesUserActions, deleteComments } from '../../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('post_comment', () => { + afterEach(async () => { + await deleteCases(es); + await deleteComments(es); + await deleteCasesUserActions(es); + }); + + it('should post a comment', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + expect(patchedCase.comments[0].comment).to.eql(postCommentReq.comment); + expect(patchedCase.updated_by).to.eql(defaultUser); + }); + + it('unhappy path - 400s when post body is bad', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send({ + bad: 'comment', + }) + .expect(400); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/delete_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/delete_cases.ts new file mode 100644 index 00000000000000..aa2465e44c5c15 --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/delete_cases.ts @@ -0,0 +1,76 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../plugins/case/common/constants'; +import { postCaseReq, postCommentReq } from '../../../common/lib/mock'; +import { deleteCases, deleteCasesUserActions, deleteComments } from '../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('delete_cases', () => { + afterEach(async () => { + await deleteCases(es); + await deleteComments(es); + await deleteCasesUserActions(es); + }); + + it('should delete a case', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + + const { body } = await supertest + .delete(`${CASES_URL}?ids=["${postedCase.id}"]`) + .set('kbn-xsrf', 'true') + .send() + .expect(204); + + expect(body).to.eql({}); + }); + + it(`should delete a case's comments when that case gets deleted`, async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + + await supertest + .get(`${CASES_URL}/${postedCase.id}/comments/${patchedCase.comments[0].id}`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + await supertest + .delete(`${CASES_URL}?ids=["${postedCase.id}"]`) + .set('kbn-xsrf', 'true') + .send() + .expect(204); + await supertest + .get(`${CASES_URL}/${postedCase.id}/comments/${patchedCase.comments[0].id}`) + .set('kbn-xsrf', 'true') + .send() + .expect(404); + }); + it('unhappy path - 404s when case is not there', async () => { + await supertest + .delete(`${CASES_URL}?ids=["fake-id"]`) + .set('kbn-xsrf', 'true') + .send() + .expect(404); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/find_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/find_cases.ts new file mode 100644 index 00000000000000..04d195ea735091 --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/find_cases.ts @@ -0,0 +1,158 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../plugins/case/common/constants'; +import { postCaseReq, postCommentReq, findCasesResp } from '../../../common/lib/mock'; +import { deleteCases, deleteComments, deleteCasesUserActions } from '../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + describe('find_cases', () => { + afterEach(async () => { + await deleteCases(es); + await deleteComments(es); + await deleteCasesUserActions(es); + }); + it('should return empty response', async () => { + const { body } = await supertest + .get(`${CASES_URL}/_find`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + expect(body).to.eql(findCasesResp); + }); + + it('should return cases', async () => { + const { body: a } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const { body: b } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const { body: c } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const { body } = await supertest + .get(`${CASES_URL}/_find?sortOrder=asc`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + expect(body).to.eql({ + ...findCasesResp, + total: 3, + cases: [a, b, c], + count_open_cases: 3, + }); + }); + + it('filters by tags', async () => { + await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ ...postCaseReq, tags: ['unique'] }); + const { body } = await supertest + .get(`${CASES_URL}/_find?sortOrder=asc&tags=unique`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + expect(body).to.eql({ + ...findCasesResp, + total: 1, + cases: [postedCase], + count_open_cases: 1, + }); + }); + + it('correctly counts comments', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + + // post 2 comments + await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + const { body } = await supertest + .get(`${CASES_URL}/_find?sortOrder=asc`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + expect(body).to.eql({ + ...findCasesResp, + total: 1, + cases: [ + { + ...patchedCase, + comments: [], + totalComment: 2, + }, + ], + count_open_cases: 1, + }); + }); + + it('correctly counts open/closed', async () => { + await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + status: 'closed', + }, + ], + }) + .expect(200); + const { body } = await supertest + .get(`${CASES_URL}/_find?sortOrder=asc`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + expect(body.count_open_cases).to.eql(1); + expect(body.count_closed_cases).to.eql(1); + }); + it('unhappy path - 400s when bad query supplied', async () => { + await supertest + .get(`${CASES_URL}/_find?perPage=true`) + .set('kbn-xsrf', 'true') + .send() + .expect(400); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/get_case.ts b/x-pack/test/case_api_integration/basic/tests/cases/get_case.ts new file mode 100644 index 00000000000000..9aad86126ceafa --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/get_case.ts @@ -0,0 +1,52 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../plugins/case/common/constants'; +import { + postCaseReq, + postCaseResp, + removeServerGeneratedPropertiesFromCase, +} from '../../../common/lib/mock'; +import { deleteCases } from '../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('get_case', () => { + afterEach(async () => { + await deleteCases(es); + }); + + it('should return a case', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + const data = removeServerGeneratedPropertiesFromCase(body); + expect(data).to.eql(postCaseResp(postedCase.id)); + }); + it('unhappy path - 404s when case is not there', async () => { + await supertest + .get(`${CASES_URL}/fake-id`) + .set('kbn-xsrf', 'true') + .send() + .expect(404); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/patch_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/patch_cases.ts new file mode 100644 index 00000000000000..caeaf46cbc953c --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/patch_cases.ts @@ -0,0 +1,139 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../plugins/case/common/constants'; +import { + defaultUser, + postCaseReq, + postCaseResp, + removeServerGeneratedPropertiesFromCase, +} from '../../../common/lib/mock'; +import { deleteCases, deleteCasesUserActions } from '../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('patch_cases', () => { + afterEach(async () => { + await deleteCases(es); + await deleteCasesUserActions(es); + }); + + it('should patch a case', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + const { body: patchedCases } = await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + status: 'closed', + }, + ], + }) + .expect(200); + + const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]); + expect(data).to.eql({ + ...postCaseResp(postedCase.id), + closed_by: defaultUser, + status: 'closed', + updated_by: defaultUser, + }); + }); + + it('unhappy path - 404s when case is not there', async () => { + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: 'not-real', + version: 'version', + status: 'closed', + }, + ], + }) + .expect(404); + }); + + it('unhappy path - 406s when excess data sent', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + badKey: 'closed', + }, + ], + }) + .expect(406); + }); + + it('unhappy path - 400s when bad data sent', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + status: true, + }, + ], + }) + .expect(400); + }); + + it('unhappy path - 409s when conflict', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + await supertest + .patch(`${CASES_URL}`) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: 'version', + status: 'closed', + }, + ], + }) + .expect(409); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/post_case.ts b/x-pack/test/case_api_integration/basic/tests/cases/post_case.ts new file mode 100644 index 00000000000000..ab668c2c32725a --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/post_case.ts @@ -0,0 +1,46 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; + +import { CASES_URL } from '../../../../../plugins/case/common/constants'; +import { + postCaseReq, + postCaseResp, + removeServerGeneratedPropertiesFromCase, +} from '../../../common/lib/mock'; +import { deleteCases } from '../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('post_case', () => { + afterEach(async () => { + await deleteCases(es); + }); + + it('should post a case', async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const data = removeServerGeneratedPropertiesFromCase(postedCase); + expect(data).to.eql(postCaseResp(postedCase.id)); + }); + it('unhappy path - 400s when bad query supplied', async () => { + await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ ...postCaseReq, badKey: true }) + .expect(400); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/push_case.ts b/x-pack/test/case_api_integration/basic/tests/cases/push_case.ts new file mode 100644 index 00000000000000..848b980dee769e --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/push_case.ts @@ -0,0 +1,161 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../common/ftr_provider_context'; + +import { CASE_CONFIGURE_URL, CASES_URL } from '../../../../../plugins/case/common/constants'; +import { postCaseReq, defaultUser, postCommentReq } from '../../../common/lib/mock'; +import { + deleteCases, + deleteCasesUserActions, + deleteComments, + deleteConfiguration, + getConfiguration, +} from '../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('push_case', () => { + afterEach(async () => { + await deleteCases(es); + await deleteComments(es); + await deleteConfiguration(es); + await deleteCasesUserActions(es); + }); + + it('should push a case', async () => { + const { body: configure } = await supertest + .post(CASE_CONFIGURE_URL) + .set('kbn-xsrf', 'true') + .send(getConfiguration()) + .expect(200); + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const { body } = await supertest + .post(`${CASES_URL}/${postedCase.id}/_push`) + .set('kbn-xsrf', 'true') + .send({ + connector_id: configure.connector_id, + connector_name: configure.connector_name, + external_id: 'external_id', + external_title: 'external_title', + external_url: 'external_url', + }) + .expect(200); + expect(body.connector_id).to.eql(configure.connector_id); + expect(body.external_service.pushed_by).to.eql(defaultUser); + }); + + it('pushes a comment appropriately', async () => { + const { body: configure } = await supertest + .post(CASE_CONFIGURE_URL) + .set('kbn-xsrf', 'true') + .send(getConfiguration()) + .expect(200); + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + await supertest + .post(`${CASES_URL}/${postedCase.id}/_push`) + .set('kbn-xsrf', 'true') + .send({ + connector_id: configure.connector_id, + connector_name: configure.connector_name, + external_id: 'external_id', + external_title: 'external_title', + external_url: 'external_url', + }) + .expect(200); + + await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + + const { body } = await supertest + .post(`${CASES_URL}/${postedCase.id}/_push`) + .set('kbn-xsrf', 'true') + .send({ + connector_id: configure.connector_id, + connector_name: configure.connector_name, + external_id: 'external_id', + external_title: 'external_title', + external_url: 'external_url', + }) + .expect(200); + expect(body.comments[0].pushed_by).to.eql(defaultUser); + }); + it('unhappy path - 404s when case does not exist', async () => { + await supertest + .post(`${CASES_URL}/fake-id/_push`) + .set('kbn-xsrf', 'true') + .send({ + connector_id: 'connector_id', + connector_name: 'connector_name', + external_id: 'external_id', + external_title: 'external_title', + external_url: 'external_url', + }) + .expect(404); + }); + it('unhappy path - 400s when bad data supplied', async () => { + await supertest + .post(`${CASES_URL}/fake-id/_push`) + .set('kbn-xsrf', 'true') + .send({ + badKey: 'connector_id', + }) + .expect(400); + }); + it('unhappy path = 409s when case is closed', async () => { + const { body: configure } = await supertest + .post(CASE_CONFIGURE_URL) + .set('kbn-xsrf', 'true') + .send(getConfiguration()) + .expect(200); + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + status: 'closed', + }, + ], + }) + .expect(200); + await supertest + .post(`${CASES_URL}/${postedCase.id}/_push`) + .set('kbn-xsrf', 'true') + .send({ + connector_id: configure.connector_id, + connector_name: configure.connector_name, + external_id: 'external_id', + external_title: 'external_title', + external_url: 'external_url', + }) + .expect(409); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/reporters/get_reporters.ts b/x-pack/test/case_api_integration/basic/tests/cases/reporters/get_reporters.ts new file mode 100644 index 00000000000000..a781b928b2b683 --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/reporters/get_reporters.ts @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +import { CASES_URL, CASE_REPORTERS_URL } from '../../../../../../plugins/case/common/constants'; +import { defaultUser, postCaseReq } from '../../../../common/lib/mock'; +import { deleteCases } from '../../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('get_reporters', () => { + afterEach(async () => { + await deleteCases(es); + }); + + it('should return reporters', async () => { + await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq) + .expect(200); + + const { body } = await supertest + .get(CASE_REPORTERS_URL) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + expect(body).to.eql([defaultUser]); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/status/get_status.ts b/x-pack/test/case_api_integration/basic/tests/cases/status/get_status.ts new file mode 100644 index 00000000000000..6552f588bdc198 --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/status/get_status.ts @@ -0,0 +1,59 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +import { CASES_URL, CASE_STATUS_URL } from '../../../../../../plugins/case/common/constants'; +import { postCaseReq } from '../../../../common/lib/mock'; +import { deleteCases } from '../../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('get_status', () => { + afterEach(async () => { + await deleteCases(es); + }); + + it('should return case statuses', async () => { + await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + status: 'closed', + }, + ], + }) + .expect(200); + + const { body } = await supertest + .get(CASE_STATUS_URL) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + expect(body).to.eql({ + count_open_cases: 1, + count_closed_cases: 1, + }); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/tags/get_tags.ts b/x-pack/test/case_api_integration/basic/tests/cases/tags/get_tags.ts new file mode 100644 index 00000000000000..9b769e3c5eef45 --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/tags/get_tags.ts @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +import { CASES_URL, CASE_TAGS_URL } from '../../../../../../plugins/case/common/constants'; +import { postCaseReq } from '../../../../common/lib/mock'; +import { deleteCases } from '../../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('get_tags', () => { + afterEach(async () => { + await deleteCases(es); + }); + + it('should return case tags', async () => { + await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ ...postCaseReq, tags: ['unique'] }); + + const { body } = await supertest + .get(CASE_TAGS_URL) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + + expect(body).to.eql(['defacement', 'unique']); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/cases/user_actions/get_all_user_actions.ts b/x-pack/test/case_api_integration/basic/tests/cases/user_actions/get_all_user_actions.ts new file mode 100644 index 00000000000000..6bbd43eef1439d --- /dev/null +++ b/x-pack/test/case_api_integration/basic/tests/cases/user_actions/get_all_user_actions.ts @@ -0,0 +1,307 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from '@kbn/expect'; +import { FtrProviderContext } from '../../../../common/ftr_provider_context'; + +import { CASE_CONFIGURE_URL, CASES_URL } from '../../../../../../plugins/case/common/constants'; +import { defaultUser, postCaseReq, postCommentReq } from '../../../../common/lib/mock'; +import { + deleteCases, + deleteCasesUserActions, + deleteComments, + deleteConfiguration, + getConfiguration, +} from '../../../../common/lib/utils'; + +// eslint-disable-next-line import/no-default-export +export default ({ getService }: FtrProviderContext): void => { + const supertest = getService('supertest'); + const es = getService('es'); + + describe('get_all_user_actions', () => { + afterEach(async () => { + await deleteCases(es); + await deleteComments(es); + await deleteConfiguration(es); + await deleteCasesUserActions(es); + }); + + it(`on new case, user action: 'create' should be called with actionFields: ['description', 'status', 'tags', 'title']`, async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}/user_actions`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + expect(body.length).to.eql(1); + + expect(body[0].action_field).to.eql(['description', 'status', 'tags', 'title']); + expect(body[0].action).to.eql('create'); + expect(body[0].old_value).to.eql(null); + expect(body[0].new_value).to.eql(JSON.stringify(postCaseReq)); + }); + + it(`on close case, user action: 'update' should be called with actionFields: ['status']`, async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + status: 'closed', + }, + ], + }) + .expect(200); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}/user_actions`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + expect(body.length).to.eql(2); + expect(body[1].action_field).to.eql(['status']); + expect(body[1].action).to.eql('update'); + expect(body[1].old_value).to.eql('open'); + expect(body[1].new_value).to.eql('closed'); + }); + + it(`on update case connector, user action: 'update' should be called with actionFields: ['connector_id']`, async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const newConnectorId = '12345'; + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + connector_id: newConnectorId, + }, + ], + }) + .expect(200); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}/user_actions`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + expect(body.length).to.eql(2); + expect(body[1].action_field).to.eql(['connector_id']); + expect(body[1].action).to.eql('update'); + expect(body[1].old_value).to.eql('none'); + expect(body[1].new_value).to.eql(newConnectorId); + }); + + it(`on update tags, user action: 'add' and 'delete' should be called with actionFields: ['tags']`, async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + tags: ['cool', 'neat'], + }, + ], + }) + .expect(200); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}/user_actions`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + expect(body.length).to.eql(3); + expect(body[1].action_field).to.eql(['tags']); + expect(body[1].action).to.eql('add'); + expect(body[1].old_value).to.eql(null); + expect(body[1].new_value).to.eql('cool, neat'); + expect(body[2].action_field).to.eql(['tags']); + expect(body[2].action).to.eql('delete'); + expect(body[2].old_value).to.eql(null); + expect(body[2].new_value).to.eql('defacement'); + }); + + it(`on update title, user action: 'update' should be called with actionFields: ['title']`, async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const newTitle = 'Such a great title'; + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + title: newTitle, + }, + ], + }) + .expect(200); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}/user_actions`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + expect(body.length).to.eql(2); + expect(body[1].action_field).to.eql(['title']); + expect(body[1].action).to.eql('update'); + expect(body[1].old_value).to.eql(postCaseReq.title); + expect(body[1].new_value).to.eql(newTitle); + }); + + it(`on update description, user action: 'update' should be called with actionFields: ['description']`, async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const newDesc = 'Such a great description'; + await supertest + .patch(CASES_URL) + .set('kbn-xsrf', 'true') + .send({ + cases: [ + { + id: postedCase.id, + version: postedCase.version, + description: newDesc, + }, + ], + }) + .expect(200); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}/user_actions`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + expect(body.length).to.eql(2); + expect(body[1].action_field).to.eql(['description']); + expect(body[1].action).to.eql('update'); + expect(body[1].old_value).to.eql(postCaseReq.description); + expect(body[1].new_value).to.eql(newDesc); + }); + + it(`on new comment, user action: 'create' should be called with actionFields: ['comments']`, async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}/user_actions`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + expect(body.length).to.eql(2); + + expect(body[1].action_field).to.eql(['comment']); + expect(body[1].action).to.eql('create'); + expect(body[1].old_value).to.eql(null); + expect(body[1].new_value).to.eql(postCommentReq.comment); + }); + + it(`on update comment, user action: 'update' should be called with actionFields: ['comments']`, async () => { + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + const { body: patchedCase } = await supertest + .post(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send(postCommentReq); + const newComment = 'Well I decided to update my comment. So what? Deal with it.'; + await supertest + .patch(`${CASES_URL}/${postedCase.id}/comments`) + .set('kbn-xsrf', 'true') + .send({ + id: patchedCase.comments[0].id, + version: patchedCase.comments[0].version, + comment: newComment, + }); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}/user_actions`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + expect(body.length).to.eql(3); + + expect(body[2].action_field).to.eql(['comment']); + expect(body[2].action).to.eql('update'); + expect(body[2].old_value).to.eql(postCommentReq.comment); + expect(body[2].new_value).to.eql(newComment); + }); + + it(`on new push to service, user action: 'push-to-service' should be called with actionFields: ['pushed']`, async () => { + const { body: configure } = await supertest + .post(CASE_CONFIGURE_URL) + .set('kbn-xsrf', 'true') + .send(getConfiguration()) + .expect(200); + const { body: postedCase } = await supertest + .post(CASES_URL) + .set('kbn-xsrf', 'true') + .send(postCaseReq); + + await supertest + .post(`${CASES_URL}/${postedCase.id}/_push`) + .set('kbn-xsrf', 'true') + .send({ + connector_id: configure.connector_id, + connector_name: configure.connector_name, + external_id: 'external_id', + external_title: 'external_title', + external_url: 'external_url', + }) + .expect(200); + + const { body } = await supertest + .get(`${CASES_URL}/${postedCase.id}/user_actions`) + .set('kbn-xsrf', 'true') + .send() + .expect(200); + expect(body.length).to.eql(2); + + expect(body[1].action_field).to.eql(['pushed']); + expect(body[1].action).to.eql('push-to-service'); + expect(body[1].old_value).to.eql(null); + const newValue = JSON.parse(body[1].new_value); + expect(newValue.connector_id).to.eql(configure.connector_id); + expect(newValue.pushed_by).to.eql(defaultUser); + }); + }); +}; diff --git a/x-pack/test/case_api_integration/basic/tests/index.ts b/x-pack/test/case_api_integration/basic/tests/index.ts index efd5369c019d82..b152a97a28616b 100644 --- a/x-pack/test/case_api_integration/basic/tests/index.ts +++ b/x-pack/test/case_api_integration/basic/tests/index.ts @@ -12,9 +12,24 @@ export default ({ loadTestFile }: FtrProviderContext): void => { // Fastest ciGroup for the moment. this.tags('ciGroup2'); + loadTestFile(require.resolve('./cases/comments/delete_comment')); + loadTestFile(require.resolve('./cases/comments/find_comments')); + loadTestFile(require.resolve('./cases/comments/get_comment')); + loadTestFile(require.resolve('./cases/comments/patch_comment')); + loadTestFile(require.resolve('./cases/comments/post_comment')); + loadTestFile(require.resolve('./cases/delete_cases')); + loadTestFile(require.resolve('./cases/find_cases')); + loadTestFile(require.resolve('./cases/get_case')); + loadTestFile(require.resolve('./cases/patch_cases')); + loadTestFile(require.resolve('./cases/post_case')); + loadTestFile(require.resolve('./cases/push_case')); + loadTestFile(require.resolve('./cases/reporters/get_reporters')); + loadTestFile(require.resolve('./cases/status/get_status')); + loadTestFile(require.resolve('./cases/tags/get_tags')); + loadTestFile(require.resolve('./cases/user_actions/get_all_user_actions')); loadTestFile(require.resolve('./configure/get_configure')); - loadTestFile(require.resolve('./configure/post_configure')); - loadTestFile(require.resolve('./configure/patch_configure')); loadTestFile(require.resolve('./configure/get_connectors')); + loadTestFile(require.resolve('./configure/patch_configure')); + loadTestFile(require.resolve('./configure/post_configure')); }); }; diff --git a/x-pack/test/case_api_integration/common/lib/mock.ts b/x-pack/test/case_api_integration/common/lib/mock.ts new file mode 100644 index 00000000000000..728eaf88617e9c --- /dev/null +++ b/x-pack/test/case_api_integration/common/lib/mock.ts @@ -0,0 +1,50 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + CasePostRequest, + CaseResponse, + CasesFindResponse, +} from '../../../../plugins/case/common/api'; +export const defaultUser = { email: null, full_name: null, username: 'elastic' }; +export const postCaseReq: CasePostRequest = { + description: 'This is a brand new case of a bad meanie defacing data', + title: 'Super Bad Security Issue', + tags: ['defacement'], +}; + +export const postCommentReq: { comment: string } = { + comment: 'This is a cool comment', +}; + +export const postCaseResp = (id: string): Partial => ({ + ...postCaseReq, + id, + comments: [], + totalComment: 0, + connector_id: 'none', + closed_by: null, + created_by: defaultUser, + external_service: null, + status: 'open', + updated_by: null, +}); + +export const removeServerGeneratedPropertiesFromCase = ( + config: Partial +): Partial => { + const { closed_at, created_at, updated_at, version, ...rest } = config; + return rest; +}; + +export const findCasesResp: CasesFindResponse = { + page: 1, + per_page: 20, + total: 0, + cases: [], + count_open_cases: 0, + count_closed_cases: 0, +}; diff --git a/x-pack/test/case_api_integration/common/lib/utils.ts b/x-pack/test/case_api_integration/common/lib/utils.ts index df768ff09b3689..4b1dc6ffa58915 100644 --- a/x-pack/test/case_api_integration/common/lib/utils.ts +++ b/x-pack/test/case_api_integration/common/lib/utils.ts @@ -30,6 +30,36 @@ export const removeServerGeneratedPropertiesFromConfigure = ( return rest; }; +export const deleteCasesUserActions = async (es: Client): Promise => { + await es.deleteByQuery({ + index: '.kibana', + q: 'type:cases-user-actions', + wait_for_completion: true, + refresh: true, + body: {}, + }); +}; + +export const deleteCases = async (es: Client): Promise => { + await es.deleteByQuery({ + index: '.kibana', + q: 'type:cases', + wait_for_completion: true, + refresh: true, + body: {}, + }); +}; + +export const deleteComments = async (es: Client): Promise => { + await es.deleteByQuery({ + index: '.kibana', + q: 'type:cases-comments', + wait_for_completion: true, + refresh: true, + body: {}, + }); +}; + export const deleteConfiguration = async (es: Client): Promise => { await es.deleteByQuery({ index: '.kibana', @@ -39,34 +69,3 @@ export const deleteConfiguration = async (es: Client): Promise => { body: {}, }); }; - -export const getConnector = () => ({ - name: 'ServiceNow Connector', - actionTypeId: '.servicenow', - secrets: { - username: 'admin', - password: 'admin', - }, - config: { - apiUrl: 'localhost', - casesConfiguration: { - mapping: [ - { - source: 'title', - target: 'short_description', - actionType: 'overwrite', - }, - { - source: 'description', - target: 'description', - actionType: 'overwrite', - }, - { - source: 'comments', - target: 'comments', - actionType: 'append', - }, - ], - }, - }, -}); From 0c259102ed23878647c1bf0f5f2d4b5f73b6694b Mon Sep 17 00:00:00 2001 From: Kaarina Tungseth Date: Mon, 11 May 2020 15:42:56 -0500 Subject: [PATCH 53/65] [DOCS] Removed saved object options (#66072) Co-authored-by: Elastic Machine --- docs/canvas/canvas-elements.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/canvas/canvas-elements.asciidoc b/docs/canvas/canvas-elements.asciidoc index a25460a20eb50c..4149039a3f87b1 100644 --- a/docs/canvas/canvas-elements.asciidoc +++ b/docs/canvas/canvas-elements.asciidoc @@ -31,7 +31,7 @@ By default, most of the elements you create use demo data until you change the d [[canvas-add-object]] ==== Add a saved object -Add a <>, such as a map or Lens visualization, then customize it to fit your display needs. +Add a <>, then customize it to fit your display needs. . Click *Embed object*. From 4506ca1dffd586e5799cf1cac1cec248ab1e0916 Mon Sep 17 00:00:00 2001 From: Justin Kambic Date: Mon, 11 May 2020 17:15:51 -0400 Subject: [PATCH 54/65] Change default cert age limit value. (#65918) * Change default cert age limit value. * Refresh test snapshot. Co-authored-by: Elastic Machine --- x-pack/plugins/uptime/common/constants/settings_defaults.ts | 2 +- .../uptime/server/lib/alerts/__tests__/status_check.test.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/uptime/common/constants/settings_defaults.ts b/x-pack/plugins/uptime/common/constants/settings_defaults.ts index 82575e875577bb..b9e99a54b3b11a 100644 --- a/x-pack/plugins/uptime/common/constants/settings_defaults.ts +++ b/x-pack/plugins/uptime/common/constants/settings_defaults.ts @@ -8,6 +8,6 @@ import { DynamicSettings } from '../runtime_types'; export const DYNAMIC_SETTINGS_DEFAULTS: DynamicSettings = { heartbeatIndices: 'heartbeat-8*', - certAgeThreshold: 365, + certAgeThreshold: 730, certExpirationThreshold: 30, }; diff --git a/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts b/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts index a89e5ff62319d5..73d104c1d21aef 100644 --- a/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts +++ b/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts @@ -87,7 +87,7 @@ describe('status check alert', () => { Object { "callES": [MockFunction], "dynamicSettings": Object { - "certAgeThreshold": 365, + "certAgeThreshold": 730, "certExpirationThreshold": 30, "heartbeatIndices": "heartbeat-8*", }, @@ -132,7 +132,7 @@ describe('status check alert', () => { Object { "callES": [MockFunction], "dynamicSettings": Object { - "certAgeThreshold": 365, + "certAgeThreshold": 730, "certExpirationThreshold": 30, "heartbeatIndices": "heartbeat-8*", }, From 5b6a99a9ac82c267076aac5769aaa94dd8fe302d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= Date: Mon, 11 May 2020 23:17:37 +0200 Subject: [PATCH 55/65] [DOCS] APM Agent config: Setting values must be string (#65875) Co-authored-by: Elastic Machine --- docs/apm/api.asciidoc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/apm/api.asciidoc b/docs/apm/api.asciidoc index 93733f5990a46e..b26c7446b91d11 100644 --- a/docs/apm/api.asciidoc +++ b/docs/apm/api.asciidoc @@ -60,7 +60,7 @@ The following Agent configuration APIs are available: ====== `settings`:: -(required) Key/value object with settings and their corresponding value. +(required) Key/value object with option name and option value. `agent_name`:: (optional) The agent name is used by the UI to determine which settings to display. @@ -73,14 +73,14 @@ The following Agent configuration APIs are available: -------------------------------------------------- PUT /api/apm/settings/agent-configuration { - "service" : { - "name" : "frontend", - "environment" : "production" + "service": { + "name": "frontend", + "environment": "production" }, - "settings" : { - "transaction_sample_rate" : 0.4, - "capture_body" : "off", - "transaction_max_spans" : 500 + "settings": { + "transaction_sample_rate": "0.4", + "capture_body": "off", + "transaction_max_spans": "500" }, "agent_name": "nodejs" } @@ -124,7 +124,7 @@ PUT /api/apm/settings/agent-configuration DELETE /api/apm/settings/agent-configuration { "service" : { - "name" : "frontend", + "name": "frontend", "environment": "production" } } @@ -157,9 +157,9 @@ DELETE /api/apm/settings/agent-configuration "environment": "production" }, "settings": { - "transaction_sample_rate": 1, + "transaction_sample_rate": "1", "capture_body": "off", - "transaction_max_spans": 200 + "transaction_max_spans": "200" }, "@timestamp": 1581934104843, "applied_by_agent": false, @@ -171,9 +171,9 @@ DELETE /api/apm/settings/agent-configuration "name": "opbeans-go" }, "settings": { - "transaction_sample_rate": 1, + "transaction_sample_rate": "1", "capture_body": "off", - "transaction_max_spans": 300 + "transaction_max_spans": "300" }, "@timestamp": 1581934111727, "applied_by_agent": false, @@ -185,7 +185,7 @@ DELETE /api/apm/settings/agent-configuration "name": "frontend" }, "settings": { - "transaction_sample_rate": 1, + "transaction_sample_rate": "1", }, "@timestamp": 1582031336265, "applied_by_agent": false, @@ -250,7 +250,7 @@ GET /api/apm/settings/agent-configuration "name": "frontend" }, "settings": { - "transaction_sample_rate": 1, + "transaction_sample_rate": "1", }, "@timestamp": 1582031336265, "applied_by_agent": false, @@ -266,9 +266,9 @@ GET /api/apm/settings/agent-configuration -------------------------------------------------- POST /api/apm/settings/agent-configuration/search { - "etag" : "1e58c178efeebae15c25c539da740d21dee422fc", + "etag": "1e58c178efeebae15c25c539da740d21dee422fc", "service" : { - "name" : "frontend", + "name": "frontend", "environment": "production" } } From 480c1527c835b7f040e9ae969dc7335e1bf4916a Mon Sep 17 00:00:00 2001 From: gchaps <33642766+gchaps@users.noreply.github.com> Date: Mon, 11 May 2020 14:19:50 -0700 Subject: [PATCH 56/65] [DOCS] Improves formatting in action types (#65932) * [DOCS] Fixes formatting in action types * [DOCS] Updates preconfigured connectors and alerts --- docs/user/alerting/action-types.asciidoc | 6 +- .../user/alerting/action-types/email.asciidoc | 45 +++++--- .../user/alerting/action-types/index.asciidoc | 22 ++-- .../alerting/action-types/pagerduty.asciidoc | 15 +-- .../pre-configured-connectors.asciidoc | 99 ++++++++---------- .../user/alerting/action-types/slack.asciidoc | 8 +- .../alerting/action-types/webhook.asciidoc | 43 +++++--- ...ert-pre-configured-connectors-dropdown.png | Bin 92273 -> 76704 bytes .../alert-pre-configured-slack-connector.png | Bin 146428 -> 62511 bytes ...pre-configured-action-type-select-type.png | Bin 104497 -> 84001 bytes .../pre-configured-connectors-view-screen.png | Bin 94078 -> 49182 bytes 11 files changed, 140 insertions(+), 98 deletions(-) rename docs/user/alerting/{ => action-types}/pre-configured-connectors.asciidoc (55%) diff --git a/docs/user/alerting/action-types.asciidoc b/docs/user/alerting/action-types.asciidoc index 09878b3059ac87..e8dcf689df8e4a 100644 --- a/docs/user/alerting/action-types.asciidoc +++ b/docs/user/alerting/action-types.asciidoc @@ -41,9 +41,9 @@ see https://www.elastic.co/subscriptions[the subscription page]. [float] [[create-connectors]] -=== Preconfigured connectors and action types +=== Preconfigured actions and connectors -For out-of-the-box and standardized connectors, you can <> +For out-of-the-box and standardized connectors, you can <> before {kib} starts. If you preconfigure a connector, you can also <>. @@ -54,4 +54,4 @@ include::action-types/pagerduty.asciidoc[] include::action-types/server-log.asciidoc[] include::action-types/slack.asciidoc[] include::action-types/webhook.asciidoc[] -include::pre-configured-connectors.asciidoc[] +include::action-types/pre-configured-connectors.asciidoc[] diff --git a/docs/user/alerting/action-types/email.asciidoc b/docs/user/alerting/action-types/email.asciidoc index 81b4e210961f6e..4fb8a816d1ec90 100644 --- a/docs/user/alerting/action-types/email.asciidoc +++ b/docs/user/alerting/action-types/email.asciidoc @@ -28,27 +28,46 @@ Password:: password for 'login' type authentication. name: preconfigured-email-action-type actionTypeId: .email config: - from: testsender@test.com <1.1> - host: validhostname <1.2> - port: 8080 <1.3> - secure: false <1.4> + from: testsender@test.com + host: validhostname + port: 8080 + secure: false secrets: - user: testuser <2.1> - password: passwordkeystorevalue <2.2> + user: testuser + password: passwordkeystorevalue -- `config` defines the action type specific to the configuration and contains the following properties: -<1.1> `from:` is an email address and correspond to *Sender*. -<1.2> `host:` is a string and correspond to *Host*. -<1.3> `port:` is a number and correspond to *Port*. -<1.4> `secure:` is a boolean and correspond to *Secure*. +[cols="2*<"] +|=== -`secrets` defines action type sensitive configuration: +| `from` +| An email address that corresponds to *Sender*. -<2.1> `user:` is a string and correspond to *User*. -<2.2> `password:` is a string and correspond to *Password*. Should be stored in the <>. +| `host` +| A string that corresponds to *Host*. +| `port` +| A number that corresponds to *Port*. + +| `secure` +| A boolean that corresponds to *Secure*. + +|=== + +`secrets` defines sensitive information for the action type: + +[cols="2*<"] +|=== + +| `user` +| A string that corresponds to *User*. + +| `password` +| A string that corresponds to *Password*. Should be stored in the <>. + +|=== [[email-action-configuration]] ==== Action configuration diff --git a/docs/user/alerting/action-types/index.asciidoc b/docs/user/alerting/action-types/index.asciidoc index c71412210c535f..115423086bae3d 100644 --- a/docs/user/alerting/action-types/index.asciidoc +++ b/docs/user/alerting/action-types/index.asciidoc @@ -25,16 +25,26 @@ Execution time field:: This field will be automatically set to the time the ale name: action-type-index actionTypeId: .index config: - index: .kibana <1> - refresh: true <2> - executionTimeField: somedate <3> + index: .kibana + refresh: true + executionTimeField: somedate -- `config` defines the action type specific to the configuration and contains the following properties: -<1> `index:` is a string and correspond to *Index*. -<2> `refresh:` is a boolean and correspond to *Refresh*. -<3> `executionTimeField:` is a string and correspond to *Execution time field*. +[cols="2*<"] +|=== + +|`index` +| A string that corresponds to *Index*. + +|`refresh` +| A boolean that corresponds to *Refresh*. + +|`executionTimeField` +| A string that corresponds to *Execution time field*. + +|=== [float] diff --git a/docs/user/alerting/action-types/pagerduty.asciidoc b/docs/user/alerting/action-types/pagerduty.asciidoc index cd51ec2e3301e9..0468ab042e57eb 100644 --- a/docs/user/alerting/action-types/pagerduty.asciidoc +++ b/docs/user/alerting/action-types/pagerduty.asciidoc @@ -145,18 +145,19 @@ Integration Key:: A 32 character PagerDuty Integration Key for an integration name: preconfigured-pagerduty-action-type actionTypeId: .pagerduty config: - apiUrl: https://test.host <1.1> + apiUrl: https://test.host secrets: - routingKey: testroutingkey <2.1> + routingKey: testroutingkey -- -`config` defines the action type specific to the configuration and contains the following properties: +`config` defines the action type specific to the configuration. +`config` contains +`apiURL`, a string that corresponds to *API URL*. -<1.1> `apiUrl:` is URL string and correspond to *API URL*. +`secrets` defines sensitive information for the action type. +`secrets` contains +`routingKey`, a string that corresponds to *Integration Key*. -`secrets` defines action type sensitive configuration: - -<2.1> `routingKey:` is a string and correspond to *Integration Key*. [float] [[pagerduty-action-configuration]] diff --git a/docs/user/alerting/pre-configured-connectors.asciidoc b/docs/user/alerting/action-types/pre-configured-connectors.asciidoc similarity index 55% rename from docs/user/alerting/pre-configured-connectors.asciidoc rename to docs/user/alerting/action-types/pre-configured-connectors.asciidoc index d5c20d1853d421..b3e401256f27be 100644 --- a/docs/user/alerting/pre-configured-connectors.asciidoc +++ b/docs/user/alerting/action-types/pre-configured-connectors.asciidoc @@ -1,9 +1,9 @@ [role="xpack"] [[pre-configured-action-types-and-connectors]] -== Preconfigured connectors and action types +=== Preconfigured connectors and action types -You can preconfigure an action type or a connector to have all the information it needs prior to startup +You can preconfigure a connector or action type to have all the information it needs prior to startup by adding it to the `kibana.yml` file. Preconfigured connectors offer the following capabilities: @@ -13,15 +13,15 @@ action are predefined, including the connector name and ID. - Appear in all spaces because they are not saved objects. - Cannot be edited or deleted. -Sensitive configuration information, such as credentials, can use the <>. - -A preconfigured action types has only preconfigured connectors. Preconfigured connectors can belong to either the preconfigured action type or to the regular action type. +A preconfigured action type has only preconfigured connectors. Preconfigured +connectors can belong to either the preconfigured action type or to the regular action type. [float] [[preconfigured-connector-example]] -=== Creating a preconfigured connector +==== Preconfigured connectors -The following example shows a valid configuration of two out-of-the box connectors: <> and <>. +This example shows a valid configuration for +two out-of-the box connectors: <> and <>. ```js xpack.actions.preconfigured: @@ -44,7 +44,7 @@ The following example shows a valid configuration of two out-of-the box connecto password: changeme ``` -<1> the key is the action connector identifier, eg `my-slack1` in this example. +<1> The key is the action connector identifier, `my-slack1` in this example. <2> `actionTypeId` is the action type identifier. <3> `name` is the name of the preconfigured connector. <4> `config` is the action type specific to the configuration. @@ -55,74 +55,67 @@ The following example shows a valid configuration of two out-of-the box connecto Sensitive properties, such as passwords, can also be stored in the <>. ============================================== -[float] -[[preconfigured-action-type-example]] -=== Creating a preconfigured action type - -In the `kibana.yml` file: - -. Exclude the action type from `xpack.actions.enabledActionTypes`. -. Add all its preconfigured connectors. - -The following example shows a valid configuration of preconfigured action type with one out-of-the box connector. - -```js - xpack.actions.enabledActionTypes: ['.slack', '.email', '.index'] <1> - xpack.actions.preconfigured: <2> - my-server-log: - actionTypeId: .server-log - name: 'Server log #xyz' -``` - -<1> `enabledActionTypes` should exclude preconfigured action type to prevent creating and deleting connectors. -<2> `preconfigured` is the setting for defining the list of available connectors for the preconfigured action type. - +//// [float] [[managing-pre-configured-connectors]] -=== Managing preconfigured connectors +==== View preconfigured connectors +//// -Preconfigured connectors appear in the connector list, regardless of which space the user is in. -They are tagged as “preconfigured” and cannot be deleted. +In *Management > Alerts and Actions*, preconfigured connectors +appear in the <>, +regardless of which space you are in. +They are tagged as “preconfigured”, and you cannot delete them. [role="screenshot"] image::images/pre-configured-connectors-managing.png[Connectors managing tab with pre-cofigured] -Clicking on a preconfigured connector shows the description, but not any of the configuration. +Clicking a preconfigured connector shows the description, but not the configuration. A message indicates that this is a preconfigured connector. [role="screenshot"] image::images/pre-configured-connectors-view-screen.png[Pre-configured connector view details] -The connector details preview is disabled for preconfigured connectors. +The connector details preview is disabled for preconfigured connectors +of a preconfigured action type. [role="screenshot"] image::images/pre-configured-action-type-managing.png[Connectors managing tab with pre-cofigured] - [float] -[[managing-pre-configured-action-types]] -=== Managing preconfigured action types +[[preconfigured-action-type-example]] +==== Preconfigured action type -Clicking *Create connector* shows the list of available action types. -Disabled action types are not included. +This example shows a preconfigured action type with one out-of-the box connector. -[role="screenshot"] -image::images/pre-configured-action-type-select-type.png[Pre-configured connector create menu] +```js + xpack.actions.enabledActionTypes: ['.slack', '.email', '.index'] <1> + xpack.actions.preconfigured: <2> + my-server-log: + actionTypeId: .server-log + name: 'Server log #xyz' +``` -[float] -[[pre-configured-connector-alert-form]] -=== Alert with a preconfigured connector +<1> `enabledActionTypes` excludes the preconfigured action type to prevent creating and deleting connectors. +<2> `preconfigured` is the setting for defining the list of available connectors for the preconfigured action type. -When attaching an action to an alert, -select from a list of available action types, and -then select the Slack or Webhook type. Those action types were configured previously. -The preconfigured connector is installed and is automatically selected. +[[managing-pre-configured-action-types]] +To attach a preconfigured action to an alert: -[role="screenshot"] -image::images/alert-pre-configured-slack-connector.png[Create alert with selected Slack action type] +. In *Management > Alerts and Actions*, open the *Connectors* tab. -The dropdown is populated with additional preconfigured Slack connectors. -The `preconfigured` label distinguishes them from space-aware connectors that use saved objects. +. Click *Create connector.* +. In the list of available action types, select the preconfigured action type you want. ++ +[role="screenshot"] +image::images/pre-configured-action-type-select-type.png[Pre-configured connector create menu] + +. In *Create alert*, open the connector dropdown, and then select the preconfigured +connector. ++ +The `preconfigured` label distinguishes it from a space-aware connector. ++ [role="screenshot"] image::images/alert-pre-configured-connectors-dropdown.png[Dropdown list with pre-cofigured connectors] + +. Click *Add action*. diff --git a/docs/user/alerting/action-types/slack.asciidoc b/docs/user/alerting/action-types/slack.asciidoc index afa616ba77b3a7..5bad8a53f898c4 100644 --- a/docs/user/alerting/action-types/slack.asciidoc +++ b/docs/user/alerting/action-types/slack.asciidoc @@ -23,12 +23,12 @@ Webhook URL:: The URL of the incoming webhook. See https://api.slack.com/messa name: preconfigured-slack-action-type actionTypeId: .slack config: - webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz' <1> + webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz' -- -`config` defines the action type specific to the configuration and contains the following properties: - -<1> `webhookUrl:` is URL string and correspond to *Webhook URL*. +`config` defines the action type specific to the configuration. +`config` contains +`webhookUrl`, a string that corresponds to *Webhook URL*. [float] diff --git a/docs/user/alerting/action-types/webhook.asciidoc b/docs/user/alerting/action-types/webhook.asciidoc index 27609652288b5a..c91c24430e982c 100644 --- a/docs/user/alerting/action-types/webhook.asciidoc +++ b/docs/user/alerting/action-types/webhook.asciidoc @@ -19,7 +19,7 @@ Password:: An optional password. If set, HTTP basic authentication is used. Cur [float] [[Preconfigured-webhook-configuration]] -==== Preconfigured action type +==== Preconfigured action type [source,text] -- @@ -27,25 +27,44 @@ Password:: An optional password. If set, HTTP basic authentication is used. Cur name: preconfigured-webhook-action-type actionTypeId: .webhook config: - url: https://test.host <1.1> - method: POST <1.2> - headers: <1.3> + url: https://test.host + method: POST + headers: testheader: testvalue secrets: - user: testuser <2.1> - password: passwordkeystorevalue <2.2> + user: testuser + password: passwordkeystorevalue -- `config` defines the action type specific to the configuration and contains the following properties: -<1.1> `url:` is URL string and correspond to *URL*. -<1.2> `method:` is a string and correspond to *Method*. -<1.3> `headers:` is Record and correspond to *Headers*. +[cols="2*<"] +|=== -`secrets` defines action type sensitive configuration: +|`url` +| A URL string that corresponds to *URL*. + +|`method` +| A string that corresponds to *Method*. + +|`headers` +|A record that corresponds to *Headers*. + +|=== + +`secrets` defines sensitive information for the action type: + +[cols="2*<"] +|=== + +|`user` +|A string that corresponds to *User*. + +|`password` +|A string that corresponds to *Password*. Should be stored in the <>. + +|=== -<2.1> `user:` is a string and correspond to *User*. -<2.2> `password:` is a string and correspond to *Password*. Should be stored in the <>. [float] [[webhook-action-configuration]] diff --git a/docs/user/alerting/images/alert-pre-configured-connectors-dropdown.png b/docs/user/alerting/images/alert-pre-configured-connectors-dropdown.png index 4e6c713298626f4f733e9e685815af168a95f77d..081688758eb484771277149e4a93fc5f65c8ecac 100644 GIT binary patch literal 76704 zcmeFYWm6?VyDW;kySok!gS*?{4DRkS46tx_cXt@v2Y1)O-F@LK+~M%b?dpi?Xkyl>RD-QBMTqw zcZG+lHA)4dNDY+|4lc?N5An7!Wn|`pSaY^ z)3={L@1VqZNx`Ua_I?Ls=OJGEf`LrB)l*@?W(iNLOOIqz00M(B?CE5Ks?<~J`zF+i zn)?VT3SvaCdpTh7)&jYVm|zz)WtNAx9OQ8iOyT;}5cN=C#O#CM-snnT&QOEmzg%b; z*#1JIoNQm4eFSm%_$Q4_5cQtwsEeVXPn7U>T7O#df3zGN(Y=_i^oe4QQS2pi4s>sh z=Mt38uxF`5R$G|>cSp~5gx3m>53omC<5 z@eJjOMr6|?w+i5i%gVpjr%MhSw&kfbPue$maSn|hSbAEzHLGZqdrgWwmuL?COqChE z0Q%|D$;oH{qg8H)WM|QA#V3<3N2Dw4S+m5@Y1_A@{)DR?IYQRgDr1mT9gWafjP~z+ ze`wJ2@atL;OGqcI?o06~42DCVRuoc7=|LY<5QFEh&y%JjC0sO&62Zf$s3GoPOs29q z9a<~#=yN96UY^U=iV;-AJ_=^I*Feh}zuo8T28fX8#oPD_=w#w%Y+b zR3V5d%u6eoca%k<4n?C3H{$JM~HT%Ge2@4L|tn#L~E!-wXfx zEDF79uc8>#n27E z7??5|sdrf+uR^b@E7HPrL+7s=gseP{u))5Uj#4{JLiQLG9@@7y`NmK0UhQ)6`@Jf6 z0uzU>C(fTkn@@pe3hS_b1vJ58=1l!oAg<+5<4^-e_bI)QSI+%o@e{IN;8Q{KH!0X> za(8#P`1WrVkl^Mg5tz*~ca9G+*c~NUcFwfs=*=RZo(DPDx0wLPWHwgVrC#u*eHeiN zQaFeLBdl<6crxf8!TLCT_l%HgeMqdh$^PthNL4T?MvyB=%|ZG`ELKoqz0OVqdSGdN zu1>f$xhNor-$CyAxT0tnV$yiwY$gFK6jR}ZdofUC1u|F|VZ~(DGBgyTSffa0B&wlR zBHt1eWSDLUf1&ZlW{a=IuaAlsV|v7Ri?Jn#669Ny5%VG4ORZW_W%?_MaLm$Mk?TY= zi!#g*{H9&=Cy{2!U!HZlgI)^)|AA;~lA4Zq6yscn$A~@AYqr8zg~c#pQ|DQQ|1qUm z?^cEQ8jk4r3AG0it$-H-*m# zE)T{K<27d31>42)&fd2D%>qQPNO}J_Cr^+Wrm{>F zrVkyYJWP<2v6bbQm6p|%AudKWV`_k2jUkd!q?R9*Jot5ka)W+@eZ%pKMKaAq{<>sP z87kR2xg?n>*z?F3CN(uRB{gmdkEwo%s2ZVK zP{*=~#Kx!iWIo%9Xbq4V*c{v(;}-3f^$@C9x;`6pTz)6;g5k;Z4)qTH9>gW?RmP>M zn=h!_A=e@L8u=hk92r}UqH9^GSfJQ8C6pu2r{9jH LtmK~Rka8)ynbj`niPW|0 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

?woHd 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 literal 92273 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 E2e9M;vj6}9 literal 146428 zcmaHT2UwHAwk;h50Yw4n0R@yQ(m@~;DI!e>y@-_1OG596h)Ro8g#aqjL$9HC0!Zk+ zsf6BZ=)8FDx%YVP@m;=;C#P}tJ#H;sa|V%$Dx`` zqYw!IfJ$!00Ttc}vA> zchZQ&Hi6M6THQ0L40s;-zR&Hc@+p8t_q6EfS-&%;#`SQ>;FAFeNgfhBW3>>l>FQL* zzkh)Z?x|xMVC(_WbB_1#Ux5yY6eQX3?$Q172!&@*>;~cOylm77ufWom)tIIG zr&bd!^0&GiLuRZ~^6Nv8kVT&F&{ebUI2D*u*cqJavB))i!oK zwr`zZ^YkqK{f1K2o2w*M)aG)q$^ECQ`pZ!|`yFb7HyjneCxE+D@|_>1D%|9*omb9& ztGnb%SX!)2!-`ny;<81x{t`JVGxZH_m{9oek*TmH(f8|XGRl5US*^sTo9!A3*Q84` zRPM7ejaozk@6hBIvDEP;+;dp#n9A~Pac7(#AA%c3%V^Rrz2-gCzmeLrzaZM^17tOY zIRrg6PN7fzjJ~DS|10`EXgQ2N8^Tp16AIev4 zl-SO|)A9>jEuW`$cOP?@a#!4P(W0U64$6%nRu1#J!~RScdWscY@PdsJQg>dk%V9b{ z)m(FHQE66ndVHhvD8x913u<#H2f508vt3(MnpyK)y9e;}M#oPTEoW}$SbRDgt)^|5 z)c8SYBZR~@D60RYXqdn!_I!}W!QW?p}6Mr^(McDfIO2fc|4eu(Uv9VEc-a}_cX7-91&tY6VEszE8;4U6Kt=|B( zH!5Z7%Z|r05bByB^pJF{8Gmenj;v>7laentHR7)2-*=vG`qVon&Kt5c)HOSrBm$?c!YU>rkB4#qo8u>{Yoqw8sk6L~DWoz1f7Se= ziA2k$sY{vF-ZqmqixJTBPI5`ylAlejmGQgY@Y7Go59t?q=(UnI>|dlcR6R^RO20zC z?m8y-=cB!q|K1%#EX*o7neVVTKq}pg`Q}nJzIE|ljq6(k zC2Hd6)r#na+p}7y+cfr^zxB-_ZsTZHa4PNjmD`cQr%0EY*p~ky&Dzr>#aP*phfmz7 z%J|55(uC8P)@ZY;)>WhOs0v+TZZrFG*4fHZc*^#TMp_?>$@{|ULX=nZCc`w=>&UCy zi(-RuGkuzA61qvTxxTS2Ilw}|k}WYJVG6w`O@) z{xO1Ju4O|qIvUpJj6;n1Y$_(C%u6NRu=n^rmPm$Gjp zxV)Z?e#~)iTd-|Udk1dUdOv^jN`PI$(!O<8DMIPVOZ7O-q2q5;->}{6-Mn$rT~tic z(2elh@weTd>he4gec>BYcw1&v1kHWh<_tMnr)y{^< z?7Quyhh+C(`iR!2d${;{`iW<>S+oVSlhGh(JjgG?d0+QGIv3Wre%yc1Z~AHS0r~C3 z$l7*h_pD=(zS7tm1a?wra=Ppc5(o8Kj)M+EsGlBiPR7N@_i@udbBUKySO2!D8<2xY zAL5Tpa8A6tcWp2GF=35mQ?8r#cZ0{@sZqr}R}V$)*BS{L2-I3S>@|n!H2n4N=pV0p z1V{z@^xyVH^ObdPug^?RMxCp*femtOZz$|g&R`){#5DSE>Deh#gkK5puy z|2XG(_k8EXlXHr*EH0JeoX*Mct>A4zCo@c=-R9TgtXD((HbpjzHW~E$^chz+$AYv? z2mIZJL$xE&)l-{xn>ZWsBvOI-Mg`X=Ki_xpsuVjJb{Kc_>}5Rz#Yt`Ag~S)9gordIOO_Kd%!aJd@l(o`ECoP*th`@i=nxawqvVwmZjLb_|#l5$m-m7ditiTiQh|q*81MS z@w3K*u-%AFwg$QMlZ5kCqwSIYZ~e3u%uOP}(dT}}g4M-ZJ@LDGCivH>MD7xXj8FfN zWhch#w5bWclOwyFN2HUX0U|r+M#xg+x8Dl!^U-w~m+ZouAdHx0Mp0%YnjF3cgw)ni zUynu!&&-aPiun9u4_I0Ew<5vIV+au}YiykJ3=FiWYPNPIbaQ%t8jyFJ<1v%d_2*yL zm0wBzAUzRJ{20QzzO2=Pi!83WsTx7?@aQ;y|Kh7Xzqf;jho51uXXs(5@l49f)mgyO z+V!Q4fRD2q?rJ=|$39ZHLuVTgOMs8FlM7VJM~34cS4iQGe}62<0r*8VQ!|wvU`(F?F@8>AlK&>G5ZXWioE`Z<9wS4L7=^?|x@w=h_ z`T4JY+W6T2t0focKZk`Ipy2N_f1Eckl}e+=or?DdaNaR!qme=PVv#+M}r zStp3$=7ZT@NlOp+PVjqj@bCy_a4+}&>m7HDuM^Qs`@<9u4~VCxB(LX#zcEYtk!f@^ zVz+#&!MpZB=sk(oFCMZy6AZnfaP1n=@d^uJw)Zok7Ye2Lie&f-l%gIFZ#b;ncppu9 z2Rk=D_qA+Z(p$thT4ZX}tMDMEe8{8kTv@39GH|Pb6C`!*76BO`1n)myL?VILLQTsh z_Sye>S|T(qZ~jUtoY{he=mroE|9`)vsD%KFK7Bs9^S@90?*C`ZP&h{q~ zr8lc&1T7}1TxX**>?in-p8W1z_&x1yU{R2z>BHB;s?xC+0edIn=tN)=hc4>7oh!_z>^%a#@cD4-+mH9*LkuW z*^!TlEas}yAc8dB*#4Up!tcYNfaM4VmP*Z}p;(u%U)$Lp`z`!2_w>O%1yG*!#`gF=pHHRG@U6xM_Ej83D!2H^q#p z^y}~bWhve+0zQJNlh{_yIc{3Q(|WIVwU*Hq&wr)lO-a%BtOgCfC58xnI%>OK%}Wbu zyz~E=sviW%nbw-AFbTr^E$*UP-~8yg&y%Ux%ze%xIiylNh;o5rFgM_;?b)(Az~HTg z@Yc2eSkyOw&Gh#NZL=P9e`=DtXgGQ(P{|>{u!C%?w=x58&!O_GX7hjjnu>ros8l@N z>dLUKqvnLESA!Y;@}$o&B8O`j2*t1K_ZV6y>n{hTBuvsiR^;V--2po~$rXH!?5GdI zd_852ZWn=NDxk-IvHa~RZp02`nCFC*&q9EB;6+z4PO4q{i$rr_eZg<#jSEg_o`ntO z#1C(kcrqVZEiqS1(?Zf2i~lyg;SX-mphlV785EBm7Tqi9n-$DSB%P=m*Ava= z{Ux+1Cyiv+BwvUsxv3f_ScZ_94>Yp@BUuL^uyd5r~IS`cHhjasPfO zBO&tiwY$Jq_4=A`T5S@JWosl}s!G9hXe7BLi=`+{bgeu~P>N`O%aC>D=SGW}>woK7 z3UCZ4a5oCdo(gI(%1<&>g?}HLj3suRvliB;q}MuN%jv2KtY0W>MH5IeO|a(&qL4cJ z;C}B28Wbm)uj1c&rW!f`EGn{ucepb28S;nmmR>G6WztW8K)&p07VPwq#^I()93OJO z!yB6MZ=obf%>M@9x4j8*>fL-841rWrsJHyN{>MB*6IaqAKUhGRHC==L$jO zM?*G5Z;|xZ&OL7?h8&VF(8!xUe*zWvX04txuV2c) zL>Bhrrh#WFO4Q||%ia^thI+#D^^yM^hc{0Og6qjA`M;S97#e3MLWc-cr=FVmaeYpJ zu84EL>ULCIyKImg#6^-5R=)7deY=YXg9t$5Iu>1$FQ?;N_7spz(8Kq)8EqjaB1AH_ zN^rl})E++CrBfGi8~&_8e{Msu>@???zZT(MtDs^YZFDCG1ko1-?~g^yZ1_^ls%Wz> z-|_it54G_HVf)W3DoiSF>NNC7Om8d=AMMjMT;vxlY>12*z**OM7DRG~yLm7hPN3b7 zsoom;g{%1>)RUJ)5Y2b=f13;i9FRQ~74)Q-vFGp|2KG@e(qy@IH=I92>rcoY_7xuYEz{6Kt2Perg4Yi|R>)$${&W2yTQB0=!GFWJQ3Cr= zcy#QVh6{`&_0WI_JR4`h0jQ+Zj5aba;60jqJ-I+q|jyJa?SfVtq9}P;8>JzZ~6!}oR7?<+IkUcdhhuI+^V+R zdc_$7m;FEdD;dUtYGGqemwa(1j@Y&8kxW#1V8d8JP$j&{(rCx0a!uI0-wbGD-pR+3KIA1ABDRG3w+MdpKzDm*h)Nf3c{~eFZiO$^Q7MHC(ll` zi@DZ;IzW@%9@-H#7VJ41`uwm0#M_=%9eOCqhku6{V*mpR3F~ta<%IQKU#Mp>#aoX4 zwB}Z?qZf}f=g28vq@f?{cqvqTC1GY2CZ%Uja;LI!Q3O^HWf(t777CBY5dY034iK9H z43ZzBfe2(i%L4fvjfQ^w^1$ZUy-_Bc%67`59|Y3g@aYv%qe^)e4yjzluhdB5$mBKU zQy7%2{%=(HHUj7gNWLGjA6B&^eZ(`z2itFxnC@q@9F^-NkPO~ym7v%`tmYS0auw9d zd<8-E*;N3`>bo(2;cwd42{;GszN_~`a5OH2zqC&HDJ6z)V4nw5FH?Wf5sfhZrR-Ot zqhHwV;0Z7=y7?hoeMPb8PNUn*-T#Cd?F|BRK(g+gWl&8=Wout{3L!EMCpwncEF+nN5eYriQw_YE?Ph-9x{ z1d<36G(5^fi4l1-%trZRBQ`qM;iAVLKwsUsV9Ev=T$9Cc=onSJ1`6=XGW`|qm47c3 zGJbWyGO_bq2-PGHCZBiFsp)lW`beP`5hSS_M7{Po6t3TM5+-#6Mf=_RJ=5QSG*|v} zC$LD$x?I?2)MXCttvv0b>uCe$HvuH)!iL4GHL&Hj`7TcSn_&Xk_-RbP{gA2>5AWSF zpKfw*ffR()|Ibz8yb)c-B!<)}Z+}k8mD(|AZF_w?o^i_e1diJZKjFlXDW%aPcMbE| z!O=jJQ8-*KmoOCm?h*Un*lsOQjn7$|w9ZoQ-PFW|)vyh(^bk6>*b02}Yrf`cNCglopbuk*2kb{-m z1hY{r)cd*?5JR5FO}Lz`vKg@BkhE5SW?#i9`l%kFB#GxkPaKNg_X<@N;VKx{dusF~ zOK)X9`X)=bRDR#t?0i8-%rFslUYWOgy3+aX=5%#@49k?-atzBi$7HIZMzd+IV-d}F zf9|Jf{+;E_nDNtMnon+B6036!CJmZR4xl_ZWa|FvTw&_7J90(l%em|F-9U7)SNW}D zd6UELSD~g3ca|eO^Fra2KYrjCL94{slc6AyY^a95vv$NsQM2f&`vp3Ah_|RX8{XM2 zpD$386pj1q>oL z1c*CNQI~adF^%#j?6=kA={61&I?S1%_{;{D(%HnzYVWDRjZs z4x!}P<6;HPv$#m*daeQ@NZ(%b$qk|#C^r0pHzxH6y(9sPwEA4J(`4|t085toGSyI? zmH+BMW1+rVC2axbr9%MzS=ZNGDp@^-cWTJXg@Kf^r-j-GSk0w(PsZuN8qbBFccufH z^yeSZMCfCh65u9Ax4+2XellaHbN%ic$nvqtnwgD(K^%@7tp%;`@XWNfN=VyyhQq_1 z#IkT9a%j3UWZ&!c<(466@sKSU0fR~#dYYPkEmDX9qAmAuA@&pQ61!C%qZ(__USpki zr2_&zlxebzk+L<`d|_k%NuNKdJAZVsJMzvzb=|@CunhA1zY%0i1TatmnRI>O89x@N z={Q^ewfZ{{?Ygx_3Nep1J-nnt8O8It4gocnGxgPQ?uPenVv&MNH)NY$7dNvXeH8IR zU){bx%!BZyFu0eReY7z*39>K}W!AmCW;hB52^ATFmITl#WmK#Kx@Rd1zKiq2zux}~ zecl^=7WiVS9^rljU%QPu8Flx1@l_jbTNx}-@ETe^^}Q={!6Vi>1dMMA`bsT1J53BJ zVv}^{xUD8)#0lF!$L+?@R@##H1(Fm=NTv#WB9g=H2eTEvJi3<@2@b+zCz1L!p<){j zUQPWN^!5ZAcuYxg51f>8Lpljw2oqtt>aFS(F%Upd%*N`YUP_=-+d zcR|!}+J!s|8HSkxhws|f1nLz%4wo-ocT(nL>QFHJhWF1tKXmclYF#XI>R|L14m&-B zHBMDC|C{E6i3MtWF>QS9o}CB&JTWXDmE{m_e{PcsK)D42aP8C^qKmW37wWA%0}De_8u z%&86z9NT70%q4-UC;2DdJz!5hAuX^<;7leitbFL8Lw>2=b6x6+tXb;z0-@H`V9 zP<;O8PbR#l2oOyu=k1B;k+A3_h6I%?6<=>m_Mvq%$A`N-)%$M0mV}5K-swy1S}mZ! zRH)@|EsptynttuhCxN(YEL7wQ+(dQEex^#KO)PV=$=ecC2!~t!_}vBIk1nIgS-boL z1_L~5;a>jZz@EvK0>$ywWE(;KKeZE}I@z})25?3b4u85|OLwYaxA^CywF^VxpgQD_ zK4QqIC45%Z53sxqK7rGtPG}+K00WyqlzljJD0~%%Wk7ZcKI7V_bOJ`4Vkv9N>y-B~ zCj6)VXF;6`;-_mNjk8(78Cy@b@&5$n699~{)5r#{F`Rt?6aQkWc8|ur?aS#;V=3b* zpa8Oo#50HuQiYZ_G6dvId(7_u1-{ZkM2s~4p^zBo0F_b~w9*=z&CdNC4-;L?q^i(N zKl7n9_sw+Kg_ro;&s@q{fcEo6&YE4N|F(ifqJe&Qym62gKvoeF;(6qn zc8T4XGa6$ZsUt25iFI-bo!n3Eeh;#78K7dS5BoP!$XFS`7qy?7J5?2MZ4oET)erCw zJ_E6c#zA!qoU}v3MNHd3c5CM{i*%h}*cL>Bn`V!cd>&|AhrBAm<4!2*$r}!+U5B%yudmEo1YPd;S$DBiB~ywsr!+>I6s$yG>o0_yCgc9JKgFQ(VKm6e{>w zz&g^Bf_Top98Bq>f)}cA%diZgwIr-UP>UWkc3}jzJ zj0h#i+2D>}9cUqb-KTXa7q$8gb0%O%vllsMHSeWnA5?ZbH~_#n3dTr34im_4G3BFy zW+H~HL1rIs06znW&Od<08D>oUJl1D8uzKSUH{bUPd{~H;6LTx{lu^+ofsC8U>2KW$ zHu!OR9=@FubT>`9I;uRF^75=_=+P%p*G~_B_ra=M zcU+dbb#n;*BcC0BQE{OCUZsW%4V5Z88jFE6%ElIW0!}WFjhJCdEUT3OnmP=BWdU8)wdVmxXeROdl-=r=u z{p{>$)8@c8^P5?nSNGx3e6q!rEt66G1d|9ml3hr6ck5c&e4~F(u}kS<_k4eR&1F|? z3ybl_&7GEif%FqD?Tm+LZijB|qHkqoLu>PoxaiA}mCkXAuA{V&+7>z*T|TsGD-0DTZQfY+Y>Cfs>}ww=n*Bn0w@Fa;Lt|h; zYQJX6K{m7J!4+}4?CEx0*_g3n+`5Cb3Z#n}oE;zz@|tdtk|+;$^Z9YvH0pQ2oe{uA z%9Si$Ud!bdN00YfPz~2ZFwYntI|A1!F+;E0I(LrtgXKC_}nqt3zN{ z77+yG0wbMn=plx9$Y z)J z4wD%Iz`B905?AlfwTt|#T_DS^P0mL(PSbCqkRg4ZV^|M?1kTnrYSlZ|Z&c6AddeVv99^yEFqB=y z)RAnhBZRe*_t7%aB}I4WaBE}i4k}G_?XmB#cie=rycwq?6sCrh6moq=9JtU0^-tF{ zRstS&dHN3n6xW}oFrNi;a|ym|@ElLX&inHsorEjX?v_BQC=Rb-Hn!0gPL1ISNky7L zt!LYfoCX%qwEBZR-fqw8d9O&ZV3~)=nK}?-Py2yGxrEv(}?2-;C*@RdbrF1}Ga!%t3O|A}>WXHBxAN z4sdI$etPmvgVSz-W!a!I)6;F)2Ad;<d!9gg+o%+h@;Vq&!Sk*Z^7IGbq5><^4Vs$Q6^WuCg%Rm z&ws?F`|Sx$+OGc$^;}(+Sj61I;lvKtM`@>~hU;vXsm;5qzilxWhz*q7hz-_E@40f3 zJDX`*OwjFrR@7g4;u4o|8_x8*%MEN=zf%TfL#tPRz_55oy3H_*Y@ zttYybO1D51V@}RqDcAUFt!S^`S(>+S)#PVtv9FdnnrV-! zXnV;CkZas&tnlM6PYzj66=0Ebk%D7BJdEK0LZ7Q6R zIFc$QM;<&FhfcWXr1`~}`n0SZ=n^HZ-$JDYw{+|c$Q7h!PlG4Gg@&aHL6^N2r0A>B zXH3yBN!CY^)jo{qyvM@fURN8nhCnsu zSz`dT@lZ(rzs+R|PN&03SH9Bv{U+y27lsLRxRB0Y&!qTDy?#0!7o%6p+7e1k1RdQx z-NMc5YK6TcJ1K;EMKzz^+#_$+^Tp}-0`<84PAG3NVp3A=;BD^-OaI9OaOyp*R>r5tzVFXP ztloT2mr+R)Fv}n14zx!7Xem1>vFNE?N5nV!YxW*(G+i#4e3G=v{+=psktATk)8LOy zk`E*4IbAOnOugEpXI!dX5nl+1q!UcCmwH;L0X>`$?w8^&>2GPeN@ET(EMXiZ@kM#b zUj2}SF4fw$LJwq@`z!!BxA~#PFN4WZ_?N|)o6O}drEm4};R(G(&kS-O-jyQih;#jy zXsdD!@x;TiUWDn>tNMc<-vmNU6*G2QpG0EL?B_`Z>?8SuvNV|LYCOdhmgp^l9+WSC z|G+Bsv_!P83NV!~t=m*wJ?{=y7F`LWp5acD(#N({9Z5NkpZU|*G;^7vk^x*7((b)A zr9+u2)L866^}OZ>aC)G?0AHg?bxYf=0jw>N; zzaL(@gkr%Nm&s0*qe7_BThaMyH93+Q51(QTyEcyJjRmRobO$=QV4cm<4#N292hth&ej_KAT|BQJKOag~FD0Xov5Xiy-7uE{>5T-$hy8q6zk$_XbyifNBA4S|otiQPbf zQW*x+Bz|pqbQ$BjCk^D1>xxB>czD&vYoNEEvO$EweR0m!)04BhYrPoPMz=(symiQ@ zCLr%7>j)mVXYH>&bHa>8$&=mPxQ+DzC z_^SU}kZ2zp1l0mL1SLmOQo@~2R~ED|$G0?-IwF&;r#Y=Il1wg*S^Y6B)>(<01BRjS zK(?+qpK?Qxeo;JSz0hThN#%Rj22<+p+6);L|8&n!m)jGWi}}2Q6f*ZNkmI*eqDR71 z6qv2E>Dfo8=aFTy+vMsLOzeV?EMhx+1JqgnW~Q;z5ItFI3Pt#5NcW?g&q<< z>!v~3=UT?oqmf3G%OanK6`j(;z3E1f57EW2^5NBvLuFJXP_CT?xUit z&wh=j=*@Yp*EH9f(jz8U=%*@#Jj-+_NvRO59fBA1cI!;}*$x#Wu&&lJMJgGEY|Z_Y z*V#du&ii9}8$Tmh$qJR!**Ht9pjj?#$aR62KQ(czeRi#r46||O(_;_rX}Y>lSW{UP zam8Pnc5PsN*uUDGkmho-?hG033)V1-KXa-gFFjaJ=Z87I2Q%ZK8f0nM^zJh46!a|I zkR3Y==PdKn2uD=wTda;{)glXnxBCv$FVn~ zZXH)}uza=dMM;ObI-BH%BH>)qIeHma*DqK-Mwgo!gZ|S4!hq=K!e^!3{#rOwX}4uL z*G90Rkl1$ipl~>`N7Y<7WNc&fsM<}F7eg)sqbRUT^}!NNy3RLf;Pi#ZcOXyOR z(OyqMaaIuAkal{fu$mlEckqjXvoa4{6?DPpB#oga?UkC+nhe-f+1eLuMA^AGaaRre z+U;VcqGTgvV=miCI|>$uRPS&#MzHRYGGqtt8(n#p+x87EA*jRkKN?NE_@cO$a5+;> z4AIz)Y9m07IF|dCvpn*7OW}{5f>P6$P5C*-93P6$PaqtnHf*1pBYeH!J&)jAE2OVaY5Ql@x^2N5=!ewJcwAEKBOx*~R>mAhKI5p@<}P|ZH}@!;s^V}( zu9BEz3~|s*7{tqRD-F{>AWwUaPq;yEaYif=Shi%LVz089N2sEdsZ;vF!j;wA@pNnN zC+Rk7%CR`nGkmPYFzK-_qMBZ73GqbUp5P?XFur3*oOX)zPctg<+~=_<4|SW zu8;I-JGA-+T}EGW)_NBVF?epRM9Iz}R@b(v&YfS(o6=FqoNMjP`LhvuRq}M^WcZnm z8ToHE`#F|*|5D58W^!$$HDntjwLFDVQ(#io7;t!GbnG>mMbDXfl9W{B6&5oQa&L9m zC=(seold4N7ASX^8U>CEGHv7+v@qg=((%P_nMrroDxOwMEM^6BLy)kk({G4P=GCs8 z?F>f%xG!J)tb;DJ%_89EWR%W}3zng?);i2D3JfM*b4OhK?Cd*I-DY$RV&wS3b#?Ua zvG>z*i|cG}|C|b6UKkB3v8JT2?zx=H{@96pYGEHEinGc{Cyf{)kPekk(??ADGm1X(0zq-m@>c>kgTKS{=7Y+?(a`Pu; zA8Z&G*E~DR8J1@%(-;$+^&F3-bZY!@zTeJcbl%PLIX&of5}4s(Cyi4QXtfu z$?3)T?9un!=2WRgM+3>ET4*2v(y^F{cY&MeY`A=_>Dq#8zwxeZ7-T~5JTD%Eo%~GX znYOVncf1`D`m}l6+*kg$vZkPAliB1V^D?4Ytbick=Lwi#eJI1<5HPOSFJS@zgQE3k zKd$THv_Yk&Hr*USnAmACeX6sF#Q3!9!NpM1Ez!V`3l{gQK&*AtxhYQFI$`34`S0a{ zF;T(=1wZ*JE|1%=Wid%ki9yMxeoyx3+8VFAqx&8TpPcz_HF>5wJ=C58GiYZs2!zG{ z8_9o6uSx{5w1k`aK7>JS+-k>C(oW+Ixg?FEmZhxw5)9BbV@hN`A+9Rg7cRim5Z>@$ZeFRy_ER+CU;-kfr z49qXR3ybow+V?}@v%|6Fbm~UFSqR~p>VuWBN3_o?5BtGa7A!{veKsG(jOKCLiOsC% zm|7sSOJf!E8{5u5Ba4JaDJ0ySy}FCF4heXORD8Kqv!InU@*&od!n-iI&$)_H%!cYr z`tAiZ<)tq!z4Se$`k4yD767M>kKbl%k^EN{0w?qVi6B%M#8Y%}Dg_awcCLSUjUM&H zGhy`YZR7A6Tkd%cgN=t#at_>zee%NfgIxmjJgQ&*Zxtj zk8hV4QmJv}d&VO9ODp)=#?cQ#>?orE2~}=a>nmak>)yhuJ_!gK!AAIdN%{fC6Z$3i zVA2Z*x|s99Ws;)Os&EBzOp+bj%l%5~(j=EE<5bCMCW~g*A}Q6g8ynNF0?EWK)7+K+ zkaus`IpI@ccq$S6Io~P%<_K2B} zGY*&JpGtFY-?6;RGdcA4Q++8e?7u{9lxim0*_Rz`TlKzjq@SEApp^ibF5|czbza(a zl{mOPUgz4x&g4`Qw5IYJU2I(W6u~CV1hm|$_uVUe<5t`x`#_s=iEZLesHvfwb)xuP zm91aF&&II7bZ-9`&np zPfAS69zz6D^GCuZ(`3sRy)Yn}Ff@mmzN zFg=oK!ea%%@+@0py@8>K`Oo5!6jNMj0J?v6=6*rSu#p};8O9@=VuFU>a8}F=9GWVQ z_u6G#uGH}Rw3e3LnO;Xe?z(Vh)Wy$%yBI>24jY{(#mC zof&f}_X!sbmuMUsg9&dt$vl=A%1g65*<0M(fcEzWU+%}8Zx<9RgjGBJHpxu8|0S1! zxhU7P%7||RD8z`8Y~Ah zCh5C&uov0iy)*^Z)z!eMJFQY@uBgK-aqr5{t3$m--&ev41u_P4*d(Ys% zvt=yO74gwyOfb{_XFsn6$XR{STan|VT$wgI#pYSCrG)3SviuPjga9=NerGKzMrcF| zU#lzGzmsS2P-_znCa1u>l*-S>RVfjnV<<@==JEOkutLBO;&O1YqwD0qTqUHtMgFyx1b9) zXXIjWd}eGqWbM<`v%~rBb@jB;oz3dAZEm@FCtV}&22Y!|FN(htN|3JOI!x_)SN7Hv z&KKg!u7)*b)WoiAE_mq1haHR5D>I`-&QgEgEqmiW?INw<#e|G>s`;sH6nt@Ly+XpI zTIaQiiB)0dbZy#qY0fMPHPw~1B0x50b{p=fm~PINM_y+b;I)$GHEwF23GcO;d@mY> zm^x+S^!}qT23Su1ngkN`V+m5707U06)HnVtBZU+-Njk1Mgu*q&AlYYX`Y3zVoWSo- zD)Jnj5h9-!!pdK`*o5M$a+=Ry?(;u7B{}Pw-%gzMW?TI^@>3KsY3Yy^mzFP!8&bqo zM&MrPb!LeYDuZNXL3oMWmCe#chF^~wq@9f#`bBq1hogGVDt)wOYzWD*)Xo28Yp6V%yy%7JkF%_k;YxV|UKV)EIb zpS%vPtiEPmg-Y$&$|=twIv<1}JEXpD5wPftXMd3jQ2~?e+z-j=;s2uwZQ$|mqQ&H| zzN7ARwW|;ZK+dR3RRr6_Bxklh%4lcF;g<*u+LAV%&WM`quCNurm8+5?pE|FVJ9vId z(}ZqLfTfW2-o$aTCb9kKsqwqVnAainHO`!QCDqwI1ZgLrIG z!Hf`@?bqqWPXx)<-meI-`SjhWMa`>10N&NMXUe7>fa0YodG z%>;Fs>1y2_^PYtE%RX?PuA;tZRd;rGPi z^n{0p$9hFMHLIA)xlAhXRI98_v*l^qg5%0~U+XViek?VLD>EbLyzx4t$o&OjU4ww* z!LGd_^*4?t)IFIl058CmEaH^4W^&2$^2-5)Ma4n)DO(-%+_|iUWIe|f(rb%zy;mQ~Rnn4g za!gW<(Wf1%B}j-r-GA6q=lFv2j zsYO+e^sKT|%NwQ3jSQhHP3b;LRV<|%YpafM>az_4^V90{z2qh`8JE#~5CmfpL&o;*#l{N)1UJMS8 z8jt3d@k(!swPiOP%_ve`UTn9MTw9sQ%j7ew{T?lH8cWI=SKN3iwQ++!!RSSj?5H@* ze|6CSgQKsSa%s$dC^pPquRxr6L%wuo_1VdG1Y7sb;8XR^%izc7+Q`+;_1V+yY)#xg z+@zi8N?DcNAGu|$Q*HkuP=qm2y~4Lxbp3iNj)OUkdSv!9agv^U1sD1;-Onm8P{(N$ zaXD~N|Ej17uN+L7oE4$YOu+DAXvlD5^}K!g^l(2jXFRvouD9p*dSP8r{Y8eFkz#!_ z`dxSgtDhmd>EZErzJ$Py52S>BG0s>{^`ssh#?J8Q5{GFVOo(;}S2@}vfG#uq)jfR+ zE|t1m+-K>g0fQ%uJ(S6#1?rV4C9zB^97si8xSDgLLuN765Eo*$)(4bTxa0MHElwSm zOgn$VJ7bscwIHI)pWoHr$MG-JA6Oy4RR&Q^*1wlHyKO)V_H?Zzf)vfyD1BRAat2kWI!R;=5bBUs{v`aYc0pI3Zr; z@(?rph5lt|qNrM>Ln-dRrvNWIbZB-RK7%T z*R%`EvVvZ)WHOeRf)15r;>=XLuA_3PMsj^ckXOGb;p!5biI7JGy9E+RN>`O;l%|!J z5+K#$=Wegdm1M6DMzAHYc+WIun;CbAF|An6wbDMJA618=3Ee?cLs$n@K=sQG@{@8gp^J_3{$Z`u;l0

Snh{Ng41B}KT>M=1! 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 diff --git a/docs/user/alerting/images/pre-configured-action-type-select-type.png b/docs/user/alerting/images/pre-configured-action-type-select-type.png index 29e5a29edc7c0608d06386e1c95bc14899f8c044..91ca831840ce92396f9f411fde108c06593c063a 100644 GIT binary patch literal 84001 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 diff --git a/docs/user/alerting/images/pre-configured-connectors-view-screen.png b/docs/user/alerting/images/pre-configured-connectors-view-screen.png index 43ac44e7536d8f8686054ef1e1d5d92c8e5624e3..9c75f86498bebe37f9263462e2c1b20273409f5a 100644 GIT binary patch delta 46399 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 From 0802ccc262688e5dea904e6cc82d2f48d034b437 Mon Sep 17 00:00:00 2001 From: Nathan L Smith Date: Mon, 11 May 2020 18:26:50 -0500 Subject: [PATCH 57/65] Fix major severity service map ring colors (#66124) Using `||` in the switch statement made it so "major" did not work, and we would get the border width but not the color. Change to splitting case statements. Fixes #66081 --- .../apm/public/components/app/ServiceMap/cytoscapeOptions.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts b/x-pack/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts index 0cdc7c4eb124d5..d3c4654de81649 100644 --- a/x-pack/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts +++ b/x-pack/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts @@ -17,7 +17,8 @@ export const getSeverityColor = (nodeSeverity: string) => { switch (nodeSeverity) { case severity.warning: return theme.euiColorVis0; - case severity.minor || severity.major: + case severity.minor: + case severity.major: return theme.euiColorVis5; case severity.critical: return theme.euiColorVis9; From 6d95b68c7247e8fd6c904fc484824e534186bec0 Mon Sep 17 00:00:00 2001 From: Phillip Burch Date: Mon, 11 May 2020 19:08:02 -0500 Subject: [PATCH 58/65] Cleanup prefill and edit flow. (#66105) --- .../components/expression.tsx | 90 ++++++++++--------- .../infra/server/lib/alerting/common/utils.ts | 5 ++ 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx index 406f9c7602d355..8fdba86f233d46 100644 --- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx +++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx @@ -74,6 +74,7 @@ export const Expressions: React.FC = props => { fetch: alertsContext.http.fetch, toastWarning: alertsContext.toastNotifications.addWarning, }); + const [timeSize, setTimeSize] = useState(1); const [timeUnit, setTimeUnit] = useState('m'); const derivedIndexPattern = useMemo(() => createDerivedIndexPattern('metrics'), [ @@ -173,52 +174,57 @@ export const Expressions: React.FC = props => { [alertParams.criteria, setAlertParams] ); - useEffect(() => { + const preFillAlertCriteria = useCallback(() => { const md = alertsContext.metadata; - if (md) { - if (md.currentOptions?.metrics) { - setAlertParams( - 'criteria', - md.currentOptions.metrics.map(metric => ({ - metric: metric.field, - comparator: Comparator.GT, - threshold: [], - timeSize, - timeUnit, - aggType: metric.aggregation, - })) - ); - } else { - setAlertParams('criteria', [defaultExpression]); - } + if (md && md.currentOptions?.metrics) { + setAlertParams( + 'criteria', + md.currentOptions.metrics.map(metric => ({ + metric: metric.field, + comparator: Comparator.GT, + threshold: [], + timeSize, + timeUnit, + aggType: metric.aggregation, + })) + ); + } else { + setAlertParams('criteria', [defaultExpression]); + } + }, [alertsContext.metadata, setAlertParams, timeSize, timeUnit]); - if (md.currentOptions) { - if (md.currentOptions.filterQuery) { - setAlertParams('filterQueryText', md.currentOptions.filterQuery); - setAlertParams( - 'filterQuery', - convertKueryToElasticSearchQuery(md.currentOptions.filterQuery, derivedIndexPattern) || - '' - ); - } else if (md.currentOptions.groupBy && md.series) { - const filter = `${md.currentOptions.groupBy}: "${md.series.id}"`; - setAlertParams('filterQueryText', filter); - setAlertParams( - 'filterQuery', - convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || '' - ); - } + const preFillAlertFilter = useCallback(() => { + const md = alertsContext.metadata; + if (md && md.currentOptions?.filterQuery) { + setAlertParams('filterQueryText', md.currentOptions.filterQuery); + setAlertParams( + 'filterQuery', + convertKueryToElasticSearchQuery(md.currentOptions.filterQuery, derivedIndexPattern) || '' + ); + } else if (md && md.currentOptions?.groupBy && md.series) { + const filter = `${md.currentOptions?.groupBy}: "${md.series.id}"`; + setAlertParams('filterQueryText', filter); + setAlertParams( + 'filterQuery', + convertKueryToElasticSearchQuery(filter, derivedIndexPattern) || '' + ); + } + }, [alertsContext.metadata, derivedIndexPattern, setAlertParams]); - setAlertParams('groupBy', md.currentOptions.groupBy); - } - setAlertParams('sourceId', source?.id); + useEffect(() => { + if (alertParams.criteria && alertParams.criteria.length) { + setTimeSize(alertParams.criteria[0].timeSize); + setTimeUnit(alertParams.criteria[0].timeUnit); } else { - if (!alertParams.criteria) { - setAlertParams('criteria', [defaultExpression]); - } - if (!alertParams.sourceId) { - setAlertParams('sourceId', source?.id || 'default'); - } + preFillAlertCriteria(); + } + + if (!alertParams.filterQuery) { + preFillAlertFilter(); + } + + if (!alertParams.sourceId) { + setAlertParams('sourceId', source?.id || 'default'); } }, [alertsContext.metadata, defaultExpression, source]); // eslint-disable-line react-hooks/exhaustive-deps diff --git a/x-pack/plugins/infra/server/lib/alerting/common/utils.ts b/x-pack/plugins/infra/server/lib/alerting/common/utils.ts index a2c5b27c38fd68..5ca65b667ae11a 100644 --- a/x-pack/plugins/infra/server/lib/alerting/common/utils.ts +++ b/x-pack/plugins/infra/server/lib/alerting/common/utils.ts @@ -13,6 +13,11 @@ export const oneOfLiterals = (arrayOfLiterals: Readonly) => }); export const validateIsStringElasticsearchJSONFilter = (value: string) => { + if (value === '') { + // Allow clearing the filter. + return; + } + const errorMessage = 'filterQuery must be a valid Elasticsearch filter expressed in JSON'; try { const parsedValue = JSON.parse(value); From b5f5284b5c54c3a9861baa56b3429fe2e95443f1 Mon Sep 17 00:00:00 2001 From: spalger Date: Mon, 11 May 2020 17:11:37 -0700 Subject: [PATCH 59/65] skip flaky suite (#59849) --- .../__jest__/client_integration/template_clone.test.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/index_management/__jest__/client_integration/template_clone.test.tsx b/x-pack/plugins/index_management/__jest__/client_integration/template_clone.test.tsx index 17e19bf881dee9..fa9d13d1ddd076 100644 --- a/x-pack/plugins/index_management/__jest__/client_integration/template_clone.test.tsx +++ b/x-pack/plugins/index_management/__jest__/client_integration/template_clone.test.tsx @@ -42,7 +42,8 @@ jest.mock('@elastic/eui', () => ({ ), })); -describe('', () => { +// FLAKY: https://github.com/elastic/kibana/issues/59849 +describe.skip('', () => { let testBed: TemplateFormTestBed; const { server, httpRequestsMockHelpers } = setupEnvironment(); From bf178dece9b0f70f33d1bd3c89eb972318d7ecfb Mon Sep 17 00:00:00 2001 From: Thomas Neirynck Date: Mon, 11 May 2020 20:40:12 -0400 Subject: [PATCH 60/65] [Maps] Organize layers into subfolders (#65513) --- x-pack/legacy/plugins/maps/public/index.ts | 2 +- .../maps/public/angular/get_initial_layers.js | 22 ++++++------ .../public/{layers => classes}/_index.scss | 0 .../fields/ems_file_field.ts | 0 .../fields/es_agg_field.test.ts | 0 .../fields/es_agg_field.ts | 0 .../fields/es_doc_field.ts | 0 .../{layers => classes}/fields/field.ts | 0 .../fields/kibana_region_field.ts | 0 .../fields/top_term_percentage_field.ts | 0 .../{layers => classes}/joins/inner_join.js | 0 .../joins/inner_join.test.js | 2 +- .../public/{layers => classes}/joins/join.ts | 0 .../blended_vector_layer.ts | 34 +++++++++---------- .../layers/heatmap_layer}/heatmap_layer.js | 8 ++--- .../public/{ => classes}/layers/layer.tsx | 14 ++++---- .../layers/layer_wizard_registry.ts | 2 +- .../layers/load_layer_wizards.ts | 24 ++++++------- .../create_layer_descriptor.test.ts | 2 +- .../observability/create_layer_descriptor.ts | 18 +++++----- .../observability/display_select.tsx | 0 .../solution_layers/observability/index.ts | 0 .../observability/layer_select.tsx | 0 .../observability/metric_select.tsx | 0 .../observability_layer_template.tsx | 0 .../observability_layer_wizard.tsx | 2 +- .../layers/tile_layer}/tile_layer.d.ts | 6 ++-- .../layers/tile_layer}/tile_layer.js | 6 ++-- .../layers/tile_layer}/tile_layer.test.ts | 8 ++--- .../tiled_vector_layer.tsx | 21 +++++++----- .../layers/vector_layer}/vector_layer.d.ts | 16 ++++----- .../layers/vector_layer}/vector_layer.js | 16 ++++----- .../vector_tile_layer}/vector_tile_layer.js | 8 ++--- .../create_client_file_source_editor.js | 0 .../client_file_source/geojson_file_source.js | 0 .../sources/client_file_source/index.js | 0 .../upload_layer_wizard.tsx | 6 ++-- .../ems_file_source/create_source_editor.tsx | 0 .../ems_boundaries_layer_wizard.tsx | 4 +-- .../ems_file_source/ems_file_source.test.tsx | 2 +- .../ems_file_source/ems_file_source.tsx | 0 .../sources/ems_file_source/index.ts | 0 .../ems_file_source/update_source_editor.tsx | 0 .../ems_base_map_layer_wizard.tsx | 4 +-- .../sources/ems_tms_source/ems_tms_source.js | 0 .../ems_tms_source/ems_tms_source.test.js | 0 .../sources/ems_tms_source/index.js | 0 .../ems_tms_source/tile_service_select.js | 0 .../ems_tms_source/update_source_editor.js | 0 .../sources/ems_unavailable_message.ts | 0 .../sources/es_agg_source/es_agg_source.d.ts | 0 .../sources/es_agg_source/es_agg_source.js | 0 .../es_agg_source/es_agg_source.test.ts | 0 .../sources/es_agg_source/index.ts | 0 .../clusters_layer_wizard.tsx | 4 +-- .../es_geo_grid_source/convert_to_geojson.js | 0 .../convert_to_geojson.test.ts | 0 .../create_source_editor.js | 0 .../es_geo_grid_source.d.ts | 0 .../es_geo_grid_source/es_geo_grid_source.js | 0 .../es_geo_grid_source.test.ts | 0 .../es_geo_grid_source/geo_tile_utils.js | 0 .../es_geo_grid_source/geo_tile_utils.test.js | 0 .../heatmap_layer_wizard.tsx | 4 +-- .../sources/es_geo_grid_source/index.js | 0 .../es_geo_grid_source/render_as_select.tsx | 0 .../es_geo_grid_source/resolution_editor.js | 0 .../update_source_editor.js | 0 .../es_pew_pew_source/convert_to_lines.js | 0 .../convert_to_lines.test.ts | 0 .../es_pew_pew_source/create_source_editor.js | 0 .../es_pew_pew_source/es_pew_pew_source.js | 0 .../sources/es_pew_pew_source/index.js | 0 .../point_2_point_layer_wizard.tsx | 4 +-- .../es_pew_pew_source/update_source_editor.js | 0 .../__snapshots__/scaling_form.test.tsx.snap | 0 .../update_source_editor.test.js.snap | 0 .../sources/es_search_source/constants.js | 0 .../es_search_source/create_source_editor.js | 0 .../es_documents_layer_wizard.tsx | 6 ++-- .../es_search_source/es_search_source.d.ts | 0 .../es_search_source/es_search_source.js | 0 .../sources/es_search_source/index.js | 0 .../es_search_source/load_index_settings.js | 0 .../es_search_source/scaling_form.test.tsx | 0 .../sources/es_search_source/scaling_form.tsx | 0 .../es_search_source/update_source_editor.js | 0 .../update_source_editor.test.js | 0 .../sources/es_source/es_source.d.ts | 0 .../sources/es_source/es_source.js | 0 .../sources/es_source/index.ts | 0 .../es_term_source/es_term_source.d.ts | 0 .../sources/es_term_source/es_term_source.js | 0 .../es_term_source/es_term_source.test.js | 2 +- .../sources/es_term_source/index.ts | 0 .../create_source_editor.js | 0 .../sources/kibana_regionmap_source/index.js | 0 .../kibana_regionmap_layer_wizard.tsx | 4 +-- .../kibana_regionmap_source.d.ts | 0 .../kibana_regionmap_source.js | 0 .../create_source_editor.js | 0 .../sources/kibana_tilemap_source/index.js | 0 .../kibana_base_map_layer_wizard.tsx | 4 +-- .../kibana_tilemap_source.js | 0 .../mvt_single_layer_vector_source/index.ts | 0 .../layer_wizard.tsx | 4 +-- .../mvt_single_layer_vector_source.ts | 0 .../mvt_single_layer_vector_source_editor.tsx | 0 .../{layers => classes}/sources/source.ts | 0 .../sources/source_registry.ts | 0 .../sources/tms_source/index.ts | 0 .../sources/tms_source/tms_source.d.ts | 0 .../sources/tms_source/tms_source.js | 0 .../sources/vector_feature_types.ts | 0 .../sources/vector_source/index.ts | 0 .../sources/vector_source/vector_source.d.ts | 0 .../sources/vector_source/vector_source.js | 0 .../sources/wms_source/index.js | 0 .../sources/wms_source/wms_client.js | 0 .../sources/wms_source/wms_client.test.js | 0 .../wms_source/wms_create_source_editor.js | 0 .../sources/wms_source/wms_layer_wizard.tsx | 4 +-- .../sources/wms_source/wms_source.js | 0 .../sources/xyz_tms_source/index.ts | 0 .../sources/xyz_tms_source/layer_wizard.tsx | 4 +-- .../sources/xyz_tms_source/xyz_tms_editor.tsx | 0 .../xyz_tms_source/xyz_tms_source.test.ts | 0 .../sources/xyz_tms_source/xyz_tms_source.ts | 0 .../{layers => classes}/styles/_index.scss | 0 .../{layers => classes}/styles/color_utils.js | 0 .../styles/color_utils.test.js | 0 .../styles/components/_color_gradient.scss | 0 .../styles/components/color_gradient.js | 0 .../components/ranged_style_legend_row.js | 0 .../heatmap_style_editor.test.js.snap | 0 .../heatmap/components/heatmap_constants.js | 0 .../components/heatmap_style_editor.js | 0 .../components/heatmap_style_editor.test.js | 0 .../components/legend/heatmap_legend.js | 0 .../styles/heatmap/heatmap_style.js | 0 .../{layers => classes}/styles/style.ts | 2 +- .../styles/tile/tile_style.ts | 0 .../vector/components/_style_prop_editor.scss | 0 .../vector/components/color/_color_stops.scss | 0 .../components/color/color_map_select.js | 0 .../vector/components/color/color_stops.js | 0 .../color/color_stops_categorical.js | 0 .../components/color/color_stops_ordinal.js | 0 .../components/color/color_stops_utils.js | 0 .../components/color/dynamic_color_form.js | 0 .../color/mb_validated_color_picker.tsx | 0 .../components/color/static_color_form.js | 0 .../color/vector_style_color_editor.js | 0 .../categorical_field_meta_popover.tsx | 0 .../field_meta/field_meta_popover.tsx | 0 .../field_meta/ordinal_field_meta_popover.tsx | 0 .../styles/vector/components/field_select.js | 0 .../components/get_vector_style_label.js | 0 .../components/label/dynamic_label_form.js | 0 .../components/label/static_label_form.js | 0 .../vector_style_label_border_size_editor.js | 0 .../label/vector_style_label_editor.js | 0 .../__snapshots__/vector_icon.test.js.snap | 0 .../vector/components/legend/category.js | 0 .../vector/components/legend/circle_icon.js | 0 .../extract_color_from_style_property.js | 0 .../vector/components/legend/line_icon.js | 0 .../vector/components/legend/polygon_icon.js | 0 .../vector/components/legend/symbol_icon.js | 0 .../vector/components/legend/vector_icon.js | 0 .../components/legend/vector_icon.test.js | 0 .../components/legend/vector_style_legend.js | 0 .../orientation/dynamic_orientation_form.js | 0 .../orientation/orientation_editor.js | 0 .../orientation/static_orientation_form.js | 0 .../components/size/dynamic_size_form.js | 0 .../components/size/size_range_selector.js | 0 .../components/size/static_size_form.js | 0 .../size/vector_style_size_editor.js | 0 .../styles/vector/components/stop_input.js | 0 .../vector/components/style_map_select.js | 0 .../vector/components/style_option_shapes.js | 0 .../vector/components/style_prop_editor.js | 0 .../__snapshots__/icon_select.test.js.snap | 0 .../components/symbol/_icon_select.scss | 0 .../components/symbol/dynamic_icon_form.js | 0 .../components/symbol/icon_map_select.js | 0 .../vector/components/symbol/icon_select.js | 0 .../components/symbol/icon_select.test.js | 0 .../vector/components/symbol/icon_stops.js | 0 .../components/symbol/icon_stops.test.js | 0 .../components/symbol/static_icon_form.js | 0 .../symbol/vector_style_icon_editor.js | 0 .../vector_style_symbolize_as_editor.js | 0 .../vector/components/vector_style_editor.js | 0 .../dynamic_color_property.test.js.snap | 0 .../components/categorical_legend.js | 0 .../properties/components/ordinal_legend.js | 0 .../properties/dynamic_color_property.js | 0 .../properties/dynamic_color_property.test.js | 0 .../properties/dynamic_icon_property.js | 0 .../dynamic_orientation_property.js | 0 .../properties/dynamic_size_property.js | 0 .../properties/dynamic_style_property.d.ts | 0 .../properties/dynamic_style_property.js | 0 .../properties/dynamic_text_property.js | 0 .../properties/label_border_size_property.js | 0 .../properties/static_color_property.js | 0 .../vector/properties/static_icon_property.js | 0 .../properties/static_orientation_property.js | 0 .../vector/properties/static_size_property.js | 0 .../properties/static_style_property.js | 0 .../vector/properties/static_text_property.js | 0 .../vector/properties/style_property.ts | 0 .../properties/symbolize_as_property.js | 0 .../styles/vector/style_meta.ts | 0 .../styles/vector/style_util.js | 0 .../styles/vector/style_util.test.js | 0 .../styles/vector/symbol_utils.js | 0 .../styles/vector/symbol_utils.test.js | 0 .../styles/vector/vector_style.d.ts | 2 +- .../styles/vector/vector_style.js | 0 .../styles/vector/vector_style.test.js | 0 .../styles/vector/vector_style_defaults.ts | 0 .../tooltips/es_agg_tooltip_property.ts | 0 .../tooltips/es_tooltip_property.test.ts | 0 .../tooltips/es_tooltip_property.ts | 0 .../tooltips/join_tooltip_property.ts | 0 .../tooltips/tooltip_property.ts | 0 .../util/assign_feature_ids.test.ts | 0 .../util/assign_feature_ids.ts | 0 .../util/can_skip_fetch.test.js | 0 .../util/can_skip_fetch.ts | 0 .../{layers => classes}/util/data_request.ts | 0 .../util/es_agg_utils.test.ts | 0 .../{layers => classes}/util/es_agg_utils.ts | 0 .../util/is_metric_countable.ts | 0 .../util/is_refresh_only_query.ts | 0 .../util/mb_filter_expressions.ts | 0 .../tooltip_selector.test.tsx | 2 +- .../tooltip_selector/tooltip_selector.tsx | 2 +- .../connected_components/gis_map/index.d.ts | 2 +- .../connected_components/gis_map/view.js | 2 +- .../layer_addpanel/import_editor/view.js | 2 +- .../layer_addpanel/layer_wizard_select.tsx | 2 +- .../spatial_filters_panel.tsx | 2 +- .../fit_to_data/fit_to_data.tsx | 2 +- .../toc_entry_actions_popover.test.tsx | 6 ++-- .../toc_entry_actions_popover.tsx | 2 +- .../maps/public/embeddable/map_embeddable.tsx | 2 +- .../embeddable/map_embeddable_factory.ts | 2 +- x-pack/plugins/maps/public/index.scss | 2 +- .../maps/public/selectors/map_selectors.d.ts | 4 +-- .../maps/public/selectors/map_selectors.js | 18 +++++----- .../public/selectors/map_selectors.test.js | 12 +++---- 255 files changed, 169 insertions(+), 166 deletions(-) rename x-pack/plugins/maps/public/{layers => classes}/_index.scss (100%) rename x-pack/plugins/maps/public/{layers => classes}/fields/ems_file_field.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/fields/es_agg_field.test.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/fields/es_agg_field.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/fields/es_doc_field.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/fields/field.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/fields/kibana_region_field.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/fields/top_term_percentage_field.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/joins/inner_join.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/joins/inner_join.test.js (98%) rename x-pack/plugins/maps/public/{layers => classes}/joins/join.ts (100%) rename x-pack/plugins/maps/public/{layers => classes/layers/blended_vector_layer}/blended_vector_layer.ts (89%) rename x-pack/plugins/maps/public/{layers => classes/layers/heatmap_layer}/heatmap_layer.js (93%) rename x-pack/plugins/maps/public/{ => classes}/layers/layer.tsx (97%) rename x-pack/plugins/maps/public/{ => classes}/layers/layer_wizard_registry.ts (95%) rename x-pack/plugins/maps/public/{ => classes}/layers/load_layer_wizards.ts (68%) rename x-pack/plugins/maps/public/{ => classes}/layers/solution_layers/observability/create_layer_descriptor.test.ts (99%) rename x-pack/plugins/maps/public/{ => classes}/layers/solution_layers/observability/create_layer_descriptor.ts (92%) rename x-pack/plugins/maps/public/{ => classes}/layers/solution_layers/observability/display_select.tsx (100%) rename x-pack/plugins/maps/public/{ => classes}/layers/solution_layers/observability/index.ts (100%) rename x-pack/plugins/maps/public/{ => classes}/layers/solution_layers/observability/layer_select.tsx (100%) rename x-pack/plugins/maps/public/{ => classes}/layers/solution_layers/observability/metric_select.tsx (100%) rename x-pack/plugins/maps/public/{ => classes}/layers/solution_layers/observability/observability_layer_template.tsx (100%) rename x-pack/plugins/maps/public/{ => classes}/layers/solution_layers/observability/observability_layer_wizard.tsx (94%) rename x-pack/plugins/maps/public/{layers => classes/layers/tile_layer}/tile_layer.d.ts (71%) rename x-pack/plugins/maps/public/{layers => classes/layers/tile_layer}/tile_layer.js (95%) rename x-pack/plugins/maps/public/{layers => classes/layers/tile_layer}/tile_layer.test.ts (87%) rename x-pack/plugins/maps/public/{layers => classes/layers/tiled_vector_layer}/tiled_vector_layer.tsx (87%) rename x-pack/plugins/maps/public/{layers => classes/layers/vector_layer}/vector_layer.d.ts (82%) rename x-pack/plugins/maps/public/{layers => classes/layers/vector_layer}/vector_layer.js (98%) rename x-pack/plugins/maps/public/{layers => classes/layers/vector_tile_layer}/vector_tile_layer.js (97%) rename x-pack/plugins/maps/public/{layers => classes}/sources/client_file_source/create_client_file_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/client_file_source/geojson_file_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/client_file_source/index.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/client_file_source/upload_layer_wizard.tsx (93%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_file_source/create_source_editor.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_file_source/ems_boundaries_layer_wizard.tsx (89%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_file_source/ems_file_source.test.tsx (96%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_file_source/ems_file_source.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_file_source/index.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_file_source/update_source_editor.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_tms_source/ems_base_map_layer_wizard.tsx (87%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_tms_source/ems_tms_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_tms_source/ems_tms_source.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_tms_source/index.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_tms_source/tile_service_select.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_tms_source/update_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/ems_unavailable_message.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_agg_source/es_agg_source.d.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_agg_source/es_agg_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_agg_source/es_agg_source.test.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_agg_source/index.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/clusters_layer_wizard.tsx (95%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/convert_to_geojson.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/convert_to_geojson.test.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/create_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/es_geo_grid_source.d.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/es_geo_grid_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/es_geo_grid_source.test.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/geo_tile_utils.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/geo_tile_utils.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/heatmap_layer_wizard.tsx (90%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/index.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/render_as_select.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/resolution_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_geo_grid_source/update_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_pew_pew_source/convert_to_lines.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_pew_pew_source/convert_to_lines.test.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_pew_pew_source/create_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_pew_pew_source/es_pew_pew_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_pew_pew_source/index.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_pew_pew_source/point_2_point_layer_wizard.tsx (94%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_pew_pew_source/update_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/constants.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/create_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/es_documents_layer_wizard.tsx (85%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/es_search_source.d.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/es_search_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/index.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/load_index_settings.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/scaling_form.test.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/scaling_form.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/update_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_search_source/update_source_editor.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_source/es_source.d.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_source/es_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_source/index.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_term_source/es_term_source.d.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_term_source/es_term_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_term_source/es_term_source.test.js (98%) rename x-pack/plugins/maps/public/{layers => classes}/sources/es_term_source/index.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/kibana_regionmap_source/create_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/kibana_regionmap_source/index.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/kibana_regionmap_source/kibana_regionmap_layer_wizard.tsx (89%) rename x-pack/plugins/maps/public/{layers => classes}/sources/kibana_regionmap_source/kibana_regionmap_source.d.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/kibana_regionmap_source/kibana_regionmap_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/kibana_tilemap_source/create_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/kibana_tilemap_source/index.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/kibana_tilemap_source/kibana_base_map_layer_wizard.tsx (89%) rename x-pack/plugins/maps/public/{layers => classes}/sources/kibana_tilemap_source/kibana_tilemap_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/mvt_single_layer_vector_source/index.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/mvt_single_layer_vector_source/layer_wizard.tsx (87%) rename x-pack/plugins/maps/public/{layers => classes}/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/source.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/source_registry.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/tms_source/index.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/tms_source/tms_source.d.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/tms_source/tms_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/vector_feature_types.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/vector_source/index.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/vector_source/vector_source.d.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/vector_source/vector_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/wms_source/index.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/wms_source/wms_client.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/wms_source/wms_client.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/wms_source/wms_create_source_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/wms_source/wms_layer_wizard.tsx (88%) rename x-pack/plugins/maps/public/{layers => classes}/sources/wms_source/wms_source.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/xyz_tms_source/index.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/xyz_tms_source/layer_wizard.tsx (87%) rename x-pack/plugins/maps/public/{layers => classes}/sources/xyz_tms_source/xyz_tms_editor.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/xyz_tms_source/xyz_tms_source.test.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/sources/xyz_tms_source/xyz_tms_source.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/_index.scss (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/color_utils.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/color_utils.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/components/_color_gradient.scss (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/components/color_gradient.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/components/ranged_style_legend_row.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/heatmap/components/heatmap_constants.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/heatmap/components/heatmap_style_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/heatmap/components/heatmap_style_editor.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/heatmap/components/legend/heatmap_legend.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/heatmap/heatmap_style.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/style.ts (97%) rename x-pack/plugins/maps/public/{layers => classes}/styles/tile/tile_style.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/_style_prop_editor.scss (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/_color_stops.scss (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/color_map_select.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/color_stops.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/color_stops_categorical.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/color_stops_ordinal.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/color_stops_utils.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/dynamic_color_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/mb_validated_color_picker.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/static_color_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/color/vector_style_color_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/field_meta/categorical_field_meta_popover.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/field_meta/field_meta_popover.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/field_select.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/get_vector_style_label.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/label/dynamic_label_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/label/static_label_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/label/vector_style_label_border_size_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/label/vector_style_label_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/category.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/circle_icon.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/extract_color_from_style_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/line_icon.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/polygon_icon.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/symbol_icon.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/vector_icon.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/vector_icon.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/legend/vector_style_legend.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/orientation/dynamic_orientation_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/orientation/orientation_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/orientation/static_orientation_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/size/dynamic_size_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/size/size_range_selector.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/size/static_size_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/size/vector_style_size_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/stop_input.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/style_map_select.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/style_option_shapes.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/style_prop_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/__snapshots__/icon_select.test.js.snap (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/_icon_select.scss (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/dynamic_icon_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/icon_map_select.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/icon_select.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/icon_select.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/icon_stops.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/icon_stops.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/static_icon_form.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/vector_style_icon_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/symbol/vector_style_symbolize_as_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/components/vector_style_editor.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/components/categorical_legend.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/components/ordinal_legend.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/dynamic_color_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/dynamic_color_property.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/dynamic_icon_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/dynamic_orientation_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/dynamic_size_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/dynamic_style_property.d.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/dynamic_style_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/dynamic_text_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/label_border_size_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/static_color_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/static_icon_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/static_orientation_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/static_size_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/static_style_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/static_text_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/style_property.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/properties/symbolize_as_property.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/style_meta.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/style_util.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/style_util.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/symbol_utils.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/symbol_utils.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/vector_style.d.ts (94%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/vector_style.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/vector_style.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/styles/vector/vector_style_defaults.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/tooltips/es_agg_tooltip_property.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/tooltips/es_tooltip_property.test.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/tooltips/es_tooltip_property.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/tooltips/join_tooltip_property.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/tooltips/tooltip_property.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/assign_feature_ids.test.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/assign_feature_ids.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/can_skip_fetch.test.js (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/can_skip_fetch.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/data_request.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/es_agg_utils.test.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/es_agg_utils.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/is_metric_countable.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/is_refresh_only_query.ts (100%) rename x-pack/plugins/maps/public/{layers => classes}/util/mb_filter_expressions.ts (100%) diff --git a/x-pack/legacy/plugins/maps/public/index.ts b/x-pack/legacy/plugins/maps/public/index.ts index 98db26859297b9..e1532cac858ac0 100644 --- a/x-pack/legacy/plugins/maps/public/index.ts +++ b/x-pack/legacy/plugins/maps/public/index.ts @@ -30,5 +30,5 @@ export const plugin = () => { export { RenderTooltipContentParams, ITooltipProperty, -} from '../../../../plugins/maps/public/layers/tooltips/tooltip_property'; +} from '../../../../plugins/maps/public/classes/tooltips/tooltip_property'; export { MapEmbeddable, MapEmbeddableInput } from '../../../../plugins/maps/public/embeddable'; diff --git a/x-pack/plugins/maps/public/angular/get_initial_layers.js b/x-pack/plugins/maps/public/angular/get_initial_layers.js index 09f66740af3721..598fd6ce324d02 100644 --- a/x-pack/plugins/maps/public/angular/get_initial_layers.js +++ b/x-pack/plugins/maps/public/angular/get_initial_layers.js @@ -5,17 +5,17 @@ */ import _ from 'lodash'; // Import each layer type, even those not used, to init in registry -import '../layers/sources/wms_source'; -import '../layers/sources/ems_file_source'; -import '../layers/sources/es_search_source'; -import '../layers/sources/es_pew_pew_source'; -import '../layers/sources/kibana_regionmap_source'; -import '../layers/sources/es_geo_grid_source'; -import '../layers/sources/xyz_tms_source'; -import { KibanaTilemapSource } from '../layers/sources/kibana_tilemap_source'; -import { TileLayer } from '../layers/tile_layer'; -import { EMSTMSSource } from '../layers/sources/ems_tms_source'; -import { VectorTileLayer } from '../layers/vector_tile_layer'; +import '../classes/sources/wms_source'; +import '../classes/sources/ems_file_source'; +import '../classes/sources/es_search_source'; +import '../classes/sources/es_pew_pew_source'; +import '../classes/sources/kibana_regionmap_source'; +import '../classes/sources/es_geo_grid_source'; +import '../classes/sources/xyz_tms_source'; +import { KibanaTilemapSource } from '../classes/sources/kibana_tilemap_source'; +import { TileLayer } from '../classes/layers/tile_layer/tile_layer'; +import { EMSTMSSource } from '../classes/sources/ems_tms_source'; +import { VectorTileLayer } from '../classes/layers/vector_tile_layer/vector_tile_layer'; import { getIsEmsEnabled } from '../kibana_services'; import { getKibanaTileMap } from '../meta'; diff --git a/x-pack/plugins/maps/public/layers/_index.scss b/x-pack/plugins/maps/public/classes/_index.scss similarity index 100% rename from x-pack/plugins/maps/public/layers/_index.scss rename to x-pack/plugins/maps/public/classes/_index.scss diff --git a/x-pack/plugins/maps/public/layers/fields/ems_file_field.ts b/x-pack/plugins/maps/public/classes/fields/ems_file_field.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/fields/ems_file_field.ts rename to x-pack/plugins/maps/public/classes/fields/ems_file_field.ts diff --git a/x-pack/plugins/maps/public/layers/fields/es_agg_field.test.ts b/x-pack/plugins/maps/public/classes/fields/es_agg_field.test.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/fields/es_agg_field.test.ts rename to x-pack/plugins/maps/public/classes/fields/es_agg_field.test.ts diff --git a/x-pack/plugins/maps/public/layers/fields/es_agg_field.ts b/x-pack/plugins/maps/public/classes/fields/es_agg_field.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/fields/es_agg_field.ts rename to x-pack/plugins/maps/public/classes/fields/es_agg_field.ts diff --git a/x-pack/plugins/maps/public/layers/fields/es_doc_field.ts b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/fields/es_doc_field.ts rename to x-pack/plugins/maps/public/classes/fields/es_doc_field.ts diff --git a/x-pack/plugins/maps/public/layers/fields/field.ts b/x-pack/plugins/maps/public/classes/fields/field.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/fields/field.ts rename to x-pack/plugins/maps/public/classes/fields/field.ts diff --git a/x-pack/plugins/maps/public/layers/fields/kibana_region_field.ts b/x-pack/plugins/maps/public/classes/fields/kibana_region_field.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/fields/kibana_region_field.ts rename to x-pack/plugins/maps/public/classes/fields/kibana_region_field.ts diff --git a/x-pack/plugins/maps/public/layers/fields/top_term_percentage_field.ts b/x-pack/plugins/maps/public/classes/fields/top_term_percentage_field.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/fields/top_term_percentage_field.ts rename to x-pack/plugins/maps/public/classes/fields/top_term_percentage_field.ts diff --git a/x-pack/plugins/maps/public/layers/joins/inner_join.js b/x-pack/plugins/maps/public/classes/joins/inner_join.js similarity index 100% rename from x-pack/plugins/maps/public/layers/joins/inner_join.js rename to x-pack/plugins/maps/public/classes/joins/inner_join.js diff --git a/x-pack/plugins/maps/public/layers/joins/inner_join.test.js b/x-pack/plugins/maps/public/classes/joins/inner_join.test.js similarity index 98% rename from x-pack/plugins/maps/public/layers/joins/inner_join.test.js rename to x-pack/plugins/maps/public/classes/joins/inner_join.test.js index f197a67becfaef..ca40ab1ea7db7f 100644 --- a/x-pack/plugins/maps/public/layers/joins/inner_join.test.js +++ b/x-pack/plugins/maps/public/classes/joins/inner_join.test.js @@ -7,7 +7,7 @@ import { InnerJoin } from './inner_join'; jest.mock('../../kibana_services', () => {}); -jest.mock('../vector_layer', () => {}); +jest.mock('../layers/vector_layer/vector_layer', () => {}); const rightSource = { id: 'd3625663-5b34-4d50-a784-0d743f676a0c', diff --git a/x-pack/plugins/maps/public/layers/joins/join.ts b/x-pack/plugins/maps/public/classes/joins/join.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/joins/join.ts rename to x-pack/plugins/maps/public/classes/joins/join.ts diff --git a/x-pack/plugins/maps/public/layers/blended_vector_layer.ts b/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts similarity index 89% rename from x-pack/plugins/maps/public/layers/blended_vector_layer.ts rename to x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts index adf04b4155659c..b5b824c8594c3d 100644 --- a/x-pack/plugins/maps/public/layers/blended_vector_layer.ts +++ b/x-pack/plugins/maps/public/classes/layers/blended_vector_layer/blended_vector_layer.ts @@ -5,11 +5,11 @@ */ import { i18n } from '@kbn/i18n'; -import { VectorLayer } from './vector_layer'; -import { IVectorStyle, VectorStyle } from './styles/vector/vector_style'; -import { getDefaultDynamicProperties } from './styles/vector/vector_style_defaults'; -import { IDynamicStyleProperty } from './styles/vector/properties/dynamic_style_property'; -import { IStyleProperty } from './styles/vector/properties/style_property'; +import { VectorLayer } from '../vector_layer/vector_layer'; +import { IVectorStyle, VectorStyle } from '../../styles/vector/vector_style'; +import { getDefaultDynamicProperties } from '../../styles/vector/vector_style_defaults'; +import { IDynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property'; +import { IStyleProperty } from '../../styles/vector/properties/style_property'; import { SOURCE_TYPES, COUNT_PROP_LABEL, @@ -21,23 +21,23 @@ import { VECTOR_STYLES, LAYER_STYLE_TYPE, FIELD_ORIGIN, -} from '../../common/constants'; -import { ESGeoGridSource } from './sources/es_geo_grid_source/es_geo_grid_source'; -import { canSkipSourceUpdate } from './util/can_skip_fetch'; -import { IVectorLayer } from './vector_layer'; -import { IESSource } from './sources/es_source'; -import { IESAggSource } from './sources/es_agg_source'; -import { ISource } from './sources/source'; -import { SyncContext } from '../actions/map_actions'; -import { DataRequestAbortError } from './util/data_request'; +} from '../../../../common/constants'; +import { ESGeoGridSource } from '../../sources/es_geo_grid_source/es_geo_grid_source'; +import { canSkipSourceUpdate } from '../../util/can_skip_fetch'; +import { IVectorLayer } from '../vector_layer/vector_layer'; +import { IESSource } from '../../sources/es_source'; +import { IESAggSource } from '../../sources/es_agg_source'; +import { ISource } from '../../sources/source'; +import { SyncContext } from '../../../actions/map_actions'; +import { DataRequestAbortError } from '../../util/data_request'; import { VectorStyleDescriptor, SizeDynamicOptions, DynamicStylePropertyOptions, VectorLayerDescriptor, -} from '../../common/descriptor_types'; -import { IStyle } from './styles/style'; -import { IVectorSource } from './sources/vector_source'; +} from '../../../../common/descriptor_types'; +import { IStyle } from '../../styles/style'; +import { IVectorSource } from '../../sources/vector_source'; const ACTIVE_COUNT_DATA_ID = 'ACTIVE_COUNT_DATA_ID'; diff --git a/x-pack/plugins/maps/public/layers/heatmap_layer.js b/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js similarity index 93% rename from x-pack/plugins/maps/public/layers/heatmap_layer.js rename to x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js index 22f7a92c17c51a..f6b9bd62802901 100644 --- a/x-pack/plugins/maps/public/layers/heatmap_layer.js +++ b/x-pack/plugins/maps/public/classes/layers/heatmap_layer/heatmap_layer.js @@ -4,10 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import { AbstractLayer } from './layer'; -import { VectorLayer } from './vector_layer'; -import { HeatmapStyle } from './styles/heatmap/heatmap_style'; -import { EMPTY_FEATURE_COLLECTION, LAYER_TYPE } from '../../common/constants'; +import { AbstractLayer } from '../layer'; +import { VectorLayer } from '../vector_layer/vector_layer'; +import { HeatmapStyle } from '../../styles/heatmap/heatmap_style'; +import { EMPTY_FEATURE_COLLECTION, LAYER_TYPE } from '../../../../common/constants'; const SCALED_PROPERTY_NAME = '__kbn_heatmap_weight__'; //unique name to store scaled value for weighting diff --git a/x-pack/plugins/maps/public/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx similarity index 97% rename from x-pack/plugins/maps/public/layers/layer.tsx rename to x-pack/plugins/maps/public/classes/layers/layer.tsx index 8ecaf4d903251f..c46d22ef0bd889 100644 --- a/x-pack/plugins/maps/public/layers/layer.tsx +++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx @@ -12,25 +12,25 @@ import { EuiIcon, EuiLoadingSpinner } from '@elastic/eui'; import uuid from 'uuid/v4'; import { i18n } from '@kbn/i18n'; import { FeatureCollection } from 'geojson'; -import { DataRequest } from './util/data_request'; +import { DataRequest } from '../util/data_request'; import { MAX_ZOOM, MB_SOURCE_ID_LAYER_ID_PREFIX_DELIMITER, MIN_ZOOM, SOURCE_DATA_ID_ORIGIN, -} from '../../common/constants'; +} from '../../../common/constants'; // @ts-ignore // eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { copyPersistentState } from '../reducers/util.js'; +import { copyPersistentState } from '../../reducers/util.js'; import { LayerDescriptor, MapExtent, MapFilters, StyleDescriptor, -} from '../../common/descriptor_types'; -import { Attribution, ImmutableSourceProperty, ISource, SourceEditorArgs } from './sources/source'; -import { SyncContext } from '../actions/map_actions'; -import { IStyle } from './styles/style'; +} from '../../../common/descriptor_types'; +import { Attribution, ImmutableSourceProperty, ISource, SourceEditorArgs } from '../sources/source'; +import { SyncContext } from '../../actions/map_actions'; +import { IStyle } from '../styles/style'; export interface ILayer { getBounds(mapFilters: MapFilters): Promise; diff --git a/x-pack/plugins/maps/public/layers/layer_wizard_registry.ts b/x-pack/plugins/maps/public/classes/layers/layer_wizard_registry.ts similarity index 95% rename from x-pack/plugins/maps/public/layers/layer_wizard_registry.ts rename to x-pack/plugins/maps/public/classes/layers/layer_wizard_registry.ts index f866fc10b1f475..7a2a038c1b2864 100644 --- a/x-pack/plugins/maps/public/layers/layer_wizard_registry.ts +++ b/x-pack/plugins/maps/public/classes/layers/layer_wizard_registry.ts @@ -6,7 +6,7 @@ /* eslint-disable @typescript-eslint/consistent-type-definitions */ import { ReactElement } from 'react'; -import { LayerDescriptor } from '../../common/descriptor_types'; +import { LayerDescriptor } from '../../../common/descriptor_types'; export type RenderWizardArguments = { previewLayer: (layerDescriptor: LayerDescriptor | null, isIndexingSource?: boolean) => void; diff --git a/x-pack/plugins/maps/public/layers/load_layer_wizards.ts b/x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts similarity index 68% rename from x-pack/plugins/maps/public/layers/load_layer_wizards.ts rename to x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts index 098ff51791d794..590c1a9d6ae448 100644 --- a/x-pack/plugins/maps/public/layers/load_layer_wizards.ts +++ b/x-pack/plugins/maps/public/classes/layers/load_layer_wizards.ts @@ -6,27 +6,27 @@ import { registerLayerWizard } from './layer_wizard_registry'; // @ts-ignore -import { uploadLayerWizardConfig } from './sources/client_file_source'; +import { uploadLayerWizardConfig } from '../sources/client_file_source'; // @ts-ignore -import { esDocumentsLayerWizardConfig } from './sources/es_search_source'; +import { esDocumentsLayerWizardConfig } from '../sources/es_search_source'; // @ts-ignore -import { clustersLayerWizardConfig, heatmapLayerWizardConfig } from './sources/es_geo_grid_source'; +import { clustersLayerWizardConfig, heatmapLayerWizardConfig } from '../sources/es_geo_grid_source'; // @ts-ignore -import { point2PointLayerWizardConfig } from './sources/es_pew_pew_source'; +import { point2PointLayerWizardConfig } from '../sources/es_pew_pew_source'; // @ts-ignore -import { emsBoundariesLayerWizardConfig } from './sources/ems_file_source'; +import { emsBoundariesLayerWizardConfig } from '../sources/ems_file_source'; // @ts-ignore -import { emsBaseMapLayerWizardConfig } from './sources/ems_tms_source'; +import { emsBaseMapLayerWizardConfig } from '../sources/ems_tms_source'; // @ts-ignore -import { kibanaRegionMapLayerWizardConfig } from './sources/kibana_regionmap_source'; +import { kibanaRegionMapLayerWizardConfig } from '../sources/kibana_regionmap_source'; // @ts-ignore -import { kibanaBasemapLayerWizardConfig } from './sources/kibana_tilemap_source'; -import { tmsLayerWizardConfig } from './sources/xyz_tms_source'; +import { kibanaBasemapLayerWizardConfig } from '../sources/kibana_tilemap_source'; +import { tmsLayerWizardConfig } from '../sources/xyz_tms_source'; // @ts-ignore -import { wmsLayerWizardConfig } from './sources/wms_source'; -import { mvtVectorSourceWizardConfig } from './sources/mvt_single_layer_vector_source'; +import { wmsLayerWizardConfig } from '../sources/wms_source'; +import { mvtVectorSourceWizardConfig } from '../sources/mvt_single_layer_vector_source'; import { ObservabilityLayerWizardConfig } from './solution_layers/observability'; -import { getInjectedVarFunc } from '../kibana_services'; +import { getInjectedVarFunc } from '../../kibana_services'; let registered = false; export function registerLayerWizards() { diff --git a/x-pack/plugins/maps/public/layers/solution_layers/observability/create_layer_descriptor.test.ts b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/create_layer_descriptor.test.ts similarity index 99% rename from x-pack/plugins/maps/public/layers/solution_layers/observability/create_layer_descriptor.test.ts rename to x-pack/plugins/maps/public/classes/layers/solution_layers/observability/create_layer_descriptor.test.ts index 6c0b6cdc39b85f..ce079d67c15e4e 100644 --- a/x-pack/plugins/maps/public/layers/solution_layers/observability/create_layer_descriptor.test.ts +++ b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/create_layer_descriptor.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -jest.mock('../../../kibana_services', () => { +jest.mock('../../../../kibana_services', () => { const mockUiSettings = { get: () => { return undefined; diff --git a/x-pack/plugins/maps/public/layers/solution_layers/observability/create_layer_descriptor.ts b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/create_layer_descriptor.ts similarity index 92% rename from x-pack/plugins/maps/public/layers/solution_layers/observability/create_layer_descriptor.ts rename to x-pack/plugins/maps/public/classes/layers/solution_layers/observability/create_layer_descriptor.ts index e2833d5abd0c22..ba019f97b287fa 100644 --- a/x-pack/plugins/maps/public/layers/solution_layers/observability/create_layer_descriptor.ts +++ b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/create_layer_descriptor.ts @@ -13,7 +13,7 @@ import { SizeDynamicOptions, StylePropertyField, VectorStylePropertiesDescriptor, -} from '../../../../common/descriptor_types'; +} from '../../../../../common/descriptor_types'; import { AGG_TYPE, COLOR_MAP_TYPE, @@ -23,20 +23,20 @@ import { SOURCE_TYPES, STYLE_TYPE, VECTOR_STYLES, -} from '../../../../common/constants'; -import { getJoinAggKey, getSourceAggKey } from '../../../../common/get_agg_key'; +} from '../../../../../common/constants'; +import { getJoinAggKey, getSourceAggKey } from '../../../../../common/get_agg_key'; import { OBSERVABILITY_LAYER_TYPE } from './layer_select'; import { OBSERVABILITY_METRIC_TYPE } from './metric_select'; import { DISPLAY } from './display_select'; -import { VectorStyle } from '../../styles/vector/vector_style'; +import { VectorStyle } from '../../../styles/vector/vector_style'; // @ts-ignore -import { EMSFileSource } from '../../sources/ems_file_source'; +import { EMSFileSource } from '../../../sources/ems_file_source'; // @ts-ignore -import { ESGeoGridSource } from '../../sources/es_geo_grid_source'; -import { VectorLayer } from '../../vector_layer'; +import { ESGeoGridSource } from '../../../sources/es_geo_grid_source'; +import { VectorLayer } from '../../vector_layer/vector_layer'; // @ts-ignore -import { HeatmapLayer } from '../../heatmap_layer'; -import { getDefaultDynamicProperties } from '../../styles/vector/vector_style_defaults'; +import { HeatmapLayer } from '../../heatmap_layer/heatmap_layer'; +import { getDefaultDynamicProperties } from '../../../styles/vector/vector_style_defaults'; // redefining APM constant to avoid making maps app depend on APM plugin export const APM_INDEX_PATTERN_ID = 'apm_static_index_pattern_id'; diff --git a/x-pack/plugins/maps/public/layers/solution_layers/observability/display_select.tsx b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/display_select.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/solution_layers/observability/display_select.tsx rename to x-pack/plugins/maps/public/classes/layers/solution_layers/observability/display_select.tsx diff --git a/x-pack/plugins/maps/public/layers/solution_layers/observability/index.ts b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/index.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/solution_layers/observability/index.ts rename to x-pack/plugins/maps/public/classes/layers/solution_layers/observability/index.ts diff --git a/x-pack/plugins/maps/public/layers/solution_layers/observability/layer_select.tsx b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/layer_select.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/solution_layers/observability/layer_select.tsx rename to x-pack/plugins/maps/public/classes/layers/solution_layers/observability/layer_select.tsx diff --git a/x-pack/plugins/maps/public/layers/solution_layers/observability/metric_select.tsx b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/metric_select.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/solution_layers/observability/metric_select.tsx rename to x-pack/plugins/maps/public/classes/layers/solution_layers/observability/metric_select.tsx diff --git a/x-pack/plugins/maps/public/layers/solution_layers/observability/observability_layer_template.tsx b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/observability_layer_template.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/solution_layers/observability/observability_layer_template.tsx rename to x-pack/plugins/maps/public/classes/layers/solution_layers/observability/observability_layer_template.tsx diff --git a/x-pack/plugins/maps/public/layers/solution_layers/observability/observability_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/observability_layer_wizard.tsx similarity index 94% rename from x-pack/plugins/maps/public/layers/solution_layers/observability/observability_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/layers/solution_layers/observability/observability_layer_wizard.tsx index 3fbb3157ae62a0..db97c08596e065 100644 --- a/x-pack/plugins/maps/public/layers/solution_layers/observability/observability_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/layers/solution_layers/observability/observability_layer_wizard.tsx @@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n'; import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; import { ObservabilityLayerTemplate } from './observability_layer_template'; import { APM_INDEX_PATTERN_ID } from './create_layer_descriptor'; -import { getIndexPatternService } from '../../../kibana_services'; +import { getIndexPatternService } from '../../../../kibana_services'; export const ObservabilityLayerWizardConfig: LayerWizard = { checkVisibility: async () => { diff --git a/x-pack/plugins/maps/public/layers/tile_layer.d.ts b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.d.ts similarity index 71% rename from x-pack/plugins/maps/public/layers/tile_layer.d.ts rename to x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.d.ts index 8a1ef0f172717d..6f719d8abdcb91 100644 --- a/x-pack/plugins/maps/public/layers/tile_layer.d.ts +++ b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.d.ts @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { AbstractLayer } from './layer'; -import { ITMSSource } from './sources/tms_source'; -import { LayerDescriptor } from '../../common/descriptor_types'; +import { AbstractLayer } from '../layer'; +import { ITMSSource } from '../../sources/tms_source'; +import { LayerDescriptor } from '../../../../common/descriptor_types'; interface ITileLayerArguments { source: ITMSSource; diff --git a/x-pack/plugins/maps/public/layers/tile_layer.js b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js similarity index 95% rename from x-pack/plugins/maps/public/layers/tile_layer.js rename to x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js index baded3c287637c..69f5033e3af0fa 100644 --- a/x-pack/plugins/maps/public/layers/tile_layer.js +++ b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.js @@ -4,10 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import { AbstractLayer } from './layer'; +import { AbstractLayer } from '../layer'; import _ from 'lodash'; -import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE, LAYER_STYLE_TYPE } from '../../common/constants'; -import { TileStyle } from './styles/tile/tile_style'; +import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE, LAYER_STYLE_TYPE } from '../../../../common/constants'; +import { TileStyle } from '../../styles/tile/tile_style'; export class TileLayer extends AbstractLayer { static type = LAYER_TYPE.TILE; diff --git a/x-pack/plugins/maps/public/layers/tile_layer.test.ts b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.test.ts similarity index 87% rename from x-pack/plugins/maps/public/layers/tile_layer.test.ts rename to x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.test.ts index d536b18af4aade..7954d0c59d97f1 100644 --- a/x-pack/plugins/maps/public/layers/tile_layer.test.ts +++ b/x-pack/plugins/maps/public/classes/layers/tile_layer/tile_layer.test.ts @@ -6,10 +6,10 @@ // eslint-disable-next-line max-classes-per-file import { ITileLayerArguments, TileLayer } from './tile_layer'; -import { SOURCE_TYPES } from '../../common/constants'; -import { XYZTMSSourceDescriptor } from '../../common/descriptor_types'; -import { ITMSSource, AbstractTMSSource } from './sources/tms_source'; -import { ILayer } from './layer'; +import { SOURCE_TYPES } from '../../../../common/constants'; +import { XYZTMSSourceDescriptor } from '../../../../common/descriptor_types'; +import { ITMSSource, AbstractTMSSource } from '../../sources/tms_source'; +import { ILayer } from '../layer'; const sourceDescriptor: XYZTMSSourceDescriptor = { type: SOURCE_TYPES.EMS_XYZ, diff --git a/x-pack/plugins/maps/public/layers/tiled_vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx similarity index 87% rename from x-pack/plugins/maps/public/layers/tiled_vector_layer.tsx rename to x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx index 06c5ef579b2212..bb4fbe9d01b609 100644 --- a/x-pack/plugins/maps/public/layers/tiled_vector_layer.tsx +++ b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx @@ -6,15 +6,18 @@ import React from 'react'; import { EuiIcon } from '@elastic/eui'; -import { VectorStyle } from './styles/vector/vector_style'; -import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE } from '../../common/constants'; -import { VectorLayer, VectorLayerArguments } from './vector_layer'; -import { canSkipSourceUpdate } from './util/can_skip_fetch'; -import { ITiledSingleLayerVectorSource } from './sources/vector_source'; -import { SyncContext } from '../actions/map_actions'; -import { ISource } from './sources/source'; -import { VectorLayerDescriptor, VectorSourceRequestMeta } from '../../common/descriptor_types'; -import { MVTSingleLayerVectorSourceConfig } from './sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor'; +import { VectorStyle } from '../../styles/vector/vector_style'; +import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE } from '../../../../common/constants'; +import { VectorLayer, VectorLayerArguments } from '../vector_layer/vector_layer'; +import { canSkipSourceUpdate } from '../../util/can_skip_fetch'; +import { ITiledSingleLayerVectorSource } from '../../sources/vector_source'; +import { SyncContext } from '../../../actions/map_actions'; +import { ISource } from '../../sources/source'; +import { + VectorLayerDescriptor, + VectorSourceRequestMeta, +} from '../../../../common/descriptor_types'; +import { MVTSingleLayerVectorSourceConfig } from '../../sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor'; export class TiledVectorLayer extends VectorLayer { static type = LAYER_TYPE.TILED_VECTOR; diff --git a/x-pack/plugins/maps/public/layers/vector_layer.d.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts similarity index 82% rename from x-pack/plugins/maps/public/layers/vector_layer.d.ts rename to x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts index 710b95b045e71f..73785d4cc04e01 100644 --- a/x-pack/plugins/maps/public/layers/vector_layer.d.ts +++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts @@ -5,18 +5,18 @@ */ /* eslint-disable @typescript-eslint/consistent-type-definitions */ -import { AbstractLayer } from './layer'; -import { IVectorSource } from './sources/vector_source'; +import { AbstractLayer } from '../layer'; +import { IVectorSource } from '../../sources/vector_source'; import { MapFilters, VectorLayerDescriptor, VectorSourceRequestMeta, -} from '../../common/descriptor_types'; -import { ILayer } from './layer'; -import { IJoin } from './joins/join'; -import { IVectorStyle } from './styles/vector/vector_style'; -import { IField } from './fields/field'; -import { SyncContext } from '../actions/map_actions'; +} from '../../../../common/descriptor_types'; +import { ILayer } from '../layer'; +import { IJoin } from '../../joins/join'; +import { IVectorStyle } from '../../styles/vector/vector_style'; +import { IField } from '../../fields/field'; +import { SyncContext } from '../../../actions/map_actions'; export type VectorLayerArguments = { source: IVectorSource; diff --git a/x-pack/plugins/maps/public/layers/vector_layer.js b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js similarity index 98% rename from x-pack/plugins/maps/public/layers/vector_layer.js rename to x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js index 74ddf11c6beb4c..6c04f7c19ac7db 100644 --- a/x-pack/plugins/maps/public/layers/vector_layer.js +++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js @@ -6,8 +6,8 @@ import turf from 'turf'; import React from 'react'; -import { AbstractLayer } from './layer'; -import { VectorStyle } from './styles/vector/vector_style'; +import { AbstractLayer } from '../layer'; +import { VectorStyle } from '../../styles/vector/vector_style'; import { FEATURE_ID_PROPERTY_NAME, SOURCE_DATA_ID_ORIGIN, @@ -18,23 +18,23 @@ import { LAYER_TYPE, FIELD_ORIGIN, LAYER_STYLE_TYPE, -} from '../../common/constants'; +} from '../../../../common/constants'; import _ from 'lodash'; -import { JoinTooltipProperty } from './tooltips/join_tooltip_property'; +import { JoinTooltipProperty } from '../../tooltips/join_tooltip_property'; import { EuiIcon } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { DataRequestAbortError } from './util/data_request'; +import { DataRequestAbortError } from '../../util/data_request'; import { canSkipSourceUpdate, canSkipStyleMetaUpdate, canSkipFormattersUpdate, -} from './util/can_skip_fetch'; -import { assignFeatureIds } from './util/assign_feature_ids'; +} from '../../util/can_skip_fetch'; +import { assignFeatureIds } from '../../util/assign_feature_ids'; import { getFillFilterExpression, getLineFilterExpression, getPointFilterExpression, -} from './util/mb_filter_expressions'; +} from '../../util/mb_filter_expressions'; export class VectorLayer extends AbstractLayer { static type = LAYER_TYPE.VECTOR; diff --git a/x-pack/plugins/maps/public/layers/vector_tile_layer.js b/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.js similarity index 97% rename from x-pack/plugins/maps/public/layers/vector_tile_layer.js rename to x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.js index fc7812a2c86c70..fe1ff58922162b 100644 --- a/x-pack/plugins/maps/public/layers/vector_tile_layer.js +++ b/x-pack/plugins/maps/public/classes/layers/vector_tile_layer/vector_tile_layer.js @@ -4,14 +4,14 @@ * you may not use this file except in compliance with the Elastic License. */ -import { TileLayer } from './tile_layer'; +import { TileLayer } from '../tile_layer/tile_layer'; import _ from 'lodash'; -import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE, LAYER_STYLE_TYPE } from '../../common/constants'; -import { isRetina } from '../meta'; +import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE, LAYER_STYLE_TYPE } from '../../../../common/constants'; +import { isRetina } from '../../../meta'; import { addSpriteSheetToMapFromImageData, loadSpriteSheetImageData, -} from '../connected_components/map/mb/utils'; //todo move this implementation +} from '../../../connected_components/map/mb/utils'; //todo move this implementation const MB_STYLE_TYPE_TO_OPACITY = { fill: ['fill-opacity'], diff --git a/x-pack/plugins/maps/public/layers/sources/client_file_source/create_client_file_source_editor.js b/x-pack/plugins/maps/public/classes/sources/client_file_source/create_client_file_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/client_file_source/create_client_file_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/client_file_source/create_client_file_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js b/x-pack/plugins/maps/public/classes/sources/client_file_source/geojson_file_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js rename to x-pack/plugins/maps/public/classes/sources/client_file_source/geojson_file_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/client_file_source/index.js b/x-pack/plugins/maps/public/classes/sources/client_file_source/index.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/client_file_source/index.js rename to x-pack/plugins/maps/public/classes/sources/client_file_source/index.js diff --git a/x-pack/plugins/maps/public/layers/sources/client_file_source/upload_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/client_file_source/upload_layer_wizard.tsx similarity index 93% rename from x-pack/plugins/maps/public/layers/sources/client_file_source/upload_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/client_file_source/upload_layer_wizard.tsx index 2f8aa67d74b52f..d5ee354914e5cf 100644 --- a/x-pack/plugins/maps/public/layers/sources/client_file_source/upload_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/client_file_source/upload_layer_wizard.tsx @@ -13,13 +13,13 @@ import { SCALING_TYPES, } from '../../../../common/constants'; // @ts-ignore -import { ESSearchSource, createDefaultLayerDescriptor } from '../es_search_source'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; +import { createDefaultLayerDescriptor } from '../es_search_source'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; // @ts-ignore import { ClientFileCreateSourceEditor } from './create_client_file_source_editor'; // @ts-ignore import { GeojsonFileSource } from './geojson_file_source'; -import { VectorLayer } from '../../vector_layer'; +import { VectorLayer } from '../../layers/vector_layer/vector_layer'; export const uploadLayerWizardConfig: LayerWizard = { description: i18n.translate('xpack.maps.source.geojsonFileDescription', { diff --git a/x-pack/plugins/maps/public/layers/sources/ems_file_source/create_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/ems_file_source/create_source_editor.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_file_source/create_source_editor.tsx rename to x-pack/plugins/maps/public/classes/sources/ems_file_source/create_source_editor.tsx diff --git a/x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_boundaries_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_boundaries_layer_wizard.tsx similarity index 89% rename from x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_boundaries_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_boundaries_layer_wizard.tsx index cc7e04a7313ac9..4f1edca75b3086 100644 --- a/x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_boundaries_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_boundaries_layer_wizard.tsx @@ -6,8 +6,8 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; -import { VectorLayer } from '../../vector_layer'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; +import { VectorLayer } from '../../layers/vector_layer/vector_layer'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; import { EMSFileCreateSourceEditor } from './create_source_editor'; import { EMSFileSource, sourceTitle } from './ems_file_source'; // @ts-ignore diff --git a/x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.test.tsx b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.test.tsx similarity index 96% rename from x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.test.tsx rename to x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.test.tsx index 03e3b2a8f49414..24c111a72ac059 100644 --- a/x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.test.tsx +++ b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.test.tsx @@ -7,7 +7,7 @@ import { EMSFileSource } from './ems_file_source'; jest.mock('ui/new_platform'); -jest.mock('../../vector_layer', () => {}); +jest.mock('../../layers/vector_layer/vector_layer', () => {}); function makeEMSFileSource(tooltipProperties: string[]) { const emsFileSource = new EMSFileSource({ tooltipProperties }); diff --git a/x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.tsx b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.tsx rename to x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.tsx diff --git a/x-pack/plugins/maps/public/layers/sources/ems_file_source/index.ts b/x-pack/plugins/maps/public/classes/sources/ems_file_source/index.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_file_source/index.ts rename to x-pack/plugins/maps/public/classes/sources/ems_file_source/index.ts diff --git a/x-pack/plugins/maps/public/layers/sources/ems_file_source/update_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/ems_file_source/update_source_editor.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_file_source/update_source_editor.tsx rename to x-pack/plugins/maps/public/classes/sources/ems_file_source/update_source_editor.tsx diff --git a/x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_base_map_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_base_map_layer_wizard.tsx similarity index 87% rename from x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_base_map_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_base_map_layer_wizard.tsx index 391ab5691938db..7a25609c6a5d10 100644 --- a/x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_base_map_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_base_map_layer_wizard.tsx @@ -5,11 +5,11 @@ */ import React from 'react'; import { i18n } from '@kbn/i18n'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; // @ts-ignore import { EMSTMSSource, sourceTitle } from './ems_tms_source'; // @ts-ignore -import { VectorTileLayer } from '../../vector_tile_layer'; +import { VectorTileLayer } from '../../layers/vector_tile_layer/vector_tile_layer'; // @ts-ignore import { TileServiceSelect } from './tile_service_select'; import { getIsEmsEnabled } from '../../../kibana_services'; diff --git a/x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js rename to x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.test.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.test.js rename to x-pack/plugins/maps/public/classes/sources/ems_tms_source/ems_tms_source.test.js diff --git a/x-pack/plugins/maps/public/layers/sources/ems_tms_source/index.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/index.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_tms_source/index.js rename to x-pack/plugins/maps/public/classes/sources/ems_tms_source/index.js diff --git a/x-pack/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_tms_source/tile_service_select.js rename to x-pack/plugins/maps/public/classes/sources/ems_tms_source/tile_service_select.js diff --git a/x-pack/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/ems_tms_source/update_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_tms_source/update_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/ems_tms_source/update_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/ems_unavailable_message.ts b/x-pack/plugins/maps/public/classes/sources/ems_unavailable_message.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/ems_unavailable_message.ts rename to x-pack/plugins/maps/public/classes/sources/ems_unavailable_message.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_agg_source/es_agg_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.d.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_agg_source/es_agg_source.d.ts rename to x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.d.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_agg_source/es_agg_source.js b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_agg_source/es_agg_source.js rename to x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_agg_source/es_agg_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_agg_source/es_agg_source.test.ts rename to x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_agg_source/index.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/index.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_agg_source/index.ts rename to x-pack/plugins/maps/public/classes/sources/es_agg_source/index.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/clusters_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/clusters_layer_wizard.tsx similarity index 95% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/clusters_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/clusters_layer_wizard.tsx index f9092e64833f13..4e75ae8823385c 100644 --- a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/clusters_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/clusters_layer_wizard.tsx @@ -10,8 +10,8 @@ import React from 'react'; import { CreateSourceEditor } from './create_source_editor'; // @ts-ignore import { ESGeoGridSource, clustersTitle } from './es_geo_grid_source'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; -import { VectorLayer } from '../../vector_layer'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; +import { VectorLayer } from '../../layers/vector_layer/vector_layer'; import { ESGeoGridSourceDescriptor, ColorDynamicOptions, diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.js rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.test.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/convert_to_geojson.test.ts rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/convert_to_geojson.test.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/create_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/create_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.d.ts rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.d.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.test.ts rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/geo_tile_utils.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.js rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/geo_tile_utils.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.test.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/geo_tile_utils.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/geo_tile_utils.test.js rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/geo_tile_utils.test.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/heatmap_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/heatmap_layer_wizard.tsx similarity index 90% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/heatmap_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/heatmap_layer_wizard.tsx index fee1a81a5c63ab..d0e45cb05ca064 100644 --- a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/heatmap_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/heatmap_layer_wizard.tsx @@ -10,9 +10,9 @@ import React from 'react'; import { CreateSourceEditor } from './create_source_editor'; // @ts-ignore import { ESGeoGridSource, heatmapTitle } from './es_geo_grid_source'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; // @ts-ignore -import { HeatmapLayer } from '../../heatmap_layer'; +import { HeatmapLayer } from '../../layers/heatmap_layer/heatmap_layer'; import { ESGeoGridSourceDescriptor } from '../../../../common/descriptor_types'; import { RENDER_AS } from '../../../../common/constants'; diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/index.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/index.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/index.js rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/index.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/render_as_select.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/render_as_select.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/render_as_select.tsx rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/render_as_select.tsx diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/resolution_editor.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/resolution_editor.js rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/resolution_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/convert_to_lines.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.js rename to x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/convert_to_lines.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.test.ts b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/convert_to_lines.test.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/convert_to_lines.test.ts rename to x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/convert_to_lines.test.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js rename to x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/index.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/index.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/index.js rename to x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/index.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/point_2_point_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/point_2_point_layer_wizard.tsx similarity index 94% rename from x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/point_2_point_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/point_2_point_layer_wizard.tsx index 3ad6d64903d4aa..bda1a6650c48a6 100644 --- a/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/point_2_point_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/point_2_point_layer_wizard.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; import { getDefaultDynamicProperties } from '../../styles/vector/vector_style_defaults'; -import { VectorLayer } from '../../vector_layer'; +import { VectorLayer } from '../../layers/vector_layer/vector_layer'; // @ts-ignore import { ESPewPewSource, sourceTitle } from './es_pew_pew_source'; import { VectorStyle } from '../../styles/vector/vector_style'; @@ -21,7 +21,7 @@ import { import { COLOR_GRADIENTS } from '../../styles/color_utils'; // @ts-ignore import { CreateSourceEditor } from './create_source_editor'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; import { ColorDynamicOptions, SizeDynamicOptions } from '../../../../common/descriptor_types'; export const point2PointLayerWizardConfig: LayerWizard = { diff --git a/x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap rename to x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap rename to x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/constants.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/constants.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/constants.js rename to x-pack/plugins/maps/public/classes/sources/es_search_source/constants.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/es_documents_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx similarity index 85% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/es_documents_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx index 4a775dd78f7873..8898735427ccb7 100644 --- a/x-pack/plugins/maps/public/layers/sources/es_search_source/es_documents_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx @@ -8,11 +8,11 @@ import { i18n } from '@kbn/i18n'; import React from 'react'; // @ts-ignore import { CreateSourceEditor } from './create_source_editor'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; // @ts-ignore import { ESSearchSource, sourceTitle } from './es_search_source'; -import { BlendedVectorLayer } from '../../blended_vector_layer'; -import { VectorLayer } from '../../vector_layer'; +import { BlendedVectorLayer } from '../../layers/blended_vector_layer/blended_vector_layer'; +import { VectorLayer } from '../../layers/vector_layer/vector_layer'; import { SCALING_TYPES } from '../../../../common/constants'; export function createDefaultLayerDescriptor(sourceConfig: unknown, mapColors: string[]) { diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.d.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.d.ts rename to x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.d.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/es_search_source.js rename to x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/index.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/index.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/index.js rename to x-pack/plugins/maps/public/classes/sources/es_search_source/index.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/load_index_settings.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js rename to x-pack/plugins/maps/public/classes/sources/es_search_source/load_index_settings.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/scaling_form.test.tsx rename to x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/scaling_form.tsx rename to x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_search_source/update_source_editor.test.js rename to x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.test.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_source/es_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_source/es_source.d.ts rename to x-pack/plugins/maps/public/classes/sources/es_source/es_source.d.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_source/es_source.js b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_source/es_source.js rename to x-pack/plugins/maps/public/classes/sources/es_source/es_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_source/index.ts b/x-pack/plugins/maps/public/classes/sources/es_source/index.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_source/index.ts rename to x-pack/plugins/maps/public/classes/sources/es_source/index.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_term_source/es_term_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_term_source/es_term_source.d.ts rename to x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.d.ts diff --git a/x-pack/plugins/maps/public/layers/sources/es_term_source/es_term_source.js b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_term_source/es_term_source.js rename to x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/es_term_source/es_term_source.test.js b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.test.js similarity index 98% rename from x-pack/plugins/maps/public/layers/sources/es_term_source/es_term_source.test.js rename to x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.test.js index 14eb39180a6b8b..f6779206868a59 100644 --- a/x-pack/plugins/maps/public/layers/sources/es_term_source/es_term_source.test.js +++ b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.test.js @@ -7,7 +7,7 @@ import { ESTermSource, extractPropertiesMap } from './es_term_source'; jest.mock('ui/new_platform'); -jest.mock('../../vector_layer', () => {}); +jest.mock('../../layers/vector_layer/vector_layer', () => {}); const indexPatternTitle = 'myIndex'; const termFieldName = 'myTermField'; diff --git a/x-pack/plugins/maps/public/layers/sources/es_term_source/index.ts b/x-pack/plugins/maps/public/classes/sources/es_term_source/index.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/es_term_source/index.ts rename to x-pack/plugins/maps/public/classes/sources/es_term_source/index.ts diff --git a/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/create_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/create_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/create_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/index.js b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/index.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/index.js rename to x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/index.js diff --git a/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_layer_wizard.tsx similarity index 89% rename from x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_layer_wizard.tsx index a9adec2bda2c81..309cb3abd83b25 100644 --- a/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_layer_wizard.tsx @@ -6,10 +6,10 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; // @ts-ignore import { KibanaRegionmapSource, sourceTitle } from './kibana_regionmap_source'; -import { VectorLayer } from '../../vector_layer'; +import { VectorLayer } from '../../layers/vector_layer/vector_layer'; // @ts-ignore import { CreateSourceEditor } from './create_source_editor'; // @ts-ignore diff --git a/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.d.ts b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.d.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.d.ts rename to x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.d.ts diff --git a/x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js b/x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js rename to x-pack/plugins/maps/public/classes/sources/kibana_regionmap_source/kibana_regionmap_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/create_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/create_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/create_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/index.js b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/index.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/index.js rename to x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/index.js diff --git a/x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_base_map_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/kibana_base_map_layer_wizard.tsx similarity index 89% rename from x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_base_map_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/kibana_base_map_layer_wizard.tsx index 3b4015641ede9a..46513985ed1ab2 100644 --- a/x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_base_map_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/kibana_base_map_layer_wizard.tsx @@ -6,12 +6,12 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; // @ts-ignore import { CreateSourceEditor } from './create_source_editor'; // @ts-ignore import { KibanaTilemapSource, sourceTitle } from './kibana_tilemap_source'; -import { TileLayer } from '../../tile_layer'; +import { TileLayer } from '../../layers/tile_layer/tile_layer'; // @ts-ignore import { getKibanaTileMap } from '../../../meta'; diff --git a/x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js b/x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/kibana_tilemap_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js rename to x-pack/plugins/maps/public/classes/sources/kibana_tilemap_source/kibana_tilemap_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/mvt_single_layer_vector_source/index.ts b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/index.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/mvt_single_layer_vector_source/index.ts rename to x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/index.ts diff --git a/x-pack/plugins/maps/public/layers/sources/mvt_single_layer_vector_source/layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/layer_wizard.tsx similarity index 87% rename from x-pack/plugins/maps/public/layers/sources/mvt_single_layer_vector_source/layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/layer_wizard.tsx index c94fec3deac67e..86f8108d5e23bc 100644 --- a/x-pack/plugins/maps/public/layers/sources/mvt_single_layer_vector_source/layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/layer_wizard.tsx @@ -11,8 +11,8 @@ import { MVTSingleLayerVectorSourceConfig, } from './mvt_single_layer_vector_source_editor'; import { MVTSingleLayerVectorSource, sourceTitle } from './mvt_single_layer_vector_source'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; -import { TiledVectorLayer } from '../../tiled_vector_layer'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; +import { TiledVectorLayer } from '../../layers/tiled_vector_layer/tiled_vector_layer'; export const mvtVectorSourceWizardConfig: LayerWizard = { description: i18n.translate('xpack.maps.source.mvtVectorSourceWizard', { diff --git a/x-pack/plugins/maps/public/layers/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.ts b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.ts rename to x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.ts diff --git a/x-pack/plugins/maps/public/layers/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor.tsx rename to x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor.tsx diff --git a/x-pack/plugins/maps/public/layers/sources/source.ts b/x-pack/plugins/maps/public/classes/sources/source.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/source.ts rename to x-pack/plugins/maps/public/classes/sources/source.ts diff --git a/x-pack/plugins/maps/public/layers/sources/source_registry.ts b/x-pack/plugins/maps/public/classes/sources/source_registry.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/source_registry.ts rename to x-pack/plugins/maps/public/classes/sources/source_registry.ts diff --git a/x-pack/plugins/maps/public/layers/sources/tms_source/index.ts b/x-pack/plugins/maps/public/classes/sources/tms_source/index.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/tms_source/index.ts rename to x-pack/plugins/maps/public/classes/sources/tms_source/index.ts diff --git a/x-pack/plugins/maps/public/layers/sources/tms_source/tms_source.d.ts b/x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.d.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/tms_source/tms_source.d.ts rename to x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.d.ts diff --git a/x-pack/plugins/maps/public/layers/sources/tms_source/tms_source.js b/x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/tms_source/tms_source.js rename to x-pack/plugins/maps/public/classes/sources/tms_source/tms_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/vector_feature_types.ts b/x-pack/plugins/maps/public/classes/sources/vector_feature_types.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/vector_feature_types.ts rename to x-pack/plugins/maps/public/classes/sources/vector_feature_types.ts diff --git a/x-pack/plugins/maps/public/layers/sources/vector_source/index.ts b/x-pack/plugins/maps/public/classes/sources/vector_source/index.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/vector_source/index.ts rename to x-pack/plugins/maps/public/classes/sources/vector_source/index.ts diff --git a/x-pack/plugins/maps/public/layers/sources/vector_source/vector_source.d.ts b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/vector_source/vector_source.d.ts rename to x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts diff --git a/x-pack/plugins/maps/public/layers/sources/vector_source/vector_source.js b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/vector_source/vector_source.js rename to x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/wms_source/index.js b/x-pack/plugins/maps/public/classes/sources/wms_source/index.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/wms_source/index.js rename to x-pack/plugins/maps/public/classes/sources/wms_source/index.js diff --git a/x-pack/plugins/maps/public/layers/sources/wms_source/wms_client.js b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_client.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/wms_source/wms_client.js rename to x-pack/plugins/maps/public/classes/sources/wms_source/wms_client.js diff --git a/x-pack/plugins/maps/public/layers/sources/wms_source/wms_client.test.js b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_client.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/wms_source/wms_client.test.js rename to x-pack/plugins/maps/public/classes/sources/wms_source/wms_client.test.js diff --git a/x-pack/plugins/maps/public/layers/sources/wms_source/wms_create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_create_source_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/wms_source/wms_create_source_editor.js rename to x-pack/plugins/maps/public/classes/sources/wms_source/wms_create_source_editor.js diff --git a/x-pack/plugins/maps/public/layers/sources/wms_source/wms_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_layer_wizard.tsx similarity index 88% rename from x-pack/plugins/maps/public/layers/sources/wms_source/wms_layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/wms_source/wms_layer_wizard.tsx index fbf5e25c78b170..9261b8866d115f 100644 --- a/x-pack/plugins/maps/public/layers/sources/wms_source/wms_layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_layer_wizard.tsx @@ -10,8 +10,8 @@ import { i18n } from '@kbn/i18n'; import { WMSCreateSourceEditor } from './wms_create_source_editor'; // @ts-ignore import { sourceTitle, WMSSource } from './wms_source'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; -import { TileLayer } from '../../tile_layer'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; +import { TileLayer } from '../../layers/tile_layer/tile_layer'; export const wmsLayerWizardConfig: LayerWizard = { description: i18n.translate('xpack.maps.source.wmsDescription', { diff --git a/x-pack/plugins/maps/public/layers/sources/wms_source/wms_source.js b/x-pack/plugins/maps/public/classes/sources/wms_source/wms_source.js similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/wms_source/wms_source.js rename to x-pack/plugins/maps/public/classes/sources/wms_source/wms_source.js diff --git a/x-pack/plugins/maps/public/layers/sources/xyz_tms_source/index.ts b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/index.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/xyz_tms_source/index.ts rename to x-pack/plugins/maps/public/classes/sources/xyz_tms_source/index.ts diff --git a/x-pack/plugins/maps/public/layers/sources/xyz_tms_source/layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/layer_wizard.tsx similarity index 87% rename from x-pack/plugins/maps/public/layers/sources/xyz_tms_source/layer_wizard.tsx rename to x-pack/plugins/maps/public/classes/sources/xyz_tms_source/layer_wizard.tsx index e970c75fa7adf0..574aaa262569f9 100644 --- a/x-pack/plugins/maps/public/layers/sources/xyz_tms_source/layer_wizard.tsx +++ b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/layer_wizard.tsx @@ -8,8 +8,8 @@ import { i18n } from '@kbn/i18n'; import React from 'react'; import { XYZTMSEditor, XYZTMSSourceConfig } from './xyz_tms_editor'; import { XYZTMSSource, sourceTitle } from './xyz_tms_source'; -import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry'; -import { TileLayer } from '../../tile_layer'; +import { LayerWizard, RenderWizardArguments } from '../../layers/layer_wizard_registry'; +import { TileLayer } from '../../layers/tile_layer/tile_layer'; export const tmsLayerWizardConfig: LayerWizard = { description: i18n.translate('xpack.maps.source.ems_xyzDescription', { diff --git a/x-pack/plugins/maps/public/layers/sources/xyz_tms_source/xyz_tms_editor.tsx b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_editor.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/xyz_tms_source/xyz_tms_editor.tsx rename to x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_editor.tsx diff --git a/x-pack/plugins/maps/public/layers/sources/xyz_tms_source/xyz_tms_source.test.ts b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_source.test.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/xyz_tms_source/xyz_tms_source.test.ts rename to x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_source.test.ts diff --git a/x-pack/plugins/maps/public/layers/sources/xyz_tms_source/xyz_tms_source.ts b/x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_source.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/sources/xyz_tms_source/xyz_tms_source.ts rename to x-pack/plugins/maps/public/classes/sources/xyz_tms_source/xyz_tms_source.ts diff --git a/x-pack/plugins/maps/public/layers/styles/_index.scss b/x-pack/plugins/maps/public/classes/styles/_index.scss similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/_index.scss rename to x-pack/plugins/maps/public/classes/styles/_index.scss diff --git a/x-pack/plugins/maps/public/layers/styles/color_utils.js b/x-pack/plugins/maps/public/classes/styles/color_utils.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/color_utils.js rename to x-pack/plugins/maps/public/classes/styles/color_utils.js diff --git a/x-pack/plugins/maps/public/layers/styles/color_utils.test.js b/x-pack/plugins/maps/public/classes/styles/color_utils.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/color_utils.test.js rename to x-pack/plugins/maps/public/classes/styles/color_utils.test.js diff --git a/x-pack/plugins/maps/public/layers/styles/components/_color_gradient.scss b/x-pack/plugins/maps/public/classes/styles/components/_color_gradient.scss similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/components/_color_gradient.scss rename to x-pack/plugins/maps/public/classes/styles/components/_color_gradient.scss diff --git a/x-pack/plugins/maps/public/layers/styles/components/color_gradient.js b/x-pack/plugins/maps/public/classes/styles/components/color_gradient.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/components/color_gradient.js rename to x-pack/plugins/maps/public/classes/styles/components/color_gradient.js diff --git a/x-pack/plugins/maps/public/layers/styles/components/ranged_style_legend_row.js b/x-pack/plugins/maps/public/classes/styles/components/ranged_style_legend_row.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/components/ranged_style_legend_row.js rename to x-pack/plugins/maps/public/classes/styles/components/ranged_style_legend_row.js diff --git a/x-pack/plugins/maps/public/layers/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap b/x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap rename to x-pack/plugins/maps/public/classes/styles/heatmap/components/__snapshots__/heatmap_style_editor.test.js.snap diff --git a/x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_constants.js b/x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_constants.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_constants.js rename to x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_constants.js diff --git a/x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.js b/x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_style_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.js rename to x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_style_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.test.js b/x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_style_editor.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/heatmap/components/heatmap_style_editor.test.js rename to x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_style_editor.test.js diff --git a/x-pack/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js b/x-pack/plugins/maps/public/classes/styles/heatmap/components/legend/heatmap_legend.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/heatmap/components/legend/heatmap_legend.js rename to x-pack/plugins/maps/public/classes/styles/heatmap/components/legend/heatmap_legend.js diff --git a/x-pack/plugins/maps/public/layers/styles/heatmap/heatmap_style.js b/x-pack/plugins/maps/public/classes/styles/heatmap/heatmap_style.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/heatmap/heatmap_style.js rename to x-pack/plugins/maps/public/classes/styles/heatmap/heatmap_style.js diff --git a/x-pack/plugins/maps/public/layers/styles/style.ts b/x-pack/plugins/maps/public/classes/styles/style.ts similarity index 97% rename from x-pack/plugins/maps/public/layers/styles/style.ts rename to x-pack/plugins/maps/public/classes/styles/style.ts index 38fdc36904412a..7d39acd504c426 100644 --- a/x-pack/plugins/maps/public/layers/styles/style.ts +++ b/x-pack/plugins/maps/public/classes/styles/style.ts @@ -6,7 +6,7 @@ import { ReactElement } from 'react'; import { StyleDescriptor, StyleMetaDescriptor } from '../../../common/descriptor_types'; -import { ILayer } from '../layer'; +import { ILayer } from '../layers/layer'; import { IField } from '../fields/field'; import { DataRequest } from '../util/data_request'; diff --git a/x-pack/plugins/maps/public/layers/styles/tile/tile_style.ts b/x-pack/plugins/maps/public/classes/styles/tile/tile_style.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/tile/tile_style.ts rename to x-pack/plugins/maps/public/classes/styles/tile/tile_style.ts diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss b/x-pack/plugins/maps/public/classes/styles/vector/components/_style_prop_editor.scss similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/_style_prop_editor.scss rename to x-pack/plugins/maps/public/classes/styles/vector/components/_style_prop_editor.scss diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss b/x-pack/plugins/maps/public/classes/styles/vector/components/color/_color_stops.scss similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/_color_stops.scss rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/_color_stops.scss diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_map_select.js b/x-pack/plugins/maps/public/classes/styles/vector/components/color/color_map_select.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/color_map_select.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/color_map_select.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops.js b/x-pack/plugins/maps/public/classes/styles/vector/components/color/color_stops.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/color_stops.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js b/x-pack/plugins/maps/public/classes/styles/vector/components/color/color_stops_categorical.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/color_stops_categorical.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_ordinal.js b/x-pack/plugins/maps/public/classes/styles/vector/components/color/color_stops_ordinal.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_ordinal.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/color_stops_ordinal.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_utils.js b/x-pack/plugins/maps/public/classes/styles/vector/components/color/color_stops_utils.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/color_stops_utils.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/color_stops_utils.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/color/dynamic_color_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/dynamic_color_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/mb_validated_color_picker.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/color/mb_validated_color_picker.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/mb_validated_color_picker.tsx rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/mb_validated_color_picker.tsx diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/color/static_color_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/static_color_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/static_color_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js b/x-pack/plugins/maps/public/classes/styles/vector/components/color/vector_style_color_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/color/vector_style_color_editor.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/color/vector_style_color_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/categorical_field_meta_popover.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx rename to x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/categorical_field_meta_popover.tsx diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/field_meta_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/field_meta_popover.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/field_meta_popover.tsx rename to x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/field_meta_popover.tsx diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx rename to x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/field_select.js b/x-pack/plugins/maps/public/classes/styles/vector/components/field_select.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/field_select.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/field_select.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js b/x-pack/plugins/maps/public/classes/styles/vector/components/get_vector_style_label.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/get_vector_style_label.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/get_vector_style_label.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/label/dynamic_label_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/label/dynamic_label_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/label/dynamic_label_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/label/static_label_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/label/static_label_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/label/static_label_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js b/x-pack/plugins/maps/public/classes/styles/vector/components/label/vector_style_label_border_size_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_border_size_editor.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/label/vector_style_label_border_size_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js b/x-pack/plugins/maps/public/classes/styles/vector/components/label/vector_style_label_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/label/vector_style_label_editor.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/label/vector_style_label_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/__snapshots__/vector_icon.test.js.snap diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/category.js b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/category.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/category.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/category.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/circle_icon.js b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/circle_icon.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/circle_icon.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/circle_icon.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/extract_color_from_style_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/extract_color_from_style_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/line_icon.js b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/line_icon.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/line_icon.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/line_icon.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/polygon_icon.js b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/polygon_icon.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/polygon_icon.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/polygon_icon.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/symbol_icon.js b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/symbol_icon.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/symbol_icon.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/symbol_icon.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/vector_icon.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/vector_icon.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/vector_icon.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_icon.test.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/vector_icon.test.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js b/x-pack/plugins/maps/public/classes/styles/vector/components/legend/vector_style_legend.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/legend/vector_style_legend.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/legend/vector_style_legend.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/orientation/dynamic_orientation_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/orientation/dynamic_orientation_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/orientation/dynamic_orientation_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js b/x-pack/plugins/maps/public/classes/styles/vector/components/orientation/orientation_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/orientation/orientation_editor.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/orientation/orientation_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/orientation/static_orientation_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/orientation/static_orientation_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/orientation/static_orientation_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/size/dynamic_size_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/size/dynamic_size_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/size/dynamic_size_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js b/x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/size/size_range_selector.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/size/size_range_selector.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/size/static_size_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/size/static_size_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/size/static_size_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js b/x-pack/plugins/maps/public/classes/styles/vector/components/size/vector_style_size_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/size/vector_style_size_editor.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/size/vector_style_size_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/stop_input.js b/x-pack/plugins/maps/public/classes/styles/vector/components/stop_input.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/stop_input.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/stop_input.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/style_map_select.js b/x-pack/plugins/maps/public/classes/styles/vector/components/style_map_select.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/style_map_select.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/style_map_select.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/style_option_shapes.js b/x-pack/plugins/maps/public/classes/styles/vector/components/style_option_shapes.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/style_option_shapes.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/style_option_shapes.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js b/x-pack/plugins/maps/public/classes/styles/vector/components/style_prop_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/style_prop_editor.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/style_prop_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/__snapshots__/icon_select.test.js.snap b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/icon_select.test.js.snap similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/__snapshots__/icon_select.test.js.snap rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/icon_select.test.js.snap diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/_icon_select.scss b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/_icon_select.scss similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/_icon_select.scss rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/_icon_select.scss diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/dynamic_icon_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/dynamic_icon_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/dynamic_icon_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/dynamic_icon_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_map_select.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_map_select.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_map_select.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_map_select.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_select.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_select.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.test.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_select.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_select.test.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_select.test.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_stops.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_stops.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_stops.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.test.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/icon_stops.test.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/static_icon_form.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/static_icon_form.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/static_icon_form.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/static_icon_form.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/vector_style_icon_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/vector_style_icon_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/vector_style_symbolize_as_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_symbolize_as_editor.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/symbol/vector_style_symbolize_as_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/components/vector_style_editor.js rename to x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap b/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap rename to x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/components/categorical_legend.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/components/categorical_legend.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/components/categorical_legend.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/components/ordinal_legend.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/components/ordinal_legend.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/components/ordinal_legend.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/components/ordinal_legend.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_icon_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_orientation_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.d.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts rename to x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.d.ts diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/dynamic_text_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_text_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/label_border_size_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/label_border_size_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/label_border_size_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/static_color_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/static_color_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/static_color_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/static_color_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/static_icon_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/static_icon_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/static_icon_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/static_icon_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/static_orientation_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/static_orientation_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/static_orientation_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/static_orientation_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/static_size_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/static_size_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/static_size_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/static_size_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/static_style_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/static_style_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/static_style_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/static_style_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/static_text_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/static_text_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/static_text_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/static_text_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/style_property.ts b/x-pack/plugins/maps/public/classes/styles/vector/properties/style_property.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/style_property.ts rename to x-pack/plugins/maps/public/classes/styles/vector/properties/style_property.ts diff --git a/x-pack/plugins/maps/public/layers/styles/vector/properties/symbolize_as_property.js b/x-pack/plugins/maps/public/classes/styles/vector/properties/symbolize_as_property.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/properties/symbolize_as_property.js rename to x-pack/plugins/maps/public/classes/styles/vector/properties/symbolize_as_property.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/style_meta.ts b/x-pack/plugins/maps/public/classes/styles/vector/style_meta.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/style_meta.ts rename to x-pack/plugins/maps/public/classes/styles/vector/style_meta.ts diff --git a/x-pack/plugins/maps/public/layers/styles/vector/style_util.js b/x-pack/plugins/maps/public/classes/styles/vector/style_util.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/style_util.js rename to x-pack/plugins/maps/public/classes/styles/vector/style_util.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/style_util.test.js b/x-pack/plugins/maps/public/classes/styles/vector/style_util.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/style_util.test.js rename to x-pack/plugins/maps/public/classes/styles/vector/style_util.test.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/symbol_utils.js b/x-pack/plugins/maps/public/classes/styles/vector/symbol_utils.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/symbol_utils.js rename to x-pack/plugins/maps/public/classes/styles/vector/symbol_utils.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/symbol_utils.test.js b/x-pack/plugins/maps/public/classes/styles/vector/symbol_utils.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/symbol_utils.test.js rename to x-pack/plugins/maps/public/classes/styles/vector/symbol_utils.test.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/vector_style.d.ts b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.d.ts similarity index 94% rename from x-pack/plugins/maps/public/layers/styles/vector/vector_style.d.ts rename to x-pack/plugins/maps/public/classes/styles/vector/vector_style.d.ts index 762322b8e09f9a..beea9439439944 100644 --- a/x-pack/plugins/maps/public/layers/styles/vector/vector_style.d.ts +++ b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.d.ts @@ -5,7 +5,7 @@ */ import { IStyleProperty } from './properties/style_property'; import { IDynamicStyleProperty } from './properties/dynamic_style_property'; -import { IVectorLayer } from '../../vector_layer'; +import { IVectorLayer } from '../../layers/vector_layer/vector_layer'; import { IVectorSource } from '../../sources/vector_source'; import { AbstractStyle, IStyle } from '../style'; import { diff --git a/x-pack/plugins/maps/public/layers/styles/vector/vector_style.js b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/vector_style.js rename to x-pack/plugins/maps/public/classes/styles/vector/vector_style.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/vector_style.test.js b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/vector_style.test.js rename to x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js diff --git a/x-pack/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts b/x-pack/plugins/maps/public/classes/styles/vector/vector_style_defaults.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts rename to x-pack/plugins/maps/public/classes/styles/vector/vector_style_defaults.ts diff --git a/x-pack/plugins/maps/public/layers/tooltips/es_agg_tooltip_property.ts b/x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/tooltips/es_agg_tooltip_property.ts rename to x-pack/plugins/maps/public/classes/tooltips/es_agg_tooltip_property.ts diff --git a/x-pack/plugins/maps/public/layers/tooltips/es_tooltip_property.test.ts b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/tooltips/es_tooltip_property.test.ts rename to x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts diff --git a/x-pack/plugins/maps/public/layers/tooltips/es_tooltip_property.ts b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/tooltips/es_tooltip_property.ts rename to x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.ts diff --git a/x-pack/plugins/maps/public/layers/tooltips/join_tooltip_property.ts b/x-pack/plugins/maps/public/classes/tooltips/join_tooltip_property.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/tooltips/join_tooltip_property.ts rename to x-pack/plugins/maps/public/classes/tooltips/join_tooltip_property.ts diff --git a/x-pack/plugins/maps/public/layers/tooltips/tooltip_property.ts b/x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/tooltips/tooltip_property.ts rename to x-pack/plugins/maps/public/classes/tooltips/tooltip_property.ts diff --git a/x-pack/plugins/maps/public/layers/util/assign_feature_ids.test.ts b/x-pack/plugins/maps/public/classes/util/assign_feature_ids.test.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/util/assign_feature_ids.test.ts rename to x-pack/plugins/maps/public/classes/util/assign_feature_ids.test.ts diff --git a/x-pack/plugins/maps/public/layers/util/assign_feature_ids.ts b/x-pack/plugins/maps/public/classes/util/assign_feature_ids.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/util/assign_feature_ids.ts rename to x-pack/plugins/maps/public/classes/util/assign_feature_ids.ts diff --git a/x-pack/plugins/maps/public/layers/util/can_skip_fetch.test.js b/x-pack/plugins/maps/public/classes/util/can_skip_fetch.test.js similarity index 100% rename from x-pack/plugins/maps/public/layers/util/can_skip_fetch.test.js rename to x-pack/plugins/maps/public/classes/util/can_skip_fetch.test.js diff --git a/x-pack/plugins/maps/public/layers/util/can_skip_fetch.ts b/x-pack/plugins/maps/public/classes/util/can_skip_fetch.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/util/can_skip_fetch.ts rename to x-pack/plugins/maps/public/classes/util/can_skip_fetch.ts diff --git a/x-pack/plugins/maps/public/layers/util/data_request.ts b/x-pack/plugins/maps/public/classes/util/data_request.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/util/data_request.ts rename to x-pack/plugins/maps/public/classes/util/data_request.ts diff --git a/x-pack/plugins/maps/public/layers/util/es_agg_utils.test.ts b/x-pack/plugins/maps/public/classes/util/es_agg_utils.test.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/util/es_agg_utils.test.ts rename to x-pack/plugins/maps/public/classes/util/es_agg_utils.test.ts diff --git a/x-pack/plugins/maps/public/layers/util/es_agg_utils.ts b/x-pack/plugins/maps/public/classes/util/es_agg_utils.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/util/es_agg_utils.ts rename to x-pack/plugins/maps/public/classes/util/es_agg_utils.ts diff --git a/x-pack/plugins/maps/public/layers/util/is_metric_countable.ts b/x-pack/plugins/maps/public/classes/util/is_metric_countable.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/util/is_metric_countable.ts rename to x-pack/plugins/maps/public/classes/util/is_metric_countable.ts diff --git a/x-pack/plugins/maps/public/layers/util/is_refresh_only_query.ts b/x-pack/plugins/maps/public/classes/util/is_refresh_only_query.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/util/is_refresh_only_query.ts rename to x-pack/plugins/maps/public/classes/util/is_refresh_only_query.ts diff --git a/x-pack/plugins/maps/public/layers/util/mb_filter_expressions.ts b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts similarity index 100% rename from x-pack/plugins/maps/public/layers/util/mb_filter_expressions.ts rename to x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts diff --git a/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.test.tsx b/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.test.tsx index 10d3f6af633706..f3ac62717519df 100644 --- a/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.test.tsx +++ b/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { TooltipSelector } from './tooltip_selector'; -import { AbstractField } from '../../layers/fields/field'; +import { AbstractField } from '../../classes/fields/field'; import { FIELD_ORIGIN } from '../../../common/constants'; class MockField extends AbstractField { diff --git a/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.tsx b/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.tsx index 211276cda904a6..34c58c4c8a183e 100644 --- a/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.tsx +++ b/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.tsx @@ -17,7 +17,7 @@ import { } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { AddTooltipFieldPopover, FieldProps } from './add_tooltip_field_popover'; -import { IField } from '../../layers/fields/field'; +import { IField } from '../../classes/fields/field'; // TODO import reorder from EUI once its exposed as service // https://github.com/elastic/eui/issues/2372 diff --git a/x-pack/plugins/maps/public/connected_components/gis_map/index.d.ts b/x-pack/plugins/maps/public/connected_components/gis_map/index.d.ts index 7edc51d9d78b30..3f3fa48b3d7692 100644 --- a/x-pack/plugins/maps/public/connected_components/gis_map/index.d.ts +++ b/x-pack/plugins/maps/public/connected_components/gis_map/index.d.ts @@ -7,7 +7,7 @@ import React from 'react'; import { Filter } from 'src/plugins/data/public'; -import { RenderToolTipContent } from '../../layers/tooltips/tooltip_property'; +import { RenderToolTipContent } from '../../classes/tooltips/tooltip_property'; declare const GisMap: React.ComponentType<{ addFilters: ((filters: Filter[]) => void) | null; diff --git a/x-pack/plugins/maps/public/connected_components/gis_map/view.js b/x-pack/plugins/maps/public/connected_components/gis_map/view.js index ca4b062ee7273f..0100db0393d060 100644 --- a/x-pack/plugins/maps/public/connected_components/gis_map/view.js +++ b/x-pack/plugins/maps/public/connected_components/gis_map/view.js @@ -22,7 +22,7 @@ import { i18n } from '@kbn/i18n'; import uuid from 'uuid/v4'; import { FLYOUT_STATE } from '../../reducers/ui'; import { MapSettingsPanel } from '../map_settings_panel'; -import { registerLayerWizards } from '../../layers/load_layer_wizards'; +import { registerLayerWizards } from '../../classes/layers/load_layer_wizards'; const RENDER_COMPLETE_EVENT = 'renderComplete'; diff --git a/x-pack/plugins/maps/public/connected_components/layer_addpanel/import_editor/view.js b/x-pack/plugins/maps/public/connected_components/layer_addpanel/import_editor/view.js index 8ebb17ac4fff56..0dca2b8bd002ca 100644 --- a/x-pack/plugins/maps/public/connected_components/layer_addpanel/import_editor/view.js +++ b/x-pack/plugins/maps/public/connected_components/layer_addpanel/import_editor/view.js @@ -7,7 +7,7 @@ import React from 'react'; import { EuiPanel } from '@elastic/eui'; -import { uploadLayerWizardConfig } from '../../../layers/sources/client_file_source'; +import { uploadLayerWizardConfig } from '../../../classes/sources/client_file_source'; export const ImportEditor = props => { const editorProperties = getEditorProperties(props); diff --git a/x-pack/plugins/maps/public/connected_components/layer_addpanel/layer_wizard_select.tsx b/x-pack/plugins/maps/public/connected_components/layer_addpanel/layer_wizard_select.tsx index 0359ed2c6269d9..80afe5c8f8a36e 100644 --- a/x-pack/plugins/maps/public/connected_components/layer_addpanel/layer_wizard_select.tsx +++ b/x-pack/plugins/maps/public/connected_components/layer_addpanel/layer_wizard_select.tsx @@ -7,7 +7,7 @@ import _ from 'lodash'; import React, { Component, Fragment } from 'react'; import { EuiSpacer, EuiCard, EuiIcon } from '@elastic/eui'; -import { getLayerWizards, LayerWizard } from '../../layers/layer_wizard_registry'; +import { getLayerWizards, LayerWizard } from '../../classes/layers/layer_wizard_registry'; interface Props { onSelect: (layerWizard: LayerWizard) => void; diff --git a/x-pack/plugins/maps/public/connected_components/map_settings_panel/spatial_filters_panel.tsx b/x-pack/plugins/maps/public/connected_components/map_settings_panel/spatial_filters_panel.tsx index cae703e982966d..e9ed740873e1a8 100644 --- a/x-pack/plugins/maps/public/connected_components/map_settings_panel/spatial_filters_panel.tsx +++ b/x-pack/plugins/maps/public/connected_components/map_settings_panel/spatial_filters_panel.tsx @@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { MapSettings } from '../../reducers/map'; import { AlphaSlider } from '../../components/alpha_slider'; -import { MbValidatedColorPicker } from '../../layers/styles/vector/components/color/mb_validated_color_picker'; +import { MbValidatedColorPicker } from '../../classes/styles/vector/components/color/mb_validated_color_picker'; interface Props { settings: MapSettings; diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx index 0b168badb2f3ff..ca75060c4f8dfe 100644 --- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx +++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { EuiButtonIcon } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { ILayer } from '../../../layers/layer'; +import { ILayer } from '../../../classes/layers/layer'; interface Props { layerList: ILayer[]; diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx index b873119fd7d139..5eaba5330a3a73 100644 --- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx +++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx @@ -7,9 +7,9 @@ import React from 'react'; import { shallowWithIntl } from 'test_utils/enzyme_helpers'; -import { AbstractLayer, ILayer } from '../../../../../../layers/layer'; -import { AbstractSource, ISource } from '../../../../../../layers/sources/source'; -import { AbstractStyle, IStyle } from '../../../../../../layers/styles/style'; +import { AbstractLayer, ILayer } from '../../../../../../classes/layers/layer'; +import { AbstractSource, ISource } from '../../../../../../classes/sources/source'; +import { AbstractStyle, IStyle } from '../../../../../../classes/styles/style'; import { TOCEntryActionsPopover } from './toc_entry_actions_popover'; diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx index dfc93c29263ee8..344e96e511f2e0 100644 --- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx +++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx @@ -8,7 +8,7 @@ import React, { Component, Fragment } from 'react'; import { EuiButtonEmpty, EuiPopover, EuiContextMenu, EuiIcon, EuiToolTip } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; -import { ILayer } from '../../../../../../layers/layer'; +import { ILayer } from '../../../../../../classes/layers/layer'; interface Props { cloneLayer: (layerId: string) => void; diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx index c3937ba4cdcbb9..fa255cc73a2100 100644 --- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx +++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx @@ -51,7 +51,7 @@ import { } from '../reducers/non_serializable_instances'; import { getMapCenter, getMapZoom, getHiddenLayerIds } from '../selectors/map_selectors'; import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants'; -import { RenderToolTipContent } from '../layers/tooltips/tooltip_property'; +import { RenderToolTipContent } from '../classes/tooltips/tooltip_property'; import { getUiActions, getCoreI18n } from '../kibana_services'; import { MapEmbeddableInput, MapEmbeddableConfig } from './types'; diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts index 7e3a8387bed116..f33885c2a24620 100644 --- a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts +++ b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts @@ -18,7 +18,7 @@ import { createMapPath, MAP_SAVED_OBJECT_TYPE, APP_ICON } from '../../common/con import { MapStore, MapStoreState } from '../reducers/store'; import { MapEmbeddableConfig, MapEmbeddableInput } from './types'; import { MapEmbeddableOutput } from './map_embeddable'; -import { RenderToolTipContent } from '../layers/tooltips/tooltip_property'; +import { RenderToolTipContent } from '../classes/tooltips/tooltip_property'; import { EventHandlers } from '../reducers/non_serializable_instances'; let whenModulesLoadedPromise: Promise; diff --git a/x-pack/plugins/maps/public/index.scss b/x-pack/plugins/maps/public/index.scss index 8b2f6d3cb61563..fe974fa610c03e 100644 --- a/x-pack/plugins/maps/public/index.scss +++ b/x-pack/plugins/maps/public/index.scss @@ -14,4 +14,4 @@ @import 'mapbox_hacks'; @import 'connected_components/index'; @import 'components/index'; -@import 'layers/index'; +@import 'classes/index'; diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.d.ts b/x-pack/plugins/maps/public/selectors/map_selectors.d.ts index 9caa151db6d5a4..77b5293dfaa095 100644 --- a/x-pack/plugins/maps/public/selectors/map_selectors.d.ts +++ b/x-pack/plugins/maps/public/selectors/map_selectors.d.ts @@ -7,8 +7,8 @@ import { MapCenter } from '../../common/descriptor_types'; import { MapStoreState } from '../reducers/store'; import { MapSettings } from '../reducers/map'; -import { IVectorLayer } from '../layers/vector_layer'; -import { ILayer } from '../layers/layer'; +import { IVectorLayer } from '../classes/layers/vector_layer/vector_layer'; +import { ILayer } from '../classes/layers/layer'; export function getHiddenLayerIds(state: MapStoreState): string[]; diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.js b/x-pack/plugins/maps/public/selectors/map_selectors.js index 38a862973623a2..c2933dc3052cc7 100644 --- a/x-pack/plugins/maps/public/selectors/map_selectors.js +++ b/x-pack/plugins/maps/public/selectors/map_selectors.js @@ -6,18 +6,18 @@ import { createSelector } from 'reselect'; import _ from 'lodash'; -import { TileLayer } from '../layers/tile_layer'; -import { VectorTileLayer } from '../layers/vector_tile_layer'; -import { VectorLayer } from '../layers/vector_layer'; -import { HeatmapLayer } from '../layers/heatmap_layer'; -import { BlendedVectorLayer } from '../layers/blended_vector_layer'; +import { TileLayer } from '../classes/layers/tile_layer/tile_layer'; +import { VectorTileLayer } from '../classes/layers/vector_tile_layer/vector_tile_layer'; +import { VectorLayer } from '../classes/layers/vector_layer/vector_layer'; +import { HeatmapLayer } from '../classes/layers/heatmap_layer/heatmap_layer'; +import { BlendedVectorLayer } from '../classes/layers/blended_vector_layer/blended_vector_layer'; import { getTimeFilter } from '../kibana_services'; import { getInspectorAdapters } from '../reducers/non_serializable_instances'; -import { TiledVectorLayer } from '../layers/tiled_vector_layer'; +import { TiledVectorLayer } from '../classes/layers/tiled_vector_layer/tiled_vector_layer'; import { copyPersistentState, TRACKED_LAYER_DESCRIPTOR } from '../reducers/util'; -import { InnerJoin } from '../layers/joins/inner_join'; -import { getSourceByType } from '../layers/sources/source_registry'; -import { GeojsonFileSource } from '../layers/sources/client_file_source'; +import { InnerJoin } from '../classes/joins/inner_join'; +import { getSourceByType } from '../classes/sources/source_registry'; +import { GeojsonFileSource } from '../classes/sources/client_file_source'; import { LAYER_TYPE, SOURCE_DATA_ID_ORIGIN, diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.test.js b/x-pack/plugins/maps/public/selectors/map_selectors.test.js index fec16251914ead..b6b192ecd9bca5 100644 --- a/x-pack/plugins/maps/public/selectors/map_selectors.test.js +++ b/x-pack/plugins/maps/public/selectors/map_selectors.test.js @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -jest.mock('../layers/vector_layer', () => {}); -jest.mock('../layers/tiled_vector_layer', () => {}); -jest.mock('../layers/blended_vector_layer', () => {}); -jest.mock('../layers/heatmap_layer', () => {}); -jest.mock('../layers/vector_tile_layer', () => {}); -jest.mock('../layers/joins/inner_join', () => {}); +jest.mock('../classes/layers/vector_layer/vector_layer', () => {}); +jest.mock('../classes/layers/tiled_vector_layer/tiled_vector_layer', () => {}); +jest.mock('../classes/layers/blended_vector_layer/blended_vector_layer', () => {}); +jest.mock('../classes/layers/heatmap_layer/heatmap_layer', () => {}); +jest.mock('../classes/layers/vector_tile_layer/vector_tile_layer', () => {}); +jest.mock('../classes/joins/inner_join', () => {}); jest.mock('../reducers/non_serializable_instances', () => ({ getInspectorAdapters: () => { return {}; From 3bb51bb430a7b3de9d1fce4c924cd1d08aa010a6 Mon Sep 17 00:00:00 2001 From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com> Date: Mon, 11 May 2020 22:52:43 -0400 Subject: [PATCH 61/65] [SIEM] [Security] unified code structure phase 0 (#65965) * apply new structure for teh security solutions * fix few imports + store * fix types * update path in test * miss path in api_integration Co-authored-by: Elastic Machine --- .../components/activity_monitor/columns.tsx | 2 +- .../activity_monitor/index.test.tsx | 0 .../components/activity_monitor/index.tsx | 4 +- .../components/activity_monitor/types.ts | 0 .../index.test.tsx | 0 .../detection_engine_header_page/index.tsx | 2 +- .../translations.ts | 0 .../no_api_integration_callout/index.test.tsx | 0 .../no_api_integration_callout/index.tsx | 0 .../translations.ts | 0 .../no_write_signals_callout/index.test.tsx | 0 .../no_write_signals_callout/index.tsx | 0 .../no_write_signals_callout/translations.ts | 0 .../rules}/accordion_title/index.test.tsx | 0 .../rules}/accordion_title/index.tsx | 0 .../rules}/add_item_form/index.test.tsx | 2 +- .../components/rules}/add_item_form/index.tsx | 4 +- .../rules}/all_rules_tables/index.test.tsx | 2 +- .../rules}/all_rules_tables/index.tsx | 10 +- .../anomaly_threshold_slider/index.test.tsx | 2 +- .../rules}/anomaly_threshold_slider/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 0 .../assets/list_tree_icon.svg | 0 .../rules}/description_step/helpers.test.tsx | 4 +- .../rules}/description_step/helpers.tsx | 6 +- .../rules}/description_step/index.test.tsx | 20 +- .../rules}/description_step/index.tsx | 14 +- .../ml_job_description.test.tsx | 2 +- .../description_step/ml_job_description.tsx | 6 +- .../rules}/description_step/translations.tsx | 0 .../rules}/description_step/types.ts | 4 +- .../components/rules}/mitre/helpers.test.tsx | 0 .../components/rules}/mitre/helpers.ts | 2 +- .../components/rules}/mitre/index.test.tsx | 2 +- .../components/rules}/mitre/index.tsx | 6 +- .../components/rules}/mitre/translations.ts | 0 .../rules}/ml_job_select/index.test.tsx | 8 +- .../components/rules}/ml_job_select/index.tsx | 8 +- .../__snapshots__/index.test.tsx.snap | 0 .../rules}/next_step/index.test.tsx | 0 .../components/rules}/next_step/index.tsx | 2 +- .../optional_field_label/index.test.tsx | 0 .../rules}/optional_field_label/index.tsx | 2 +- .../rules}/pick_timeline/index.test.tsx | 2 +- .../components/rules}/pick_timeline/index.tsx | 4 +- .../load_empty_prompt.test.tsx | 0 .../pre_packaged_rules/load_empty_prompt.tsx | 2 +- .../rules}/pre_packaged_rules/translations.ts | 0 .../update_callout.test.tsx | 4 +- .../pre_packaged_rules/update_callout.tsx | 2 +- .../rules}/query_bar/index.test.tsx | 4 +- .../components/rules}/query_bar/index.tsx | 24 +- .../rules}/query_bar/translations.tsx | 0 .../rules}/read_only_callout/index.test.tsx | 0 .../rules}/read_only_callout/index.tsx | 0 .../rules}/read_only_callout/translations.ts | 0 .../rules}/rule_actions_field/index.test.tsx | 6 +- .../rules}/rule_actions_field/index.tsx | 12 +- .../__snapshots__/index.test.tsx.snap | 0 .../rule_actions_overflow/index.test.tsx | 9 +- .../rules}/rule_actions_overflow/index.tsx | 15 +- .../rule_actions_overflow/translations.ts | 0 .../rules}/rule_status/helpers.test.tsx | 0 .../components/rules}/rule_status/helpers.ts | 2 +- .../rules}/rule_status/index.test.tsx | 0 .../components/rules}/rule_status/index.tsx | 9 +- .../rules}/rule_status/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../rules}/rule_switch/index.test.tsx | 0 .../components/rules}/rule_switch/index.tsx | 12 +- .../rules}/schedule_item_form/index.test.tsx | 2 +- .../rules}/schedule_item_form/index.tsx | 2 +- .../rules}/schedule_item_form/translations.ts | 0 .../rules}/select_rule_type/index.test.tsx | 4 +- .../rules}/select_rule_type/index.tsx | 8 +- .../rules}/select_rule_type/translations.ts | 0 .../rules}/severity_badge/index.test.tsx | 0 .../rules}/severity_badge/index.tsx | 0 .../rules}/status_icon/index.test.tsx | 4 +- .../components/rules}/status_icon/index.tsx | 4 +- .../rules}/step_about_rule/data.tsx | 0 .../rules}/step_about_rule/default_value.ts | 2 +- .../rules}/step_about_rule/helpers.test.ts | 0 .../rules}/step_about_rule/helpers.ts | 0 .../rules}/step_about_rule/index.test.tsx | 5 +- .../rules}/step_about_rule/index.tsx | 12 +- .../rules}/step_about_rule/schema.tsx | 4 +- .../rules}/step_about_rule/translations.ts | 0 .../step_about_rule_details/index.test.tsx | 12 +- .../rules}/step_about_rule_details/index.tsx | 8 +- .../step_about_rule_details/translations.ts | 0 .../step_content_wrapper/index.test.tsx | 0 .../rules}/step_content_wrapper/index.tsx | 0 .../rules}/step_define_rule/index.test.tsx | 2 +- .../rules}/step_define_rule/index.tsx | 31 ++- .../rules}/step_define_rule/schema.tsx | 6 +- .../rules}/step_define_rule/translations.tsx | 0 .../rules}/step_define_rule/types.ts | 0 .../rules}/step_panel/index.test.tsx | 0 .../components/rules}/step_panel/index.tsx | 2 +- .../rules}/step_rule_actions/index.test.tsx | 2 +- .../rules}/step_rule_actions/index.tsx | 12 +- .../rules}/step_rule_actions/schema.tsx | 2 +- .../rules}/step_rule_actions/translations.tsx | 0 .../rules}/step_schedule_rule/index.test.tsx | 2 +- .../rules}/step_schedule_rule/index.tsx | 10 +- .../rules}/step_schedule_rule/schema.tsx | 2 +- .../step_schedule_rule/translations.tsx | 0 .../throttle_select_field/index.test.tsx | 2 +- .../rules}/throttle_select_field/index.tsx | 4 +- .../components/signals/actions.test.tsx | 6 +- .../components/signals/actions.tsx | 12 +- .../signals/default_config.test.tsx | 6 +- .../components/signals/default_config.tsx | 15 +- .../components/signals/helpers.test.ts | 11 +- .../components/signals/helpers.ts | 6 +- .../components/signals/index.test.tsx | 0 .../components/signals/index.tsx | 24 +- .../signals_filter_group/index.test.tsx | 0 .../signals/signals_filter_group/index.tsx | 0 .../signals_utility_bar/index.test.tsx | 2 +- .../signals/signals_utility_bar/index.tsx | 8 +- .../signals_utility_bar/translations.ts | 0 .../components/signals/translations.ts | 0 .../components/signals/types.ts | 6 +- .../signals_histogram_panel/config.ts | 0 .../signals_histogram_panel/helpers.test.tsx | 0 .../signals_histogram_panel/helpers.tsx | 4 +- .../signals_histogram_panel/index.test.tsx | 4 +- .../signals_histogram_panel/index.tsx | 30 +-- .../signals_histogram.test.tsx | 2 +- .../signals_histogram.tsx | 8 +- .../signals_histogram_panel/translations.ts | 0 .../signals_histogram_panel/types.ts | 2 +- .../components/signals_info/index.tsx | 2 +- .../components/signals_info/query.dsl.ts | 0 .../components/signals_info/types.ts | 0 .../components/user_info/index.test.tsx | 12 +- .../components/user_info/index.tsx | 6 +- .../detection_engine/rules/__mocks__/api.ts | 0 .../detection_engine/rules/api.test.ts | 4 +- .../containers/detection_engine/rules/api.ts | 4 +- .../rules/fetch_index_patterns.test.tsx | 8 +- .../rules/fetch_index_patterns.tsx | 10 +- .../detection_engine/rules/index.ts | 0 .../containers/detection_engine/rules/mock.ts | 0 .../rules/persist_rule.test.tsx | 0 .../detection_engine/rules/persist_rule.tsx | 2 +- .../detection_engine/rules/translations.ts | 0 .../detection_engine/rules/types.ts | 2 +- .../rules/use_pre_packaged_rules.test.tsx | 0 .../rules/use_pre_packaged_rules.tsx | 6 +- .../detection_engine/rules/use_rule.test.tsx | 0 .../detection_engine/rules/use_rule.tsx | 2 +- .../rules/use_rule_status.test.tsx | 2 +- .../rules/use_rule_status.tsx | 2 +- .../detection_engine/rules/use_rules.test.tsx | 0 .../detection_engine/rules/use_rules.tsx | 2 +- .../detection_engine/rules/use_tags.test.tsx | 0 .../detection_engine/rules/use_tags.tsx | 2 +- .../detection_engine/signals/__mocks__/api.ts | 0 .../detection_engine/signals/api.test.ts | 4 +- .../detection_engine/signals/api.ts | 4 +- .../detection_engine/signals/mock.ts | 0 .../detection_engine/signals/translations.ts | 0 .../detection_engine/signals/types.ts | 0 .../signals/use_privilege_user.test.tsx | 0 .../signals/use_privilege_user.tsx | 2 +- .../signals/use_query.test.tsx | 0 .../detection_engine/signals/use_query.tsx | 0 .../signals/use_signal_index.test.tsx | 0 .../signals/use_signal_index.tsx | 4 +- x-pack/plugins/siem/public/alerts/index.ts | 18 ++ .../mitre/mitre_tactics_techniques.ts | 0 .../mitre/types.ts | 0 .../detection_engine.test.tsx | 10 +- .../detection_engine/detection_engine.tsx | 51 +++-- .../detection_engine_empty_page.test.tsx | 2 +- .../detection_engine_empty_page.tsx | 6 +- .../detection_engine_no_signal_index.test.tsx | 2 +- .../detection_engine_no_signal_index.tsx | 4 +- ...ction_engine_user_unauthenticated.test.tsx | 2 +- .../detection_engine_user_unauthenticated.tsx | 4 +- .../pages/detection_engine/index.test.tsx | 2 +- .../pages/detection_engine/index.tsx | 2 +- .../rules/all/__mocks__/mock.ts | 6 +- .../detection_engine/rules/all/actions.tsx | 8 +- .../rules/all/batch_actions.tsx | 4 +- .../rules/all/columns.test.tsx | 0 .../detection_engine/rules/all/columns.tsx | 22 +- .../rules/all/helpers.test.tsx | 2 +- .../detection_engine/rules/all/helpers.ts | 2 +- .../detection_engine/rules/all/index.test.tsx | 8 +- .../detection_engine/rules/all/index.tsx | 22 +- .../detection_engine/rules/all/reducer.ts | 2 +- .../rules_table_filters.test.tsx | 0 .../rules_table_filters.tsx | 4 +- .../tags_filter_popover.test.tsx | 0 .../tags_filter_popover.tsx | 2 +- .../rules/create/helpers.test.ts | 2 +- .../detection_engine/rules/create/helpers.ts | 10 +- .../rules/create/index.test.tsx | 6 +- .../detection_engine/rules/create/index.tsx | 26 +-- .../rules/create/translations.ts | 0 .../rules/details/failure_history.test.tsx | 6 +- .../rules/details/failure_history.tsx | 9 +- .../rules/details/index.test.tsx | 10 +- .../detection_engine/rules/details/index.tsx | 64 +++--- .../details/status_failed_callout.test.tsx | 0 .../rules/details/status_failed_callout.tsx | 2 +- .../rules/details/translations.ts | 0 .../rules/edit/index.test.tsx | 6 +- .../detection_engine/rules/edit/index.tsx | 26 +-- .../rules/edit/translations.ts | 0 .../detection_engine/rules/helpers.test.tsx | 4 +- .../pages/detection_engine/rules/helpers.tsx | 12 +- .../detection_engine/rules/index.test.tsx | 8 +- .../pages/detection_engine/rules/index.tsx | 21 +- .../detection_engine/rules/translations.ts | 0 .../pages/detection_engine/rules/types.ts | 12 +- .../detection_engine/rules/utils.test.ts | 0 .../pages/detection_engine/rules/utils.ts | 7 +- .../pages/detection_engine/translations.ts | 0 .../pages/detection_engine/types.ts | 0 x-pack/plugins/siem/public/alerts/routes.tsx | 20 ++ .../siem/public/{pages => app}/404.tsx | 2 +- x-pack/plugins/siem/public/app/app.tsx | 48 ++-- .../{pages => app}/home/home_navigations.tsx | 4 +- .../siem/public/{pages => app}/home/index.tsx | 68 ++---- .../{pages => app}/home/translations.ts | 0 x-pack/plugins/siem/public/app/index.tsx | 10 +- .../plugins/siem/public/{ => app}/routes.tsx | 11 +- x-pack/plugins/siem/public/app/types.ts | 61 ++++++ .../components/__mock__/form.ts | 4 +- .../components/__mock__/router.ts | 0 .../components/add_comment/index.test.tsx | 20 +- .../components/add_comment/index.tsx | 16 +- .../components/add_comment/schema.tsx | 6 +- .../components/add_comment/translations.ts} | 5 +- .../components/all_cases/actions.tsx | 4 +- .../components/all_cases/columns.test.tsx | 2 +- .../components/all_cases/columns.tsx | 10 +- .../components/all_cases/index.test.tsx | 26 ++- .../components/all_cases/index.tsx | 24 +- .../all_cases/table_filters.test.tsx | 14 +- .../components/all_cases/table_filters.tsx | 8 +- .../components/all_cases/translations.ts | 0 .../components/bulk_actions/index.tsx | 0 .../components/bulk_actions/translations.ts | 0 .../components/callout/helpers.tsx | 0 .../components/callout/index.test.tsx | 2 +- .../components/callout/index.tsx | 0 .../components/callout/translations.ts | 0 .../components/case_header_page/index.tsx | 2 +- .../case_header_page/translations.ts | 0 .../components/case_status/index.tsx | 6 +- .../components/case_view/actions.test.tsx | 8 +- .../components/case_view/actions.tsx | 8 +- .../components/case_view/index.test.tsx | 20 +- .../components/case_view/index.tsx | 28 +-- .../components/case_view/translations.ts | 0 .../configure_cases/__mock__/index.tsx | 15 +- .../configure_cases/button.test.tsx | 2 +- .../components/configure_cases/button.tsx | 2 +- .../configure_cases/closure_options.test.tsx | 2 +- .../configure_cases/closure_options.tsx | 2 +- .../closure_options_radio.test.tsx | 2 +- .../configure_cases/closure_options_radio.tsx | 2 +- .../configure_cases/connectors.test.tsx | 2 +- .../components/configure_cases/connectors.tsx | 2 +- .../connectors_dropdown.test.tsx | 2 +- .../configure_cases/connectors_dropdown.tsx | 4 +- .../configure_cases/field_mapping.test.tsx | 6 +- .../configure_cases/field_mapping.tsx | 8 +- .../field_mapping_row.test.tsx | 4 +- .../configure_cases/field_mapping_row.tsx | 9 +- .../components/configure_cases/index.test.tsx | 22 +- .../components/configure_cases/index.tsx | 23 +- .../configure_cases/mapping.test.tsx | 2 +- .../components/configure_cases/mapping.tsx | 2 +- .../configure_cases/translations.ts | 0 .../components/configure_cases/utils.test.tsx | 2 +- .../components/configure_cases/utils.ts | 2 +- .../components/confirm_delete_case/index.tsx | 0 .../confirm_delete_case/translations.ts | 0 .../components/connector_selector/form.tsx | 4 +- .../components/create/index.test.tsx | 26 +-- .../components/create/index.tsx | 16 +- .../create/optional_field_label/index.tsx | 0 .../components/create/schema.tsx | 4 +- .../components/edit_connector/index.test.tsx | 8 +- .../components/edit_connector/index.tsx | 4 +- .../components/edit_connector/schema.tsx | 2 +- .../components/filter_popover/index.tsx | 0 .../components/open_closed_stats/index.tsx | 0 .../components/property_actions/constants.ts | 0 .../components/property_actions/index.tsx | 0 .../property_actions/translations.ts | 0 .../components/tag_list/index.test.tsx | 16 +- .../components/tag_list/index.tsx | 4 +- .../components/tag_list/schema.tsx | 2 +- .../components/tag_list/translations.ts | 0 .../use_push_to_service/helpers.tsx | 2 +- .../use_push_to_service/index.test.tsx | 18 +- .../components/use_push_to_service/index.tsx | 16 +- .../use_push_to_service/translations.ts | 0 .../user_action_tree/helpers.test.tsx | 4 +- .../components/user_action_tree/helpers.tsx | 4 +- .../user_action_tree/index.test.tsx | 12 +- .../components/user_action_tree/index.tsx | 12 +- .../components/user_action_tree/schema.ts | 2 +- .../user_action_tree/translations.ts | 0 .../user_action_tree/user_action_avatar.tsx | 0 .../user_action_tree/user_action_item.tsx | 0 .../user_action_tree/user_action_markdown.tsx | 10 +- .../user_action_title.test.tsx | 4 +- .../user_action_tree/user_action_title.tsx | 8 +- .../components/user_list/index.test.tsx | 2 +- .../components/user_list/index.tsx | 2 +- .../components/user_list/translations.ts | 0 .../components/wrappers/index.tsx | 0 .../containers}/__mocks__/api.ts | 0 .../case => cases/containers}/api.test.tsx | 4 +- .../case => cases/containers}/api.ts | 2 +- .../containers}/configure/__mocks__/api.ts | 0 .../containers}/configure/api.test.ts | 4 +- .../containers}/configure/api.ts | 2 +- .../containers}/configure/mock.ts | 0 .../containers}/configure/translations.ts | 0 .../containers}/configure/types.ts | 0 .../configure/use_configure.test.tsx | 0 .../containers}/configure/use_configure.tsx | 6 +- .../configure/use_connectors.test.tsx | 0 .../containers}/configure/use_connectors.tsx | 2 +- .../case => cases/containers}/constants.ts | 0 .../case => cases/containers}/mock.ts | 0 .../case => cases/containers}/translations.ts | 0 .../case => cases/containers}/types.ts | 0 .../containers}/use_bulk_update_case.test.tsx | 0 .../containers}/use_bulk_update_case.tsx | 6 +- .../containers}/use_delete_cases.test.tsx | 0 .../containers}/use_delete_cases.tsx | 6 +- .../use_get_action_license.test.tsx | 0 .../containers}/use_get_action_license.tsx | 2 +- .../containers}/use_get_case.test.tsx | 0 .../containers}/use_get_case.tsx | 2 +- .../use_get_case_user_actions.test.tsx | 0 .../containers}/use_get_case_user_actions.tsx | 2 +- .../containers}/use_get_cases.test.tsx | 0 .../containers}/use_get_cases.tsx | 2 +- .../containers}/use_get_cases_status.test.tsx | 0 .../containers}/use_get_cases_status.tsx | 2 +- .../containers}/use_get_reporters.test.tsx | 0 .../containers}/use_get_reporters.tsx | 2 +- .../containers}/use_get_tags.test.tsx | 0 .../containers}/use_get_tags.tsx | 2 +- .../containers}/use_post_case.test.tsx | 0 .../containers}/use_post_case.tsx | 2 +- .../containers}/use_post_comment.test.tsx | 0 .../containers}/use_post_comment.tsx | 2 +- .../use_post_push_to_service.test.tsx | 0 .../containers}/use_post_push_to_service.tsx | 6 +- .../containers}/use_update_case.test.tsx | 0 .../containers}/use_update_case.tsx | 6 +- .../containers}/use_update_comment.test.tsx | 0 .../containers}/use_update_comment.tsx | 2 +- .../case => cases/containers}/utils.ts | 2 +- x-pack/plugins/siem/public/cases/index.ts | 18 ++ .../{pages/case => cases/pages}/case.tsx | 10 +- .../case => cases/pages}/case_details.tsx | 14 +- .../case => cases/pages}/configure_cases.tsx | 18 +- .../case => cases/pages}/create_case.tsx | 16 +- .../{pages/case => cases/pages}/index.tsx | 2 +- .../pages}/saved_object_no_permissions.tsx | 4 +- .../case => cases/pages}/translations.ts | 0 .../{pages/case => cases/pages}/utils.ts | 4 +- x-pack/plugins/siem/public/cases/routes.tsx | 17 ++ .../plugins/siem/public/cases/translations.ts | 205 ++++++++++++++++++ .../__snapshots__/index.test.tsx.snap | 0 .../helpers.test.tsx | 0 .../helpers.ts | 0 .../index.test.tsx | 15 +- .../add_filter_to_global_search_bar/index.tsx | 4 +- .../translations.ts | 0 .../components/alerts_viewer/alerts_table.tsx | 2 +- .../alerts_viewer/default_headers.ts | 8 +- .../alerts_viewer/histogram_configs.ts | 3 +- .../components/alerts_viewer/index.tsx | 2 +- .../components/alerts_viewer/translations.ts | 0 .../components/alerts_viewer/types.ts | 6 +- .../__examples__/index.stories.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 0 .../autocomplete_field/index.test.tsx | 5 +- .../components/autocomplete_field/index.tsx | 4 +- .../autocomplete_field/suggestion_item.tsx | 4 +- .../__snapshots__/areachart.test.tsx.snap | 0 .../__snapshots__/barchart.test.tsx.snap | 0 .../components/charts/areachart.test.tsx | 0 .../components/charts/areachart.tsx | 0 .../components/charts/barchart.test.tsx | 0 .../components/charts/barchart.tsx | 0 .../charts/chart_place_holder.test.tsx | 0 .../components/charts/chart_place_holder.tsx | 0 .../components/charts/common.test.tsx | 0 .../{ => common}/components/charts/common.tsx | 2 +- .../charts/draggable_legend.test.tsx | 0 .../components/charts/draggable_legend.tsx | 0 .../charts/draggable_legend_item.test.tsx | 0 .../charts/draggable_legend_item.tsx | 0 .../components/charts/translation.ts | 0 .../drag_drop_context_wrapper.test.tsx.snap | 0 .../draggable_wrapper.test.tsx.snap | 0 .../droppable_wrapper.test.tsx.snap | 0 .../drag_and_drop/drag_drop_context.tsx | 0 .../drag_drop_context_wrapper.test.tsx | 0 .../drag_drop_context_wrapper.tsx | 7 +- .../drag_and_drop/draggable_wrapper.test.tsx | 2 +- .../drag_and_drop/draggable_wrapper.tsx | 2 +- .../draggable_wrapper_hover_content.test.tsx | 4 +- .../draggable_wrapper_hover_content.tsx | 4 +- .../drag_and_drop/droppable_wrapper.test.tsx | 0 .../drag_and_drop/droppable_wrapper.tsx | 0 .../components/drag_and_drop/helpers.test.ts | 0 .../components/drag_and_drop/helpers.ts | 11 +- .../drag_and_drop/provider_container.tsx | 2 +- .../components/drag_and_drop/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../draggables/field_badge/index.tsx | 0 .../draggables/field_badge/translations.ts | 0 .../components/draggables/index.test.tsx | 0 .../components/draggables/index.tsx | 4 +- .../__snapshots__/index.test.tsx.snap | 0 .../components/empty_page/index.test.tsx | 0 .../components/empty_page/index.tsx | 0 .../__snapshots__/empty_value.test.tsx.snap | 0 .../empty_value/empty_value.test.tsx | 0 .../components/empty_value/index.tsx | 0 .../components/empty_value/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../error_toast_dispatcher/index.test.tsx | 6 +- .../error_toast_dispatcher/index.tsx | 0 .../__snapshots__/event_details.test.tsx.snap | 0 .../__snapshots__/json_view.test.tsx.snap | 0 .../components/event_details/columns.tsx | 16 +- .../event_details/event_details.test.tsx | 0 .../event_details/event_details.tsx | 6 +- .../event_fields_browser.test.tsx | 0 .../event_details/event_fields_browser.tsx | 6 +- .../components/event_details/event_id.ts | 0 .../components/event_details/helpers.test.tsx | 0 .../components/event_details/helpers.tsx | 6 +- .../event_details/json_view.test.tsx | 0 .../components/event_details/json_view.tsx | 4 +- .../event_details/stateful_event_details.tsx | 6 +- .../components/event_details/translations.ts | 0 .../components/event_details/types.ts | 2 +- .../events_viewer/default_headers.tsx | 6 +- .../events_viewer/default_model.tsx | 4 +- .../event_details_width_context.tsx | 0 .../events_viewer/events_viewer.test.tsx | 4 +- .../events_viewer/events_viewer.tsx | 34 +-- .../components/events_viewer/index.test.tsx | 4 +- .../components/events_viewer/index.tsx | 17 +- .../components/events_viewer/mock.ts | 2 +- .../components/events_viewer/translations.ts | 0 .../external_link_icon/index.test.tsx | 0 .../components/external_link_icon/index.tsx | 0 .../filters_global.test.tsx.snap | 0 .../filters_global/filters_global.test.tsx | 0 .../filters_global/filters_global.tsx | 0 .../components/filters_global/index.tsx | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components/formatted_bytes/index.test.tsx | 0 .../components/formatted_bytes/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 0 .../components/formatted_date/index.test.tsx | 0 .../components/formatted_date/index.tsx | 0 .../formatted_date/maybe_date.test.ts | 0 .../components/formatted_date/maybe_date.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../generic_downloader/index.test.tsx | 0 .../components/generic_downloader/index.tsx | 2 +- .../generic_downloader/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components/header_global/index.test.tsx | 0 .../components/header_global/index.tsx | 4 +- .../components/header_global/translations.ts | 0 .../editable_title.test.tsx.snap | 0 .../__snapshots__/index.test.tsx.snap | 0 .../__snapshots__/title.test.tsx.snap | 0 .../header_page/editable_title.test.tsx | 0 .../components/header_page/editable_title.tsx | 0 .../components/header_page/index.test.tsx | 0 .../components/header_page/index.tsx | 0 .../components/header_page/title.test.tsx | 0 .../components/header_page/title.tsx | 0 .../components/header_page/translations.ts | 0 .../components/header_page/types.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components/header_section/index.test.tsx | 0 .../components/header_section/index.tsx | 0 .../components/help_menu/index.tsx | 0 .../__snapshots__/index.test.tsx.snap | 0 .../import_data_modal/index.test.tsx | 0 .../components/import_data_modal/index.tsx | 5 +- .../import_data_modal/translations.ts | 0 .../components/inspect/index.test.tsx | 7 +- .../{ => common}/components/inspect/index.tsx | 0 .../components/inspect/modal.test.tsx | 0 .../{ => common}/components/inspect/modal.tsx | 0 .../components/inspect/translations.ts | 0 .../components/last_event_time/index.test.tsx | 2 +- .../components/last_event_time/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 0 .../components/link_icon/index.test.tsx | 0 .../components/link_icon/index.tsx | 0 .../components/link_to/helpers.test.ts | 0 .../components/link_to/helpers.ts | 0 .../{ => common}/components/link_to/index.ts | 0 .../components/link_to/link_to.tsx | 8 +- .../components/link_to/redirect_to_case.tsx | 2 +- .../link_to/redirect_to_detection_engine.tsx | 2 +- .../components/link_to/redirect_to_hosts.tsx | 4 +- .../link_to/redirect_to_network.tsx | 4 +- .../link_to/redirect_to_overview.tsx | 2 +- .../link_to/redirect_to_timelines.tsx | 4 +- .../components/link_to/redirect_wrapper.tsx | 0 .../components/links/index.test.tsx | 2 +- .../{ => common}/components/links/index.tsx | 10 +- .../components/links/translations.ts | 2 +- .../loader/__snapshots__/index.test.tsx.snap | 0 .../components/loader/index.test.tsx | 0 .../{ => common}/components/loader/index.tsx | 0 .../localized_date_tooltip/index.test.tsx | 0 .../localized_date_tooltip/index.tsx | 0 .../__snapshots__/index.test.tsx.snap | 0 .../__snapshots__/markdown_hint.test.tsx.snap | 0 .../components/markdown/index.test.tsx | 0 .../components/markdown/index.tsx | 0 .../markdown/markdown_hint.test.tsx | 0 .../components/markdown/markdown_hint.tsx | 0 .../components/markdown/translations.ts | 0 .../components/markdown_editor/constants.ts | 0 .../components/markdown_editor/form.tsx | 2 +- .../components/markdown_editor/index.tsx | 0 .../markdown_editor/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../matrix_histogram/index.test.tsx | 2 +- .../components/matrix_histogram/index.tsx | 14 +- .../matrix_histogram/matrix_loader.tsx | 0 .../matrix_histogram/translations.ts | 0 .../components/matrix_histogram/types.ts | 6 +- .../components/matrix_histogram/utils.test.ts | 2 +- .../components/matrix_histogram/utils.ts | 2 +- .../entity_draggable.test.tsx.snap | 0 .../ml/anomaly/anomaly_table_provider.tsx | 0 .../get_interval_from_anomalies.test.ts | 0 .../ml/anomaly/get_interval_from_anomalies.ts | 0 .../components/ml/anomaly/translations.ts | 0 .../anomaly/use_anomalies_table_data.test.ts | 0 .../ml/anomaly/use_anomalies_table_data.ts | 4 +- .../components/ml/api/anomalies_table_data.ts | 0 .../{ => common}/components/ml/api/errors.ts | 0 .../components/ml/api/get_ml_capabilities.ts | 2 +- .../components/ml/api/throw_if_not_ok.test.ts | 0 .../components/ml/api/throw_if_not_ok.ts | 0 .../components/ml/api/translations.ts | 0 .../add_entities_to_kql.test.ts | 0 .../conditional_links/add_entities_to_kql.ts | 0 .../conditional_links/entity_helpers.test.ts | 0 .../ml/conditional_links/entity_helpers.ts | 0 .../ml_host_conditional_container.tsx | 6 +- .../ml_network_conditional_container.tsx | 4 +- .../remove_kql_variables.test.ts | 0 .../conditional_links/remove_kql_variables.ts | 0 .../replace_kql_commas_with_or.test.ts | 0 .../replace_kql_commas_with_or.ts | 0 .../replace_kql_parts.test.ts | 0 .../ml/conditional_links/replace_kql_parts.ts | 0 .../conditional_links/rison_helpers.test.ts | 0 .../ml/conditional_links/rison_helpers.ts | 0 .../get_criteria_from_host_type.test.ts | 2 +- .../criteria/get_criteria_from_host_type.ts | 2 +- .../get_criteria_from_network_type.test.ts | 4 +- .../get_criteria_from_network_type.ts | 4 +- .../ml/criteria/host_to_criteria.test.ts | 2 +- .../ml/criteria/host_to_criteria.ts | 2 +- .../ml/criteria/network_to_criteria.test.ts | 2 +- .../ml/criteria/network_to_criteria.ts | 2 +- .../components/ml/entity_draggable.test.tsx | 0 .../components/ml/entity_draggable.tsx | 4 +- .../components/ml/get_entries.test.ts | 0 .../{ => common}/components/ml/get_entries.ts | 0 .../create_influencers.test.tsx.snap | 0 .../influencers/create_influencers.test.tsx | 0 .../ml/influencers/create_influencers.tsx | 0 .../get_host_name_from_influencers.test.ts | 0 .../get_host_name_from_influencers.ts | 0 .../get_network_from_influencers.test.ts | 0 .../get_network_from_influencers.ts | 0 .../influencers/host_to_influencers.test.ts | 2 +- .../ml/influencers/host_to_influencers.ts | 2 +- .../network_to_influencers.test.ts | 0 .../ml/influencers/network_to_influencers.ts | 0 .../ml/links/create_explorer_link.test.ts | 0 .../ml/links/create_explorer_link.ts | 0 .../ml/links/create_series_link.test.ts | 0 .../components/ml/links/create_series_link.ts | 0 .../public/{ => common}/components/ml/mock.ts | 0 .../permissions/ml_capabilities_provider.tsx | 4 +- .../components/ml/permissions/translations.ts | 0 .../__snapshots__/anomaly_score.test.tsx.snap | 0 .../anomaly_scores.test.tsx.snap | 0 .../create_descriptions_list.test.tsx.snap | 0 .../draggable_score.test.tsx.snap | 0 .../ml/score/anomaly_score.test.tsx | 0 .../components/ml/score/anomaly_score.tsx | 0 .../ml/score/anomaly_scores.test.tsx | 0 .../components/ml/score/anomaly_scores.tsx | 0 .../ml/score/create_description_list.tsx | 2 +- .../score/create_descriptions_list.test.tsx | 0 .../score/create_entities_from_score.test.ts | 0 .../ml/score/create_entities_from_score.ts | 0 .../ml/score/draggable_score.test.tsx | 0 .../components/ml/score/draggable_score.tsx | 4 +- .../ml/score/get_score_string.test.ts | 0 .../ml/score/get_top_severity.test.ts | 0 .../components/ml/score/get_top_severity.ts | 0 .../components/ml/score/score_health.tsx | 0 .../score/score_interval_to_datetime.test.ts | 0 .../ml/score/score_interval_to_datetime.ts | 0 .../components/ml/score/translations.ts | 0 .../ml/tables/anomalies_host_table.tsx | 2 +- .../ml/tables/anomalies_network_table.tsx | 2 +- .../components/ml/tables/basic_table.tsx | 0 .../tables/convert_anomalies_to_hosts.test.ts | 0 .../ml/tables/convert_anomalies_to_hosts.ts | 0 .../convert_anomalies_to_network.test.ts | 0 .../ml/tables/convert_anomalies_to_network.ts | 0 .../ml/tables/create_compound_key.test.ts | 0 .../ml/tables/create_compound_key.ts | 0 .../get_anomalies_host_table_columns.test.tsx | 2 +- .../get_anomalies_host_table_columns.tsx | 2 +- ...t_anomalies_network_table_columns.test.tsx | 2 +- .../get_anomalies_network_table_columns.tsx | 4 +- .../ml/tables/host_equality.test.ts | 2 +- .../components/ml/tables/host_equality.ts | 0 .../ml/tables/network_equality.test.ts | 4 +- .../components/ml/tables/network_equality.ts | 0 .../components/ml/tables/translations.ts | 0 .../{ => common}/components/ml/types.test.ts | 0 .../{ => common}/components/ml/types.ts | 8 +- .../components/ml_popover/__mocks__/api.tsx | 0 .../popover_description.test.tsx.snap | 0 .../upgrade_contents.test.tsx.snap | 0 .../components/ml_popover/api.tsx | 0 .../components/ml_popover/helpers.test.tsx | 0 .../components/ml_popover/helpers.tsx | 0 .../ml_popover/hooks/translations.ts | 0 .../ml_popover/hooks/use_ml_capabilities.tsx | 0 .../ml_popover/hooks/use_siem_jobs.tsx | 4 +- .../hooks/use_siem_jobs_helpers.test.tsx | 0 .../hooks/use_siem_jobs_helpers.tsx | 0 .../__snapshots__/job_switch.test.tsx.snap | 0 .../__snapshots__/jobs_table.test.tsx.snap | 0 .../__snapshots__/showing_count.test.tsx.snap | 0 .../groups_filter_popover.test.tsx.snap | 0 .../jobs_table_filters.test.tsx.snap | 0 .../filters/groups_filter_popover.test.tsx | 0 .../filters/groups_filter_popover.tsx | 0 .../filters/jobs_table_filters.test.tsx | 0 .../jobs_table/filters/jobs_table_filters.tsx | 2 +- .../filters/toggle_selected_group.test.tsx | 0 .../filters/toggle_selected_group.tsx | 0 .../jobs_table/filters/translations.ts | 0 .../ml_popover/jobs_table/job_switch.test.tsx | 0 .../ml_popover/jobs_table/job_switch.tsx | 2 +- .../ml_popover/jobs_table/jobs_table.test.tsx | 0 .../ml_popover/jobs_table/jobs_table.tsx | 0 .../jobs_table/showing_count.test.tsx | 0 .../ml_popover/jobs_table/showing_count.tsx | 0 .../ml_popover/jobs_table/translations.ts | 0 .../components/ml_popover/ml_modules.tsx | 0 .../components/ml_popover/ml_popover.test.tsx | 0 .../components/ml_popover/ml_popover.tsx | 2 +- .../ml_popover/popover_description.test.tsx | 0 .../ml_popover/popover_description.tsx | 0 .../components/ml_popover/translations.ts | 0 .../components/ml_popover/types.ts | 2 +- .../ml_popover/upgrade_contents.test.tsx | 0 .../ml_popover/upgrade_contents.tsx | 0 .../navigation/breadcrumbs/index.test.ts | 4 +- .../navigation/breadcrumbs/index.ts | 19 +- .../components/navigation/helpers.ts | 4 +- .../components/navigation/index.test.tsx | 4 +- .../components/navigation/index.tsx | 0 .../navigation/tab_navigation/index.test.tsx | 8 +- .../navigation/tab_navigation/index.tsx | 0 .../navigation/tab_navigation/types.ts | 6 +- .../components/navigation/types.ts | 6 +- .../navigation/use_get_url_search.tsx | 0 .../components/news_feed/helpers.test.ts | 2 +- .../components/news_feed/helpers.ts | 0 .../components/news_feed/index.tsx | 0 .../components/news_feed/news_feed.tsx | 4 +- .../components/news_feed/news_link/index.tsx | 0 .../components/news_feed/no_news/index.tsx | 0 .../components/news_feed/post/index.tsx | 0 .../components/news_feed/translations.ts | 0 .../components/news_feed/types.ts | 0 .../{ => common}/components/page/index.tsx | 0 .../components/page/manage_query.tsx | 2 +- .../components/page/translations.ts | 0 .../components/page_route/index.tsx | 0 .../components/page_route/pageroute.test.tsx | 0 .../components/page_route/pageroute.tsx | 0 .../__snapshots__/index.test.tsx.snap | 0 .../paginated_table/helpers.test.ts | 0 .../components/paginated_table/helpers.ts | 2 +- .../components/paginated_table/index.mock.tsx | 0 .../components/paginated_table/index.test.tsx | 4 +- .../components/paginated_table/index.tsx | 20 +- .../paginated_table/translations.ts | 0 .../components/panel/index.test.tsx | 0 .../{ => common}/components/panel/index.tsx | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components/progress_inline/index.test.tsx | 0 .../components/progress_inline/index.tsx | 0 .../components/query_bar/index.test.tsx | 4 +- .../components/query_bar/index.tsx | 4 +- .../components/scroll_to_top/index.test.tsx | 0 .../components/scroll_to_top/index.tsx | 0 .../components/search_bar/index.tsx | 4 +- .../components/search_bar/selectors.ts | 2 +- .../__snapshots__/index.test.tsx.snap | 0 .../components/selectable_text/index.test.tsx | 0 .../components/selectable_text/index.tsx | 0 .../components/sidebar_header/index.tsx | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components/stat_items/index.test.tsx | 10 +- .../components/stat_items/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 0 .../components/subtitle/index.test.tsx | 0 .../components/subtitle/index.tsx | 0 .../super_date_picker/index.test.tsx | 8 +- .../components/super_date_picker/index.tsx | 5 +- .../super_date_picker/selectors.test.ts | 0 .../components/super_date_picker/selectors.ts | 0 .../__snapshots__/helpers.test.tsx.snap | 0 .../components/tables/helpers.test.tsx | 0 .../components/tables/helpers.tsx | 4 +- .../modal_all_errors.test.tsx.snap | 0 .../components/toasters/errors.ts | 0 .../components/toasters/index.test.tsx | 0 .../components/toasters/index.tsx | 0 .../toasters/modal_all_errors.test.tsx | 0 .../components/toasters/modal_all_errors.tsx | 0 .../components/toasters/translations.ts | 0 .../components/toasters/utils.test.ts | 0 .../{ => common}/components/toasters/utils.ts | 0 .../components/top_n/helpers.test.tsx | 0 .../{ => common}/components/top_n/helpers.ts | 2 +- .../components/top_n/index.test.tsx | 16 +- .../{ => common}/components/top_n/index.tsx | 13 +- .../components/top_n/top_n.test.tsx | 0 .../{ => common}/components/top_n/top_n.tsx | 8 +- .../components/top_n/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../truncatable_text/index.test.tsx | 0 .../components/truncatable_text/index.tsx | 0 .../components/url_state/constants.ts | 0 .../components/url_state/helpers.test.ts | 4 +- .../components/url_state/helpers.ts | 11 +- .../components/url_state/index.test.tsx | 2 +- .../components/url_state/index.tsx | 4 +- .../url_state/index_mocked.test.tsx | 2 +- .../url_state/initialize_redux_by_url.tsx | 6 +- .../url_state/normalize_time_range.test.ts | 0 .../url_state/normalize_time_range.ts | 0 .../components/url_state/test_dependencies.ts | 13 +- .../components/url_state/types.ts | 4 +- .../components/url_state/use_url_state.tsx | 2 +- .../__snapshots__/utility_bar.test.tsx.snap | 0 .../utility_bar_action.test.tsx.snap | 0 .../utility_bar_group.test.tsx.snap | 0 .../utility_bar_section.test.tsx.snap | 0 .../utility_bar_text.test.tsx.snap | 0 .../components/utility_bar/index.ts | 0 .../components/utility_bar/styles.tsx | 0 .../utility_bar/utility_bar.test.tsx | 0 .../components/utility_bar/utility_bar.tsx | 0 .../utility_bar/utility_bar_action.test.tsx | 0 .../utility_bar/utility_bar_action.tsx | 0 .../utility_bar/utility_bar_group.test.tsx | 0 .../utility_bar/utility_bar_group.tsx | 0 .../utility_bar/utility_bar_section.test.tsx | 0 .../utility_bar/utility_bar_section.tsx | 0 .../utility_bar/utility_bar_text.test.tsx | 0 .../utility_bar/utility_bar_text.tsx | 0 .../public/{ => common}/components/utils.ts | 0 .../components/with_hover_actions/index.tsx | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components/wrapper_page/index.test.tsx | 0 .../components/wrapper_page/index.tsx | 0 .../histogram_configs.ts | 2 +- .../anomalies_query_tab_body/index.tsx | 2 +- .../anomalies_query_tab_body/translations.ts | 0 .../anomalies_query_tab_body/types.ts | 10 +- .../anomalies_query_tab_body/utils.ts | 4 +- .../containers/errors/index.test.tsx | 0 .../{ => common}/containers/errors/index.tsx | 0 .../containers/errors/translations.ts | 0 .../events/last_event_time/index.ts | 8 +- .../last_event_time.gql_query.ts | 0 .../containers/events/last_event_time/mock.ts | 4 +- .../containers/global_time/index.tsx | 0 .../{ => common}/containers/helpers.test.ts | 2 +- .../public/{ => common}/containers/helpers.ts | 2 +- .../containers/kuery_autocompletion/index.tsx | 2 +- .../matrix_histogram/index.gql_query.ts | 0 .../matrix_histogram/index.test.tsx | 2 +- .../containers/matrix_histogram/index.ts | 4 +- .../containers/query_template.tsx | 2 +- .../containers/query_template_paginated.tsx | 2 +- .../containers/source/index.gql_query.ts | 0 .../containers/source/index.test.tsx | 0 .../{ => common}/containers/source/index.tsx | 4 +- .../{ => common}/containers/source/mock.ts | 2 +- .../{ => common}/hooks/api/__mock__/api.tsx | 0 .../public/{ => common}/hooks/api/api.tsx | 2 +- .../{ => common}/hooks/api/helpers.test.tsx | 0 .../public/{ => common}/hooks/api/helpers.tsx | 0 .../public/{ => common}/hooks/translations.ts | 0 .../siem/public/{ => common}/hooks/types.ts | 3 +- .../hooks/use_add_to_timeline.tsx | 4 +- .../{ => common}/hooks/use_index_patterns.tsx | 0 .../hooks/use_providers_portal.tsx | 0 .../{ => common}/lib/clipboard/clipboard.tsx | 0 .../lib/clipboard/translations.ts | 0 .../lib/clipboard/with_copy_to_clipboard.tsx | 0 .../{ => common}/lib/compose/helpers.test.ts | 2 +- .../{ => common}/lib/compose/helpers.ts | 0 .../lib/compose/kibana_compose.tsx | 5 +- .../components/connector_flyout/index.tsx | 6 +- .../{ => common}/lib/connectors/config.ts | 0 .../{ => common}/lib/connectors/index.ts | 0 .../lib/connectors/jira/config.ts | 0 .../lib/connectors/jira/flyout.tsx | 0 .../lib/connectors/jira/index.tsx | 2 +- .../{ => common}/lib/connectors/jira/logo.svg | 0 .../lib/connectors/jira/translations.ts | 0 .../{ => common}/lib/connectors/jira/types.ts | 4 +- .../lib/connectors/servicenow/config.ts | 0 .../lib/connectors/servicenow/flyout.tsx | 0 .../lib/connectors/servicenow/index.tsx | 2 +- .../lib/connectors/servicenow/logo.svg | 0 .../lib/connectors/servicenow/translations.ts | 0 .../lib/connectors/servicenow/types.ts | 4 +- .../lib/connectors/translations.ts | 0 .../{ => common}/lib/connectors/types.ts | 13 +- .../{ => common}/lib/connectors/utils.ts | 4 +- .../{ => common}/lib/connectors/validators.ts | 0 .../{ => common}/lib/helpers/index.test.tsx | 0 .../public/{ => common}/lib/helpers/index.tsx | 0 .../{ => common}/lib/helpers/scheduler.ts | 0 .../public/{ => common}/lib/history/index.ts | 0 .../{ => common}/lib/keury/index.test.ts | 0 .../public/{ => common}/lib/keury/index.ts | 4 +- .../lib/kibana/__mocks__/index.ts | 0 .../public/{ => common}/lib/kibana/hooks.ts | 6 +- .../public/{ => common}/lib/kibana/index.ts | 0 .../{ => common}/lib/kibana/kibana_react.ts | 4 +- .../{ => common}/lib/kibana/services.ts | 3 +- .../siem/public/{ => common}/lib/lib.ts | 0 .../public/{ => common}/lib/note/index.ts | 0 .../{ => common}/lib/telemetry/index.ts | 2 +- .../{ => common}/lib/telemetry/middleware.ts | 2 +- .../{ => common}/lib/theme/use_eui_theme.tsx | 2 +- .../public/{ => common}/mock/global_state.ts | 11 +- .../siem/public/{ => common}/mock/header.ts | 6 +- .../public/{ => common}/mock/hook_wrapper.tsx | 0 .../siem/public/{ => common}/mock/index.ts | 0 .../public/{ => common}/mock/index_pattern.ts | 0 .../public/{ => common}/mock/kibana_core.ts | 5 +- .../public/{ => common}/mock/kibana_react.ts | 4 +- .../public/{ => common}/mock/match_media.ts | 0 .../{ => common}/mock/mock_detail_item.ts | 2 +- .../siem/public/{ => common}/mock/mock_ecs.ts | 2 +- .../mock/mock_endgame_ecs_data.ts | 2 +- .../{ => common}/mock/mock_timeline_data.ts | 2 +- .../siem/public/{ => common}/mock/netflow.ts | 4 +- .../siem/public/{ => common}/mock/news.ts | 0 .../siem/public/{ => common}/mock/raw_news.ts | 0 .../{ => common}/mock/test_providers.tsx | 7 +- .../{ => common}/mock/timeline_results.ts | 16 +- .../siem/public/{ => common}/mock/utils.ts | 10 + .../siem/public/{ => common}/store/actions.ts | 3 - .../public/{ => common}/store/app/actions.ts | 0 .../public/{ => common}/store/app/index.ts | 0 .../public/{ => common}/store/app/model.ts | 0 .../public/{ => common}/store/app/reducer.ts | 0 .../{ => common}/store/app/selectors.ts | 0 .../public/{ => common}/store/constants.ts | 0 .../store/drag_and_drop/actions.ts | 2 +- .../{ => common}/store/drag_and_drop/index.ts | 0 .../{ => common}/store/drag_and_drop/model.ts | 2 +- .../store/drag_and_drop/reducer.test.ts | 4 +- .../store/drag_and_drop/reducer.ts | 2 +- .../store/drag_and_drop/selectors.ts | 0 .../siem/public/{ => common}/store/epic.ts | 8 +- .../siem/public/{ => common}/store/index.ts | 0 .../{ => common}/store/inputs/actions.ts | 2 +- .../{ => common}/store/inputs/constants.ts | 0 .../{ => common}/store/inputs/helpers.test.ts | 0 .../{ => common}/store/inputs/helpers.ts | 0 .../public/{ => common}/store/inputs/index.ts | 0 .../public/{ => common}/store/inputs/model.ts | 2 +- .../{ => common}/store/inputs/reducer.ts | 0 .../{ => common}/store/inputs/selectors.ts | 0 .../siem/public/{ => common}/store/model.ts | 2 - .../siem/public/common/store/reducer.ts | 46 ++++ .../public/{ => common}/store/selectors.ts | 3 - .../siem/public/{ => common}/store/store.ts | 12 +- .../siem/public/{ => common}/store/types.ts | 0 .../public/{pages => }/common/translations.ts | 0 .../public/{ => common}/utils/api/index.ts | 0 .../{ => common}/utils/apollo_context.ts | 0 .../utils/default_date_settings.test.ts | 4 +- .../utils/default_date_settings.ts | 2 +- .../utils/kql/use_update_kql.test.tsx | 4 +- .../{ => common}/utils/kql/use_update_kql.tsx | 2 +- .../utils/logo_endpoint/64_color.svg | 0 .../{ => common}/utils/route/helpers.ts | 0 .../{ => common}/utils/route/index.test.tsx | 2 +- .../utils/route/manage_spy_routes.tsx | 0 .../{ => common}/utils/route/spy_routes.tsx | 0 .../public/{ => common}/utils/route/types.ts | 8 +- .../utils/route/use_route_spy.tsx | 0 .../utils/saved_query_services/index.tsx | 2 +- .../utils/timeline/use_show_timeline.tsx | 2 +- .../{ => common}/utils/use_mount_appended.ts | 0 .../{ => common}/utils/validators/index.ts | 0 .../public/components/page/network/index.tsx | 12 - .../__snapshots__/index.test.tsx.snap | 0 .../authentications_table/index.test.tsx | 10 +- .../authentications_table/index.tsx | 27 ++- .../components}/authentications_table/mock.ts | 2 +- .../authentications_table/translations.ts | 0 .../first_last_seen_host/index.test.tsx | 6 +- .../first_last_seen_host/index.tsx | 6 +- .../__snapshots__/index.test.tsx.snap | 0 .../components}/hosts_table/columns.tsx | 22 +- .../components}/hosts_table/index.test.tsx | 18 +- .../components}/hosts_table/index.tsx | 11 +- .../components}/hosts_table/mock.ts | 2 +- .../components}/hosts_table/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components}/kpi_hosts/index.test.tsx | 2 +- .../components}/kpi_hosts/index.tsx | 10 +- .../kpi_hosts/kpi_host_details_mapping.ts | 2 +- .../kpi_hosts/kpi_hosts_mapping.ts | 2 +- .../components}/kpi_hosts/mock.tsx | 0 .../components}/kpi_hosts/translations.ts | 0 .../components}/kpi_hosts/types.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../uncommon_process_table/index.test.tsx | 10 +- .../uncommon_process_table/index.tsx | 16 +- .../uncommon_process_table/mock.ts | 2 +- .../uncommon_process_table/translations.ts | 0 .../authentications/index.gql_query.ts | 0 .../containers/authentications/index.tsx | 19 +- .../first_last_seen.gql_query.ts | 0 .../containers/hosts/first_last_seen/index.ts | 10 +- .../containers/hosts/first_last_seen/mock.ts | 4 +- .../containers/hosts/hosts_table.gql_query.ts | 0 .../{ => hosts}/containers/hosts/index.tsx | 19 +- .../hosts/overview/host_overview.gql_query.ts | 0 .../containers/hosts/overview/index.tsx | 12 +- .../kpi_host_details/index.gql_query.tsx | 0 .../containers/kpi_host_details/index.tsx | 12 +- .../containers/kpi_hosts/index.gql_query.ts | 0 .../containers/kpi_hosts/index.tsx | 12 +- .../uncommon_processes/index.gql_query.ts | 0 .../containers/uncommon_processes/index.tsx | 19 +- x-pack/plugins/siem/public/hosts/index.ts | 23 ++ .../pages}/details/details_tabs.test.tsx | 12 +- .../pages}/details/details_tabs.tsx | 12 +- .../pages}/details/helpers.test.ts | 0 .../hosts => hosts/pages}/details/helpers.ts | 2 +- .../hosts => hosts/pages}/details/index.tsx | 49 +++-- .../pages}/details/nav_tabs.test.tsx | 2 +- .../pages}/details/nav_tabs.tsx | 6 +- .../hosts => hosts/pages}/details/types.ts | 10 +- .../hosts => hosts/pages}/details/utils.ts | 12 +- .../hosts => hosts/pages}/hosts.test.tsx | 25 ++- .../{pages/hosts => hosts/pages}/hosts.tsx | 40 ++-- .../pages}/hosts_empty_page.tsx | 7 +- .../hosts => hosts/pages}/hosts_tabs.tsx | 12 +- .../{pages/hosts => hosts/pages}/index.tsx | 6 +- .../hosts => hosts/pages}/nav_tabs.test.tsx | 2 +- .../{pages/hosts => hosts/pages}/nav_tabs.tsx | 4 +- .../navigation/alerts_query_tab_body.tsx | 2 +- .../authentications_query_tab_body.tsx | 14 +- .../navigation/events_query_tab_body.tsx | 10 +- .../navigation/hosts_query_tab_body.tsx | 6 +- .../hosts => hosts/pages}/navigation/index.ts | 0 .../hosts => hosts/pages}/navigation/types.ts | 10 +- .../uncommon_process_query_tab_body.tsx | 6 +- .../hosts => hosts/pages}/translations.ts | 0 .../{pages/hosts => hosts/pages}/types.ts | 8 +- x-pack/plugins/siem/public/hosts/routes.tsx | 18 ++ .../{store/hosts => hosts/store}/actions.ts | 0 .../hosts => hosts/store}/helpers.test.ts | 2 +- .../{store/hosts => hosts/store}/helpers.ts | 2 +- .../{store/hosts => hosts/store}/index.ts | 9 + .../{store/hosts => hosts/store}/model.ts | 0 .../{store/hosts => hosts/store}/reducer.ts | 2 +- .../{store/hosts => hosts/store}/selectors.ts | 2 +- .../arrows/__snapshots__/index.test.tsx.snap | 0 .../components/arrows/helpers.test.ts | 0 .../components/arrows/helpers.ts | 0 .../components/arrows/index.test.tsx | 2 +- .../{ => network}/components/arrows/index.tsx | 0 .../components/direction/direction.test.tsx | 0 .../components/direction/index.tsx | 4 +- .../components/embeddables/__mocks__/mock.ts | 2 +- .../__snapshots__/embeddable.test.tsx.snap | 0 .../embeddable_header.test.tsx.snap | 0 .../__snapshots__/embedded_map.test.tsx.snap | 0 ...ndex_patterns_missing_prompt.test.tsx.snap | 0 .../embeddables/embeddable.test.tsx | 0 .../components/embeddables/embeddable.tsx | 0 .../embeddables/embeddable_header.test.tsx | 2 +- .../embeddables/embeddable_header.tsx | 0 .../embeddables/embedded_map.test.tsx | 6 +- .../components/embeddables/embedded_map.tsx | 23 +- .../embeddables/embedded_map_helpers.test.tsx | 2 +- .../embeddables/embedded_map_helpers.tsx | 10 +- .../index_patterns_missing_prompt.test.tsx | 2 +- .../index_patterns_missing_prompt.tsx | 2 +- .../components/embeddables/map_config.test.ts | 0 .../components/embeddables/map_config.ts | 2 +- .../line_tool_tip_content.test.tsx.snap | 0 .../__snapshots__/map_tool_tip.test.tsx.snap | 0 .../point_tool_tip_content.test.tsx.snap | 0 .../tooltip_footer.test.tsx.snap | 0 .../line_tool_tip_content.test.tsx | 0 .../map_tool_tip/line_tool_tip_content.tsx | 0 .../map_tool_tip/map_tool_tip.test.tsx | 0 .../embeddables/map_tool_tip/map_tool_tip.tsx | 2 +- .../point_tool_tip_content.test.tsx | 10 +- .../map_tool_tip/point_tool_tip_content.tsx | 15 +- .../map_tool_tip/tooltip_footer.test.tsx | 0 .../map_tool_tip/tooltip_footer.tsx | 0 .../components/embeddables/translations.ts | 0 .../components/embeddables/types.ts | 4 +- .../flow_direction_select.test.tsx.snap | 0 .../flow_target_select.test.tsx.snap | 0 .../flow_direction_select.test.tsx | 2 +- .../flow_controls/flow_direction_select.tsx | 2 +- .../flow_controls/flow_target_select.test.tsx | 2 +- .../flow_controls/flow_target_select.tsx | 2 +- .../components/flow_controls/translations.ts | 0 .../index.test.tsx | 4 +- .../flow_target_select_connected/index.tsx | 6 +- .../ip/__snapshots__/index.test.tsx.snap | 0 .../components/ip/index.test.tsx | 4 +- .../{ => network}/components/ip/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 0 .../components}/ip_overview/index.test.tsx | 20 +- .../components}/ip_overview/index.tsx | 28 +-- .../components}/ip_overview/mock.ts | 2 +- .../components}/ip_overview/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components}/kpi_network/index.test.tsx | 9 +- .../components}/kpi_network/index.tsx | 6 +- .../components}/kpi_network/mock.ts | 4 +- .../components}/kpi_network/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../is_ptr_included.test.tsx.snap | 0 .../components}/network_dns_table/columns.tsx | 19 +- .../network_dns_table/index.test.tsx | 16 +- .../components}/network_dns_table/index.tsx | 8 +- .../is_ptr_included.test.tsx | 2 +- .../network_dns_table/is_ptr_included.tsx | 0 .../components}/network_dns_table/mock.ts | 2 +- .../network_dns_table/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../network_http_table/columns.tsx | 15 +- .../network_http_table/index.test.tsx | 16 +- .../components}/network_http_table/index.tsx | 8 +- .../components}/network_http_table/mock.ts | 2 +- .../network_http_table/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../network_top_countries_table/columns.tsx | 23 +- .../index.test.tsx | 14 +- .../network_top_countries_table/index.tsx | 9 +- .../network_top_countries_table/mock.ts | 2 +- .../translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../network_top_n_flow_table/columns.tsx | 30 ++- .../network_top_n_flow_table/index.test.tsx | 19 +- .../network_top_n_flow_table/index.tsx | 9 +- .../network_top_n_flow_table/mock.ts | 2 +- .../network_top_n_flow_table/translations.ts | 0 .../port/__snapshots__/index.test.tsx.snap | 0 .../components/port/index.test.tsx | 4 +- .../{ => network}/components/port/index.tsx | 8 +- .../__snapshots__/index.test.tsx.snap | 0 .../source_destination/country_flag.tsx | 0 .../source_destination/field_names.ts | 0 .../source_destination/geo_fields.tsx | 2 +- .../source_destination/index.test.tsx | 12 +- .../components/source_destination/index.tsx | 0 .../source_destination/ip_with_port.tsx | 0 .../components/source_destination/label.tsx | 0 .../components/source_destination/network.tsx | 4 +- .../source_destination_arrows.tsx | 4 +- .../source_destination_ip.test.tsx | 12 +- .../source_destination_ip.tsx | 2 +- .../source_destination_with_arrows.tsx | 0 .../source_destination/translations.ts | 0 .../components/source_destination/types.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components}/tls_table/columns.tsx | 13 +- .../components}/tls_table/index.test.tsx | 17 +- .../components}/tls_table/index.tsx | 13 +- .../components}/tls_table/mock.ts | 2 +- .../components}/tls_table/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../components}/users_table/columns.tsx | 11 +- .../components}/users_table/index.test.tsx | 18 +- .../components}/users_table/index.tsx | 15 +- .../components}/users_table/mock.ts | 2 +- .../components}/users_table/translations.ts | 0 .../containers/ip_overview/index.gql_query.ts | 0 .../containers/ip_overview/index.tsx | 14 +- .../containers/kpi_network/index.gql_query.ts | 0 .../containers/kpi_network/index.tsx | 12 +- .../containers/network_dns/index.gql_query.ts | 0 .../containers/network_dns/index.tsx | 31 ++- .../network_http/index.gql_query.ts | 0 .../containers/network_http/index.tsx | 18 +- .../network_top_countries/index.gql_query.ts | 0 .../network_top_countries/index.tsx | 18 +- .../network_top_n_flow/index.gql_query.ts | 0 .../containers/network_top_n_flow/index.tsx | 18 +- .../containers/tls/index.gql_query.ts | 0 .../{ => network}/containers/tls/index.tsx | 18 +- .../containers/users/index.gql_query.ts | 0 .../{ => network}/containers/users/index.tsx | 18 +- x-pack/plugins/siem/public/network/index.ts | 23 ++ .../network => network/pages}/index.tsx | 6 +- .../__snapshots__/index.test.tsx.snap | 0 .../pages}/ip_details/index.test.tsx | 26 ++- .../pages}/ip_details/index.tsx | 51 +++-- .../ip_details/network_http_query_table.tsx | 6 +- .../network_top_countries_query_table.tsx | 6 +- .../network_top_n_flow_query_table.tsx | 6 +- .../pages}/ip_details/tls_query_table.tsx | 6 +- .../pages}/ip_details/types.ts | 6 +- .../pages}/ip_details/users_query_table.tsx | 6 +- .../pages}/ip_details/utils.ts | 12 +- .../navigation/alerts_query_tab_body.tsx | 2 +- .../navigation/conditional_flex_group.tsx | 0 .../navigation/countries_query_tab_body.tsx | 8 +- .../pages}/navigation/dns_query_tab_body.tsx | 12 +- .../pages}/navigation/http_query_tab_body.tsx | 8 +- .../pages}/navigation/index.ts | 0 .../pages}/navigation/ips_query_tab_body.tsx | 8 +- .../pages}/navigation/nav_tabs.tsx | 0 .../pages}/navigation/network_routes.tsx | 10 +- .../navigation/network_routes_loading.tsx | 0 .../pages}/navigation/tls_query_tab_body.tsx | 6 +- .../pages}/navigation/types.ts | 8 +- .../pages}/navigation/utils.ts | 0 .../pages}/network.test.tsx | 22 +- .../network => network/pages}/network.tsx | 38 ++-- .../pages}/network_empty_page.tsx | 6 +- .../network => network/pages}/translations.ts | 0 .../{pages/network => network/pages}/types.ts | 4 +- x-pack/plugins/siem/public/network/routes.tsx | 18 ++ .../network => network/store}/actions.ts | 3 +- .../network => network/store}/helpers.test.ts | 2 +- .../network => network/store}/helpers.ts | 2 +- .../{store/network => network/store}/index.ts | 10 + .../{store/network => network/store}/model.ts | 0 .../network => network/store}/reducer.ts | 2 +- .../network => network/store}/selectors.ts | 2 +- .../alerts_by_category/index.test.tsx | 10 +- .../components}/alerts_by_category/index.tsx | 24 +- .../components}/event_counts/index.test.tsx | 6 +- .../components}/event_counts/index.tsx | 14 +- .../events_by_dataset/__mocks__/index.tsx | 0 .../components}/events_by_dataset/index.tsx | 28 +-- .../__snapshots__/index.test.tsx.snap | 0 .../components}/host_overview/index.test.tsx | 4 +- .../components}/host_overview/index.tsx | 36 +-- .../components}/host_overview/mock.ts | 2 +- .../components}/host_overview/translations.ts | 0 .../loading_placeholders/index.tsx | 0 .../components}/overview_empty/index.tsx | 6 +- .../components}/overview_host/index.test.tsx | 24 +- .../components}/overview_host/index.tsx | 25 +-- .../__snapshots__/index.test.tsx.snap | 0 .../overview_host_stats/index.test.tsx | 2 +- .../components}/overview_host_stats/index.tsx | 2 +- .../components}/overview_host_stats/mock.ts | 2 +- .../overview_network/index.test.tsx | 24 +- .../components}/overview_network/index.tsx | 22 +- .../__snapshots__/index.test.tsx.snap | 0 .../overview_network_stats/index.test.tsx | 2 +- .../overview_network_stats/index.tsx | 2 +- .../overview_network_stats/mock.ts | 2 +- .../components/recent_cases/filters/index.tsx | 0 .../components/recent_cases/index.tsx | 13 +- .../recent_cases/no_cases/index.tsx | 6 +- .../components/recent_cases/recent_cases.tsx | 10 +- .../components/recent_cases/translations.ts | 0 .../components/recent_cases/types.ts | 0 .../recent_timelines/counts/index.tsx | 7 +- .../recent_timelines/filters/index.tsx | 0 .../recent_timelines/header/index.tsx | 7 +- .../components/recent_timelines/index.tsx | 24 +- .../recent_timelines/recent_timelines.tsx | 7 +- .../recent_timelines/translations.ts | 0 .../components/recent_timelines/types.ts | 0 .../components}/sidebar/index.tsx | 4 +- .../components}/sidebar/sidebar.tsx | 24 +- .../components}/signals_by_category/index.tsx | 16 +- .../components}/stat_value.tsx | 4 +- .../overview => overview/components}/types.ts | 0 .../overview_host/index.gql_query.ts | 0 .../containers}/overview_host/index.tsx | 10 +- .../overview_network/index.gql_query.ts | 0 .../containers}/overview_network/index.tsx | 10 +- x-pack/plugins/siem/public/overview/index.ts | 18 ++ .../overview => overview/pages}/index.tsx | 0 .../pages}/overview.test.tsx | 12 +- .../overview => overview/pages}/overview.tsx | 31 +-- .../overview => overview/pages}/summary.tsx | 2 +- .../pages}/translations.ts | 0 .../plugins/siem/public/overview/routes.tsx | 15 ++ .../plugins/siem/public/pages/home/types.ts | 26 --- x-pack/plugins/siem/public/plugin.tsx | 63 +++++- x-pack/plugins/siem/public/store/reducer.ts | 47 ---- .../certificate_fingerprint/index.test.tsx | 4 +- .../certificate_fingerprint/index.tsx | 6 +- .../certificate_fingerprint/translations.ts | 0 .../components/duration/index.test.tsx | 4 +- .../components/duration/index.tsx | 2 +- .../edit_data_provider/helpers.test.tsx | 2 +- .../components/edit_data_provider/helpers.tsx | 2 +- .../edit_data_provider/index.test.tsx | 4 +- .../components/edit_data_provider/index.tsx | 2 +- .../edit_data_provider/translations.ts | 0 .../field_renderers.test.tsx.snap | 0 .../field_renderers/field_renderers.test.tsx | 10 +- .../field_renderers/field_renderers.tsx | 26 ++- .../fields_browser/categories_pane.test.tsx | 2 +- .../fields_browser/categories_pane.tsx | 2 +- .../fields_browser/category.test.tsx | 6 +- .../components/fields_browser/category.tsx | 2 +- .../fields_browser/category_columns.test.tsx | 2 +- .../fields_browser/category_columns.tsx | 8 +- .../fields_browser/category_title.test.tsx | 2 +- .../fields_browser/category_title.tsx | 4 +- .../fields_browser/field_browser.test.tsx | 4 +- .../fields_browser/field_browser.tsx | 4 +- .../fields_browser/field_items.test.tsx | 8 +- .../components/fields_browser/field_items.tsx | 28 ++- .../fields_browser/field_name.test.tsx | 6 +- .../components/fields_browser/field_name.tsx | 6 +- .../fields_browser/fields_pane.test.tsx | 6 +- .../components/fields_browser/fields_pane.tsx | 4 +- .../components/fields_browser/header.test.tsx | 4 +- .../components/fields_browser/header.tsx | 8 +- .../fields_browser/helpers.test.tsx | 4 +- .../components/fields_browser/helpers.tsx | 2 +- .../components/fields_browser/index.test.tsx | 6 +- .../components/fields_browser/index.tsx | 6 +- .../components/fields_browser/translations.ts | 0 .../components/fields_browser/types.ts | 4 +- .../flyout/__snapshots__/index.test.tsx.snap | 0 .../components/flyout/button/index.tsx | 7 +- .../components/flyout/button/translations.ts | 0 .../components/flyout/header/index.tsx | 24 +- .../__snapshots__/index.test.tsx.snap | 0 .../header_with_close_button/index.test.tsx | 2 +- .../flyout/header_with_close_button/index.tsx | 0 .../header_with_close_button/translations.ts | 0 .../components/flyout/index.test.tsx | 33 ++- .../components/flyout/index.tsx | 4 +- .../pane/__snapshots__/index.test.tsx.snap | 0 .../components/flyout/pane/index.test.tsx | 2 +- .../components/flyout/pane/index.tsx | 4 +- .../flyout/pane/timeline_resize_handle.tsx | 0 .../components/flyout/pane/translations.ts | 0 .../formatted_duration/helpers.test.ts | 2 +- .../components/formatted_duration/helpers.tsx | 2 +- .../components/formatted_duration/index.tsx | 0 .../formatted_duration/tooltip/index.tsx | 0 .../formatted_duration/translations.ts | 0 .../components/formatted_ip/index.tsx | 20 +- .../components/ja3_fingerprint/index.test.tsx | 4 +- .../components/ja3_fingerprint/index.tsx | 6 +- .../ja3_fingerprint/translations.ts | 0 .../components/lazy_accordion/index.tsx | 0 .../components/loading/index.tsx | 0 .../netflow/__snapshots__/index.test.tsx.snap | 0 .../components/netflow/fingerprints/index.tsx | 0 .../components/netflow/index.test.tsx | 23 +- .../components/netflow/index.tsx | 0 .../duration_event_start_end.tsx | 4 +- .../netflow/netflow_columns/index.tsx | 2 +- .../netflow/netflow_columns/types.ts | 0 .../netflow/netflow_columns/user_process.tsx | 2 +- .../components/netflow/types.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../__snapshots__/new_note.test.tsx.snap | 0 .../components/notes/add_note/index.test.tsx | 0 .../components/notes/add_note/index.tsx | 2 +- .../notes/add_note/new_note.test.tsx | 0 .../components/notes/add_note/new_note.tsx | 2 +- .../components/notes/columns.tsx | 0 .../components/notes/helpers.tsx | 4 +- .../components/notes/index.tsx | 2 +- .../note_card_body.test.tsx.snap | 0 .../components/notes/note_card/index.test.tsx | 0 .../components/notes/note_card/index.tsx | 0 .../notes/note_card/note_card_body.test.tsx | 0 .../notes/note_card/note_card_body.tsx | 6 +- .../notes/note_card/note_card_header.test.tsx | 0 .../notes/note_card/note_card_header.tsx | 0 .../notes/note_card/note_created.test.tsx | 0 .../notes/note_card/note_created.tsx | 2 +- .../notes/note_cards/index.test.tsx | 2 +- .../components/notes/note_cards/index.tsx | 2 +- .../components/notes/translations.ts | 0 .../components/open_timeline/constants.ts | 0 .../delete_timeline_modal.test.tsx | 0 .../delete_timeline_modal.tsx | 0 .../delete_timeline_modal/index.test.tsx | 0 .../delete_timeline_modal/index.tsx | 0 .../open_timeline/edit_timeline_actions.tsx | 0 .../edit_timeline_batch_actions.tsx | 0 .../export_timeline/export_timeline.test.tsx | 0 .../export_timeline/export_timeline.tsx | 7 +- .../export_timeline/index.test.tsx | 0 .../open_timeline/export_timeline/index.tsx | 2 +- .../open_timeline/export_timeline/mocks.ts | 0 .../components/open_timeline/helpers.test.ts | 22 +- .../components/open_timeline/helpers.ts | 17 +- .../components/open_timeline/index.test.tsx | 16 +- .../components/open_timeline/index.tsx | 18 +- .../note_previews/index.test.tsx | 2 +- .../open_timeline/note_previews/index.tsx | 0 .../note_previews/note_preview.test.tsx | 2 +- .../note_previews/note_preview.tsx | 6 +- .../open_timeline/open_timeline.test.tsx | 6 +- .../open_timeline/open_timeline.tsx | 6 +- .../open_timeline_modal/index.test.tsx | 16 +- .../open_timeline_modal/index.tsx | 4 +- .../open_timeline_modal_body.test.tsx | 6 +- .../open_timeline_modal_body.tsx | 0 .../open_timeline_modal_button.test.tsx | 6 +- .../open_timeline_modal_button.tsx | 0 .../open_timeline/search_row/index.test.tsx | 0 .../open_timeline/search_row/index.tsx | 0 .../timelines_table/actions_columns.test.tsx | 4 +- .../timelines_table/actions_columns.tsx | 0 .../timelines_table/common_columns.test.tsx | 6 +- .../timelines_table/common_columns.tsx | 4 +- .../timelines_table/common_styles.ts | 0 .../timelines_table/extended_columns.test.tsx | 6 +- .../timelines_table/extended_columns.tsx | 2 +- .../icon_header_columns.test.tsx | 4 +- .../timelines_table/icon_header_columns.tsx | 0 .../timelines_table/index.test.tsx | 4 +- .../open_timeline/timelines_table/index.tsx | 0 .../open_timeline/timelines_table/mocks.ts | 2 +- .../open_timeline/title_row/index.test.tsx | 0 .../open_timeline/title_row/index.tsx | 2 +- .../components/open_timeline/translations.ts | 0 .../components/open_timeline/types.ts | 8 +- .../open_timeline/use_timeline_types.tsx | 9 +- .../__snapshots__/timeline.test.tsx.snap | 0 .../__examples__/index.stories.tsx | 0 .../timeline}/and_or_badge/index.tsx | 0 .../timeline}/and_or_badge/translations.ts | 0 .../timeline/auto_save_warning/index.tsx | 11 +- .../auto_save_warning/translations.ts | 0 .../timeline/body/actions/index.test.tsx | 2 +- .../timeline/body/actions/index.tsx | 6 +- .../__snapshots__/index.test.tsx.snap | 0 .../body/column_headers/actions/index.tsx | 2 +- .../body/column_headers/column_header.tsx | 4 +- .../common/dragging_container.tsx | 0 .../body/column_headers/common/styles.tsx | 0 .../body/column_headers/default_headers.ts | 0 .../column_headers/events_select/helpers.tsx | 2 +- .../column_headers/events_select/index.tsx | 0 .../events_select/translations.ts | 0 .../filter/__snapshots__/index.test.tsx.snap | 0 .../body/column_headers/filter/index.test.tsx | 2 +- .../body/column_headers/filter/index.tsx | 2 +- .../header/__snapshots__/index.test.tsx.snap | 0 .../column_headers/header/header_content.tsx | 4 +- .../body/column_headers/header/helpers.ts | 6 +- .../body/column_headers/header/index.test.tsx | 6 +- .../body/column_headers/header/index.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 0 .../header_tooltip_content/index.test.tsx | 4 +- .../header_tooltip_content/index.tsx | 4 +- .../body/column_headers/helpers.test.ts | 0 .../timeline/body/column_headers/helpers.ts | 4 +- .../body/column_headers/index.test.tsx | 8 +- .../timeline/body/column_headers/index.tsx | 13 +- .../range_picker/index.test.tsx | 0 .../column_headers/range_picker/index.tsx | 0 .../column_headers/range_picker/ranges.ts | 0 .../range_picker/translations.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../column_headers/text_filter/index.test.tsx | 0 .../body/column_headers/text_filter/index.tsx | 0 .../body/column_headers/translations.ts | 0 .../components/timeline/body/column_id.ts | 0 .../components/timeline/body/constants.ts | 0 .../__snapshots__/index.test.tsx.snap | 0 .../body/data_driven_columns/index.test.tsx | 2 +- .../body/data_driven_columns/index.tsx | 4 +- .../body/events/event_column_view.tsx | 6 +- .../components/timeline/body/events/index.tsx | 10 +- .../timeline/body/events/stateful_event.tsx | 16 +- .../components/timeline/body/helpers.test.ts | 2 +- .../components/timeline/body/helpers.ts | 4 +- .../components/timeline/body/index.test.tsx | 14 +- .../components/timeline/body/index.tsx | 8 +- .../body/mini_map/date_ranges.test.ts | 0 .../timeline/body/mini_map/date_ranges.ts | 0 .../__snapshots__/args.test.tsx.snap | 0 .../empty_column_renderer.test.tsx.snap | 0 .../formatted_field.test.tsx.snap | 0 .../get_column_renderer.test.tsx.snap | 0 .../get_row_renderer.test.tsx.snap | 0 .../host_working_dir.test.tsx.snap | 0 .../plain_column_renderer.test.tsx.snap | 0 .../plain_row_renderer.test.tsx.snap | 0 .../process_draggable.test.tsx.snap | 0 .../unknown_column_renderer.test.tsx.snap | 0 .../user_host_working_dir.test.tsx.snap | 0 .../timeline/body/renderers/args.test.tsx | 4 +- .../timeline/body/renderers/args.tsx | 2 +- .../generic_details.test.tsx.snap | 0 .../generic_file_details.test.tsx.snap | 0 .../generic_row_renderer.test.tsx.snap | 0 .../primary_secondary_user_info.test.tsx.snap | 0 ...ession_user_host_working_dir.test.tsx.snap | 0 .../renderers/auditd/generic_details.test.tsx | 8 +- .../body/renderers/auditd/generic_details.tsx | 6 +- .../auditd/generic_file_details.test.tsx | 8 +- .../renderers/auditd/generic_file_details.tsx | 6 +- .../auditd/generic_row_renderer.test.tsx | 12 +- .../renderers/auditd/generic_row_renderer.tsx | 0 .../primary_secondary_user_info.test.tsx | 4 +- .../auditd/primary_secondary_user_info.tsx | 2 +- .../session_user_host_working_dir.test.tsx | 4 +- .../auditd/session_user_host_working_dir.tsx | 2 +- .../body/renderers/auditd/translations.ts | 0 .../body/renderers}/bytes/index.test.tsx | 6 +- .../timeline/body/renderers}/bytes/index.tsx | 4 +- .../body/renderers/column_renderer.ts | 4 +- .../timeline/body/renderers/constants.tsx | 0 .../dns/dns_request_event_details.test.tsx | 8 +- .../dns/dns_request_event_details.tsx | 4 +- .../dns_request_event_details_line.test.tsx | 4 +- .../dns/dns_request_event_details_line.tsx | 2 +- .../body/renderers/dns/translations.ts | 0 .../renderers/empty_column_renderer.test.tsx | 8 +- .../body/renderers/empty_column_renderer.tsx | 13 +- .../endgame_security_event_details.test.tsx | 8 +- .../endgame_security_event_details.tsx | 4 +- ...dgame_security_event_details_line.test.tsx | 4 +- .../endgame_security_event_details_line.tsx | 2 +- .../body/renderers/endgame/helpers.test.tsx | 0 .../body/renderers/endgame/helpers.ts | 0 .../body/renderers/endgame/translations.ts | 0 .../renderers/exit_code_draggable.test.tsx | 4 +- .../body/renderers/exit_code_draggable.tsx | 2 +- .../body/renderers/file_draggable.test.tsx | 4 +- .../body/renderers/file_draggable.tsx | 2 +- .../body/renderers/formatted_field.test.tsx | 8 +- .../body/renderers/formatted_field.tsx | 19 +- .../renderers/formatted_field_helpers.tsx | 12 +- .../renderers/get_column_renderer.test.tsx | 10 +- .../body/renderers/get_column_renderer.ts | 2 +- .../body/renderers/get_row_renderer.test.tsx | 10 +- .../body/renderers/get_row_renderer.ts | 2 +- .../timeline/body/renderers/helpers.test.tsx | 4 +- .../timeline/body/renderers/helpers.tsx | 2 +- .../body/renderers/host_working_dir.test.tsx | 4 +- .../body/renderers/host_working_dir.tsx | 2 +- .../timeline/body/renderers/index.ts | 0 .../timeline/body/renderers/netflow.tsx | 22 +- .../netflow_row_renderer.test.tsx.snap | 0 .../netflow/netflow_row_renderer.test.tsx | 10 +- .../netflow/netflow_row_renderer.tsx | 20 +- .../parent_process_draggable.test.tsx | 4 +- .../renderers/parent_process_draggable.tsx | 2 +- .../body/renderers/parse_query_value.test.ts | 0 .../body/renderers/parse_query_value.ts | 0 .../body/renderers/parse_value.test.ts | 0 .../timeline/body/renderers/parse_value.ts | 0 .../renderers/plain_column_renderer.test.tsx | 8 +- .../body/renderers/plain_column_renderer.tsx | 6 +- .../renderers/plain_row_renderer.test.tsx | 6 +- .../body/renderers/plain_row_renderer.tsx | 0 .../body/renderers/process_draggable.test.tsx | 4 +- .../body/renderers/process_draggable.tsx | 2 +- .../body/renderers/process_hash.test.tsx | 4 +- .../timeline/body/renderers/process_hash.tsx | 2 +- .../timeline/body/renderers/row_renderer.tsx | 4 +- .../suricata_details.test.tsx.snap | 0 .../suricata_row_renderer.test.tsx.snap | 0 .../suricata_signature.test.tsx.snap | 0 .../suricata/suricata_details.test.tsx | 8 +- .../renderers/suricata/suricata_details.tsx | 4 +- .../renderers/suricata/suricata_links.test.ts | 0 .../body/renderers/suricata/suricata_links.ts | 0 .../body/renderers/suricata/suricata_refs.tsx | 2 +- .../suricata/suricata_row_renderer.test.tsx | 10 +- .../suricata/suricata_row_renderer.tsx | 0 .../suricata/suricata_signature.test.tsx | 4 +- .../renderers/suricata/suricata_signature.tsx | 15 +- .../__snapshots__/auth_ssh.test.tsx.snap | 0 .../generic_details.test.tsx.snap | 0 .../generic_file_details.test.tsx.snap | 0 .../generic_row_renderer.test.tsx.snap | 0 .../__snapshots__/package.test.tsx.snap | 0 .../body/renderers/system/auth_ssh.test.tsx | 0 .../body/renderers/system/auth_ssh.tsx | 2 +- .../renderers/system/generic_details.test.tsx | 8 +- .../body/renderers/system/generic_details.tsx | 10 +- .../system/generic_file_details.test.tsx | 8 +- .../renderers/system/generic_file_details.tsx | 10 +- .../system/generic_row_renderer.test.tsx | 14 +- .../renderers/system/generic_row_renderer.tsx | 0 .../body/renderers/system/package.test.tsx | 4 +- .../body/renderers/system/package.tsx | 2 +- .../body/renderers/system/translations.ts | 0 .../timeline/body/renderers/translations.ts | 0 .../unknown_column_renderer.test.tsx | 6 +- .../renderers/unknown_column_renderer.tsx | 2 +- .../renderers/user_host_working_dir.test.tsx | 4 +- .../body/renderers/user_host_working_dir.tsx | 2 +- .../__snapshots__/zeek_details.test.tsx.snap | 0 .../zeek_row_renderer.test.tsx.snap | 0 .../zeek_signature.test.tsx.snap | 0 .../body/renderers/zeek/translations.ts | 0 .../body/renderers/zeek/zeek_details.test.tsx | 6 +- .../body/renderers/zeek/zeek_details.tsx | 4 +- .../renderers/zeek/zeek_row_renderer.test.tsx | 8 +- .../body/renderers/zeek/zeek_row_renderer.tsx | 0 .../renderers/zeek/zeek_signature.test.tsx | 6 +- .../body/renderers/zeek/zeek_signature.tsx | 15 +- .../sort_indicator.test.tsx.snap | 0 .../components/timeline/body/sort/index.ts | 2 +- .../body/sort/sort_indicator.test.tsx | 2 +- .../timeline/body/sort/sort_indicator.tsx | 2 +- .../timeline/body/stateful_body.test.tsx | 2 +- .../timeline/body/stateful_body.tsx | 11 +- .../components/timeline/body/translations.ts | 0 .../data_providers.test.tsx.snap | 0 .../__snapshots__/empty.test.tsx.snap | 0 .../__snapshots__/provider.test.tsx.snap | 0 .../__snapshots__/providers.test.tsx.snap | 0 .../timeline/data_providers/data_provider.ts | 0 .../data_providers/data_providers.test.tsx | 4 +- .../timeline/data_providers/empty.test.tsx | 2 +- .../timeline/data_providers/empty.tsx | 2 +- .../timeline/data_providers/helpers.tsx | 0 .../timeline/data_providers/index.tsx | 6 +- .../mock/mock_data_providers.tsx | 0 .../timeline/data_providers/provider.test.tsx | 2 +- .../timeline/data_providers/provider.tsx | 0 .../data_providers/provider_badge.tsx | 4 +- .../data_providers/provider_item_actions.tsx | 2 +- .../data_providers/provider_item_and.tsx | 95 ++++++++ .../provider_item_and_drag_drop.tsx | 136 ++++++++++++ .../data_providers/provider_item_badge.tsx | 4 +- .../data_providers/providers.test.tsx | 10 +- .../timeline/data_providers/providers.tsx | 6 +- .../timeline/data_providers/translations.ts | 0 .../components/timeline/events.ts | 2 +- .../timeline/expandable_event/index.tsx | 8 +- .../expandable_event/translations.tsx | 0 .../timeline/fetch_kql_timeline.tsx | 10 +- .../footer/__snapshots__/index.test.tsx.snap | 0 .../components/timeline/footer/index.test.tsx | 2 +- .../components/timeline/footer/index.tsx | 2 +- .../timeline/footer/last_updated.tsx | 0 .../components/timeline/footer/mock.ts | 2 +- .../timeline/footer/translations.ts | 0 .../header/__snapshots__/index.test.tsx.snap | 0 .../components/timeline/header/index.test.tsx | 12 +- .../components/timeline/header/index.tsx | 2 +- .../timeline/header/translations.ts | 0 .../components/timeline/helpers.test.tsx | 6 +- .../components/timeline/helpers.tsx | 6 +- .../components/timeline/index.tsx | 12 +- .../insert_timeline_popover/index.test.tsx | 2 +- .../insert_timeline_popover/index.tsx | 2 +- .../use_insert_timeline.tsx | 6 +- .../components/timeline}/pin/index.test.tsx | 0 .../components/timeline}/pin/index.tsx | 2 +- .../timeline/properties/helpers.tsx | 8 +- .../timeline/properties/index.test.tsx | 19 +- .../components/timeline/properties/index.tsx | 6 +- .../timeline/properties/notes_size.ts | 0 .../timeline/properties/properties_left.tsx | 4 +- .../timeline/properties/properties_right.tsx | 4 +- .../components/timeline/properties/styles.tsx | 0 .../timeline/properties/translations.ts | 0 .../timeline/query_bar/index.test.tsx | 16 +- .../components/timeline/query_bar/index.tsx | 16 +- .../components/timeline/refetch_timeline.tsx | 6 +- .../search_or_filter/helpers.test.tsx | 0 .../timeline/search_or_filter/helpers.tsx | 4 +- .../timeline/search_or_filter/index.tsx | 21 +- .../timeline/search_or_filter/pick_events.tsx | 2 +- .../search_or_filter/search_or_filter.tsx | 14 +- .../timeline/search_or_filter/translations.ts | 0 .../timeline/search_super_select/index.tsx | 0 .../timeline/selectable_timeline/index.tsx | 8 +- .../__snapshots__/index.test.tsx.snap | 0 .../timeline}/skeleton_row/index.test.tsx | 2 +- .../timeline}/skeleton_row/index.tsx | 0 .../components/timeline/styles.tsx | 4 +- .../components/timeline/timeline.test.tsx | 14 +- .../components/timeline/timeline.tsx | 12 +- .../components/timeline/timeline_context.tsx | 2 +- .../components/timeline/translations.ts | 0 .../containers}/all/index.gql_query.ts | 0 .../containers}/all/index.tsx | 10 +- .../timeline => timelines/containers}/api.ts | 11 +- .../containers}/delete/persist.gql_query.ts | 0 .../containers}/details/index.gql_query.ts | 0 .../containers}/details/index.tsx | 2 +- .../containers}/favorite/persist.gql_query.ts | 0 .../containers}/index.gql_query.ts | 0 .../containers}/index.tsx | 14 +- .../containers}/notes/persist.gql_query.ts | 0 .../containers}/one/index.gql_query.ts | 0 .../containers}/persist.gql_query.ts | 0 .../pinned_event/persist.gql_query.ts | 0 x-pack/plugins/siem/public/timelines/index.ts | 24 ++ .../timelines => timelines/pages}/index.tsx | 10 +- .../pages}/timelines_page.test.tsx | 13 +- .../pages}/timelines_page.tsx | 15 +- .../pages}/translations.ts | 0 .../plugins/siem/public/timelines/routes.tsx | 15 ++ .../{ => timelines}/store/timeline/actions.ts | 10 +- .../store/timeline/defaults.ts | 9 +- .../store/timeline/epic.test.ts | 11 +- .../{ => timelines}/store/timeline/epic.ts | 18 +- ...c_dispatcher_timeline_persistence_queue.ts | 0 .../store/timeline/epic_favorite.ts | 8 +- .../store/timeline/epic_note.ts | 10 +- .../store/timeline/epic_pinned_event.ts | 8 +- .../{ => timelines}/store/timeline/helpers.ts | 13 +- .../{ => timelines}/store/timeline/index.ts | 10 + .../store/timeline/manage_timeline_id.tsx | 0 .../{ => timelines}/store/timeline/model.ts | 13 +- .../store/timeline/my_epic_timeline_id.ts | 0 .../store/timeline/reducer.test.ts | 14 +- .../{ => timelines}/store/timeline/reducer.ts | 0 .../store/timeline/refetch_queries.ts | 6 +- .../store/timeline/selectors.ts | 4 +- .../{ => timelines}/store/timeline/types.ts | 0 .../apis/siem/authentications.ts | 2 +- .../test/api_integration/apis/siem/hosts.ts | 6 +- .../api_integration/apis/siem/ip_overview.ts | 2 +- .../apis/siem/kpi_host_details.ts | 2 +- .../api_integration/apis/siem/kpi_hosts.ts | 2 +- .../api_integration/apis/siem/kpi_network.ts | 2 +- .../api_integration/apis/siem/network_dns.ts | 2 +- .../apis/siem/network_top_n_flow.ts | 2 +- .../apis/siem/overview_host.ts | 2 +- .../apis/siem/overview_network.ts | 2 +- .../apis/siem/saved_objects/notes.ts | 2 +- .../apis/siem/saved_objects/pinned_events.ts | 2 +- .../apis/siem/saved_objects/timeline.ts | 6 +- .../test/api_integration/apis/siem/sources.ts | 2 +- .../api_integration/apis/siem/timeline.ts | 2 +- .../apis/siem/timeline_details.ts | 2 +- x-pack/test/api_integration/apis/siem/tls.ts | 2 +- .../apis/siem/uncommon_processes.ts | 2 +- .../test/api_integration/apis/siem/users.ts | 2 +- 1698 files changed, 4160 insertions(+), 3026 deletions(-) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/activity_monitor/columns.tsx (96%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/activity_monitor/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/activity_monitor/index.tsx (98%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/activity_monitor/types.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/detection_engine_header_page/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/detection_engine_header_page/index.tsx (88%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/detection_engine_header_page/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/no_api_integration_callout/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/no_api_integration_callout/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/no_api_integration_callout/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/no_write_signals_callout/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/no_write_signals_callout/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/no_write_signals_callout/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/accordion_title/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/accordion_title/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/add_item_form/index.test.tsx (90%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/add_item_form/index.tsx (98%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/all_rules_tables/index.test.tsx (97%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/all_rules_tables/index.tsx (88%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/anomaly_threshold_slider/index.test.tsx (92%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/anomaly_threshold_slider/index.tsx (95%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/assets/list_tree_icon.svg (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/helpers.test.tsx (99%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/helpers.tsx (97%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/index.test.tsx (95%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/index.tsx (91%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/ml_job_description.test.tsx (97%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/ml_job_description.tsx (92%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/translations.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/description_step/types.ts (83%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/mitre/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/mitre/helpers.ts (87%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/mitre/index.test.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/mitre/index.tsx (97%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/mitre/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/ml_job_select/index.test.tsx (74%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/ml_job_select/index.tsx (94%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/next_step/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/next_step/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/next_step/index.tsx (92%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/optional_field_label/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/optional_field_label/index.tsx (84%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/pick_timeline/index.test.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/pick_timeline/index.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/pre_packaged_rules/load_empty_prompt.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/pre_packaged_rules/load_empty_prompt.tsx (94%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/pre_packaged_rules/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/pre_packaged_rules/update_callout.test.tsx (89%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/pre_packaged_rules/update_callout.tsx (95%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/query_bar/index.test.tsx (90%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/query_bar/index.tsx (90%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/query_bar/translations.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/read_only_callout/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/read_only_callout/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/read_only_callout/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_actions_field/index.test.tsx (86%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_actions_field/index.tsx (86%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_actions_overflow/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_actions_overflow/index.test.tsx (97%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_actions_overflow/index.tsx (89%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_actions_overflow/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_status/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_status/helpers.ts (85%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_status/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_status/index.tsx (92%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_status/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_switch/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_switch/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/rule_switch/index.tsx (88%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/schedule_item_form/index.test.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/schedule_item_form/index.tsx (99%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/schedule_item_form/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/select_rule_type/index.test.tsx (86%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/select_rule_type/index.tsx (92%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/select_rule_type/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/severity_badge/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/severity_badge/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/status_icon/index.test.tsx (85%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/status_icon/index.tsx (87%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule/data.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule/default_value.ts (89%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule/helpers.test.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule/helpers.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule/index.test.tsx (97%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule/index.tsx (96%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule/schema.tsx (97%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule_details/index.test.tsx (92%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule_details/index.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_about_rule_details/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_content_wrapper/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_content_wrapper/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_define_rule/index.test.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_define_rule/index.tsx (89%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_define_rule/schema.tsx (96%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_define_rule/translations.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_define_rule/types.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_panel/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_panel/index.tsx (91%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_rule_actions/index.test.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_rule_actions/index.tsx (94%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_rule_actions/schema.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_rule_actions/translations.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_schedule_rule/index.test.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_schedule_rule/index.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_schedule_rule/schema.tsx (95%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/step_schedule_rule/translations.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/throttle_select_field/index.test.tsx (92%) rename x-pack/plugins/siem/public/{pages/detection_engine/rules/components => alerts/components/rules}/throttle_select_field/index.tsx (91%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/actions.test.tsx (98%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/actions.tsx (93%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/default_config.test.tsx (96%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/default_config.tsx (92%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/helpers.test.ts (96%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/helpers.ts (97%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/index.tsx (92%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/signals_filter_group/index.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/signals_filter_group/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/signals_utility_bar/index.test.tsx (95%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/signals_utility_bar/index.tsx (94%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/signals_utility_bar/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals/types.ts (90%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_histogram_panel/config.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_histogram_panel/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_histogram_panel/helpers.tsx (94%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_histogram_panel/index.test.tsx (86%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_histogram_panel/index.tsx (87%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_histogram_panel/signals_histogram.test.tsx (94%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_histogram_panel/signals_histogram.tsx (89%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_histogram_panel/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_histogram_panel/types.ts (94%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_info/index.tsx (94%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_info/query.dsl.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/signals_info/types.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/user_info/index.test.tsx (71%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/components/user_info/index.tsx (96%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/__mocks__/api.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/api.test.ts (99%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/api.ts (98%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/fetch_index_patterns.test.tsx (98%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/fetch_index_patterns.tsx (89%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/index.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/mock.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/persist_rule.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/persist_rule.tsx (94%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/translations.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/types.ts (98%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_pre_packaged_rules.tsx (98%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_rule.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_rule.tsx (94%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_rule_status.test.tsx (99%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_rule_status.tsx (97%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_rules.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_rules.tsx (97%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_tags.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/rules/use_tags.tsx (94%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/__mocks__/api.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/api.test.ts (97%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/api.ts (96%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/mock.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/translations.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/types.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/use_privilege_user.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/use_privilege_user.tsx (96%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/use_query.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/use_query.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/use_signal_index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/containers/detection_engine/signals/use_signal_index.tsx (95%) create mode 100644 x-pack/plugins/siem/public/alerts/index.ts rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/mitre/mitre_tactics_techniques.ts (100%) rename x-pack/plugins/siem/public/{pages/detection_engine => alerts}/mitre/types.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/detection_engine.test.tsx (80%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/detection_engine.tsx (80%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/detection_engine_empty_page.test.tsx (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/detection_engine_empty_page.tsx (83%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/detection_engine_no_signal_index.test.tsx (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/detection_engine_no_signal_index.tsx (88%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/detection_engine_user_unauthenticated.tsx (88%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/index.test.tsx (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/index.tsx (96%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/__mocks__/mock.ts (94%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/actions.tsx (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/batch_actions.tsx (97%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/columns.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/columns.tsx (90%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/helpers.test.tsx (97%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/helpers.ts (94%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/index.test.tsx (95%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/index.tsx (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/reducer.ts (98%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx (95%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx (95%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/create/helpers.test.ts (99%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/create/helpers.ts (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/create/index.test.tsx (78%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/create/index.tsx (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/create/translations.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/details/failure_history.test.tsx (76%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/details/failure_history.tsx (87%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/details/index.test.tsx (78%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/details/index.tsx (84%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/details/status_failed_callout.test.tsx (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/details/status_failed_callout.tsx (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/details/translations.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/edit/index.test.tsx (84%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/edit/index.tsx (92%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/edit/translations.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/helpers.test.tsx (98%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/helpers.tsx (93%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/index.test.tsx (71%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/index.tsx (89%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/translations.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/types.ts (87%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/utils.test.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/rules/utils.ts (90%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/translations.ts (100%) rename x-pack/plugins/siem/public/{ => alerts}/pages/detection_engine/types.ts (100%) create mode 100644 x-pack/plugins/siem/public/alerts/routes.tsx rename x-pack/plugins/siem/public/{pages => app}/404.tsx (90%) rename x-pack/plugins/siem/public/{pages => app}/home/home_navigations.tsx (93%) rename x-pack/plugins/siem/public/{pages => app}/home/index.tsx (56%) rename x-pack/plugins/siem/public/{pages => app}/home/translations.ts (100%) rename x-pack/plugins/siem/public/{ => app}/routes.tsx (69%) create mode 100644 x-pack/plugins/siem/public/app/types.ts rename x-pack/plugins/siem/public/{pages/case => cases}/components/__mock__/form.ts (84%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/__mock__/router.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/add_comment/index.test.tsx (85%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/add_comment/index.tsx (83%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/add_comment/schema.tsx (80%) rename x-pack/plugins/siem/public/{components/page/hosts/index.tsx => cases/components/add_comment/translations.ts} (62%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/all_cases/actions.tsx (92%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/all_cases/columns.test.tsx (94%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/all_cases/columns.tsx (94%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/all_cases/index.test.tsx (92%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/all_cases/index.tsx (94%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/all_cases/table_filters.test.tsx (90%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/all_cases/table_filters.tsx (94%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/all_cases/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/bulk_actions/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/bulk_actions/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/callout/helpers.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/callout/index.test.tsx (98%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/callout/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/callout/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/case_header_page/index.tsx (87%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/case_header_page/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/case_status/index.tsx (93%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/case_view/actions.test.tsx (91%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/case_view/actions.tsx (88%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/case_view/index.test.tsx (94%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/case_view/index.tsx (92%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/case_view/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/__mock__/index.tsx (70%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/button.test.tsx (98%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/button.tsx (94%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/closure_options.test.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/closure_options.tsx (95%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/closure_options_radio.test.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/closure_options_radio.tsx (95%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/connectors.test.tsx (98%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/connectors.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/connectors_dropdown.test.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/connectors_dropdown.tsx (94%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/field_mapping.test.tsx (93%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/field_mapping.tsx (94%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/field_mapping_row.test.tsx (95%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/field_mapping_row.tsx (92%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/index.test.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/index.tsx (91%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/mapping.test.tsx (99%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/mapping.tsx (95%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/utils.test.tsx (96%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/configure_cases/utils.ts (95%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/confirm_delete_case/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/confirm_delete_case/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/connector_selector/form.tsx (94%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/create/index.test.tsx (81%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/create/index.tsx (90%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/create/optional_field_label/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/create/schema.tsx (91%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/edit_connector/index.test.tsx (93%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/edit_connector/index.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/edit_connector/schema.tsx (85%) rename x-pack/plugins/siem/public/{ => cases}/components/filter_popover/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/open_closed_stats/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/property_actions/constants.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/property_actions/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/property_actions/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/tag_list/index.test.tsx (88%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/tag_list/index.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/tag_list/schema.tsx (85%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/tag_list/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/use_push_to_service/helpers.tsx (96%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/use_push_to_service/index.test.tsx (89%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/use_push_to_service/index.tsx (89%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/use_push_to_service/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/helpers.test.tsx (96%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/helpers.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/index.test.tsx (96%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/index.tsx (96%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/schema.ts (96%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/user_action_avatar.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/user_action_item.tsx (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/user_action_markdown.tsx (87%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/user_action_title.test.tsx (92%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_action_tree/user_action_title.tsx (95%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_list/index.test.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_list/index.tsx (97%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/user_list/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases}/components/wrappers/index.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/__mocks__/api.ts (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/api.test.tsx (99%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/api.ts (99%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/__mocks__/api.ts (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/api.test.ts (97%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/api.ts (97%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/mock.ts (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/translations.ts (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/types.ts (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/use_configure.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/use_configure.tsx (98%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/use_connectors.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/configure/use_connectors.tsx (95%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/constants.ts (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/mock.ts (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/translations.ts (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/types.ts (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_bulk_update_case.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_bulk_update_case.tsx (96%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_delete_cases.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_delete_cases.tsx (97%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_action_license.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_action_license.tsx (96%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_case.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_case.tsx (97%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_case_user_actions.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_case_user_actions.tsx (98%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_cases.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_cases.tsx (98%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_cases_status.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_cases_status.tsx (96%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_reporters.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_reporters.tsx (96%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_tags.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_get_tags.tsx (96%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_post_case.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_post_case.tsx (96%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_post_comment.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_post_comment.tsx (96%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_post_push_to_service.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_post_push_to_service.tsx (98%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_update_case.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_update_case.tsx (96%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_update_comment.test.tsx (100%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/use_update_comment.tsx (97%) rename x-pack/plugins/siem/public/{containers/case => cases/containers}/utils.ts (98%) create mode 100644 x-pack/plugins/siem/public/cases/index.ts rename x-pack/plugins/siem/public/{pages/case => cases/pages}/case.tsx (74%) rename x-pack/plugins/siem/public/{pages/case => cases/pages}/case_details.tsx (68%) rename x-pack/plugins/siem/public/{pages/case => cases/pages}/configure_cases.tsx (68%) rename x-pack/plugins/siem/public/{pages/case => cases/pages}/create_case.tsx (65%) rename x-pack/plugins/siem/public/{pages/case => cases/pages}/index.tsx (96%) rename x-pack/plugins/siem/public/{pages/case => cases/pages}/saved_object_no_permissions.tsx (88%) rename x-pack/plugins/siem/public/{pages/case => cases/pages}/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/case => cases/pages}/utils.ts (92%) create mode 100644 x-pack/plugins/siem/public/cases/routes.tsx create mode 100644 x-pack/plugins/siem/public/cases/translations.ts rename x-pack/plugins/siem/public/{components/page => common/components}/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page => common/components}/add_filter_to_global_search_bar/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{components/page => common/components}/add_filter_to_global_search_bar/helpers.ts (100%) rename x-pack/plugins/siem/public/{components/page => common/components}/add_filter_to_global_search_bar/index.test.tsx (91%) rename x-pack/plugins/siem/public/{components/page => common/components}/add_filter_to_global_search_bar/index.tsx (95%) rename x-pack/plugins/siem/public/{components/page => common/components}/add_filter_to_global_search_bar/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/alerts_viewer/alerts_table.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/alerts_viewer/default_headers.ts (85%) rename x-pack/plugins/siem/public/{ => common}/components/alerts_viewer/histogram_configs.ts (94%) rename x-pack/plugins/siem/public/{ => common}/components/alerts_viewer/index.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/alerts_viewer/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/alerts_viewer/types.ts (76%) rename x-pack/plugins/siem/public/{ => common}/components/autocomplete_field/__examples__/index.stories.tsx (94%) rename x-pack/plugins/siem/public/{ => common}/components/autocomplete_field/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/autocomplete_field/index.test.tsx (99%) rename x-pack/plugins/siem/public/{ => common}/components/autocomplete_field/index.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/autocomplete_field/suggestion_item.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/charts/__snapshots__/areachart.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/__snapshots__/barchart.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/areachart.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/areachart.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/barchart.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/barchart.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/chart_place_holder.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/chart_place_holder.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/common.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/common.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/charts/draggable_legend.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/draggable_legend.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/draggable_legend_item.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/draggable_legend_item.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/charts/translation.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/__snapshots__/draggable_wrapper.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/__snapshots__/droppable_wrapper.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/drag_drop_context.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/drag_drop_context_wrapper.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/drag_drop_context_wrapper.tsx (94%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/draggable_wrapper.test.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/draggable_wrapper.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx (99%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/draggable_wrapper_hover_content.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/droppable_wrapper.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/droppable_wrapper.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/helpers.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/helpers.ts (95%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/provider_container.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/drag_and_drop/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/draggables/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/draggables/field_badge/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/draggables/field_badge/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/draggables/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/draggables/index.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/empty_page/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/empty_page/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/empty_page/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/empty_value/__snapshots__/empty_value.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/empty_value/empty_value.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/empty_value/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/empty_value/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/error_toast_dispatcher/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/error_toast_dispatcher/index.test.tsx (78%) rename x-pack/plugins/siem/public/{ => common}/components/error_toast_dispatcher/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/__snapshots__/event_details.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/__snapshots__/json_view.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/columns.tsx (89%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/event_details.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/event_details.tsx (90%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/event_fields_browser.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/event_fields_browser.tsx (90%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/event_id.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/helpers.tsx (93%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/json_view.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/json_view.tsx (88%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/stateful_event_details.tsx (86%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/event_details/types.ts (87%) rename x-pack/plugins/siem/public/{ => common}/components/events_viewer/default_headers.tsx (84%) rename x-pack/plugins/siem/public/{ => common}/components/events_viewer/default_model.tsx (71%) rename x-pack/plugins/siem/public/{ => common}/components/events_viewer/event_details_width_context.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/events_viewer/events_viewer.test.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/components/events_viewer/events_viewer.tsx (86%) rename x-pack/plugins/siem/public/{ => common}/components/events_viewer/index.test.tsx (92%) rename x-pack/plugins/siem/public/{ => common}/components/events_viewer/index.tsx (90%) rename x-pack/plugins/siem/public/{ => common}/components/events_viewer/mock.ts (95%) rename x-pack/plugins/siem/public/{ => common}/components/events_viewer/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/external_link_icon/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/external_link_icon/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/filters_global/__snapshots__/filters_global.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/filters_global/filters_global.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/filters_global/filters_global.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/filters_global/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/formatted_bytes/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/formatted_bytes/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/formatted_bytes/index.tsx (93%) rename x-pack/plugins/siem/public/{ => common}/components/formatted_date/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/formatted_date/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/formatted_date/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/formatted_date/maybe_date.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/formatted_date/maybe_date.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/generic_downloader/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/generic_downloader/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/generic_downloader/index.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/generic_downloader/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_global/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_global/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_global/index.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/header_global/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/__snapshots__/editable_title.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/__snapshots__/title.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/editable_title.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/editable_title.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/title.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/title.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_page/types.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_section/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_section/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/header_section/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/help_menu/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/import_data_modal/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/import_data_modal/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/import_data_modal/index.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/import_data_modal/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/inspect/index.test.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/inspect/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/inspect/modal.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/inspect/modal.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/inspect/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/last_event_time/index.test.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/last_event_time/index.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/link_icon/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/link_icon/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/link_icon/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/helpers.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/helpers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/link_to.tsx (94%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/redirect_to_case.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/redirect_to_detection_engine.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/redirect_to_hosts.tsx (94%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/redirect_to_network.tsx (90%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/redirect_to_overview.tsx (92%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/redirect_to_timelines.tsx (89%) rename x-pack/plugins/siem/public/{ => common}/components/link_to/redirect_wrapper.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/links/index.test.tsx (99%) rename x-pack/plugins/siem/public/{ => common}/components/links/index.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/links/translations.ts (87%) rename x-pack/plugins/siem/public/{ => common}/components/loader/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/loader/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/loader/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/localized_date_tooltip/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/localized_date_tooltip/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown/__snapshots__/markdown_hint.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown/markdown_hint.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown/markdown_hint.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown_editor/constants.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown_editor/form.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/markdown_editor/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/markdown_editor/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/matrix_histogram/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/matrix_histogram/index.test.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/matrix_histogram/index.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/components/matrix_histogram/matrix_loader.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/matrix_histogram/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/matrix_histogram/types.ts (95%) rename x-pack/plugins/siem/public/{ => common}/components/matrix_histogram/utils.test.ts (98%) rename x-pack/plugins/siem/public/{ => common}/components/matrix_histogram/utils.ts (97%) rename x-pack/plugins/siem/public/{ => common}/components/ml/__snapshots__/entity_draggable.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/anomaly/anomaly_table_provider.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/anomaly/get_interval_from_anomalies.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/anomaly/get_interval_from_anomalies.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/anomaly/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/anomaly/use_anomalies_table_data.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/anomaly/use_anomalies_table_data.ts (95%) rename x-pack/plugins/siem/public/{ => common}/components/ml/api/anomalies_table_data.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/api/errors.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/api/get_ml_capabilities.ts (92%) rename x-pack/plugins/siem/public/{ => common}/components/ml/api/throw_if_not_ok.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/api/throw_if_not_ok.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/api/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/add_entities_to_kql.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/add_entities_to_kql.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/entity_helpers.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/entity_helpers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/ml_host_conditional_container.tsx (94%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/ml_network_conditional_container.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/remove_kql_variables.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/remove_kql_variables.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/replace_kql_commas_with_or.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/replace_kql_commas_with_or.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/replace_kql_parts.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/replace_kql_parts.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/rison_helpers.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/conditional_links/rison_helpers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/criteria/get_criteria_from_host_type.test.ts (94%) rename x-pack/plugins/siem/public/{ => common}/components/ml/criteria/get_criteria_from_host_type.ts (90%) rename x-pack/plugins/siem/public/{ => common}/components/ml/criteria/get_criteria_from_network_type.test.ts (92%) rename x-pack/plugins/siem/public/{ => common}/components/ml/criteria/get_criteria_from_network_type.ts (86%) rename x-pack/plugins/siem/public/{ => common}/components/ml/criteria/host_to_criteria.test.ts (95%) rename x-pack/plugins/siem/public/{ => common}/components/ml/criteria/host_to_criteria.ts (91%) rename x-pack/plugins/siem/public/{ => common}/components/ml/criteria/network_to_criteria.test.ts (95%) rename x-pack/plugins/siem/public/{ => common}/components/ml/criteria/network_to_criteria.ts (91%) rename x-pack/plugins/siem/public/{ => common}/components/ml/entity_draggable.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/entity_draggable.tsx (88%) rename x-pack/plugins/siem/public/{ => common}/components/ml/get_entries.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/get_entries.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/__snapshots__/create_influencers.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/create_influencers.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/create_influencers.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/get_host_name_from_influencers.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/get_host_name_from_influencers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/get_network_from_influencers.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/get_network_from_influencers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/host_to_influencers.test.ts (95%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/host_to_influencers.ts (92%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/network_to_influencers.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/influencers/network_to_influencers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/links/create_explorer_link.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/links/create_explorer_link.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/links/create_series_link.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/links/create_series_link.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/mock.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/permissions/ml_capabilities_provider.tsx (92%) rename x-pack/plugins/siem/public/{ => common}/components/ml/permissions/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/__snapshots__/anomaly_scores.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/__snapshots__/create_descriptions_list.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/__snapshots__/draggable_score.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/anomaly_score.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/anomaly_score.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/anomaly_scores.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/anomaly_scores.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/create_description_list.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/create_descriptions_list.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/create_entities_from_score.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/create_entities_from_score.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/draggable_score.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/draggable_score.tsx (89%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/get_score_string.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/get_top_severity.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/get_top_severity.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/score_health.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/score_interval_to_datetime.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/score_interval_to_datetime.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/score/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/anomalies_host_table.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/anomalies_network_table.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/basic_table.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/convert_anomalies_to_hosts.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/convert_anomalies_to_hosts.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/convert_anomalies_to_network.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/convert_anomalies_to_network.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/create_compound_key.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/create_compound_key.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/get_anomalies_host_table_columns.test.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/get_anomalies_host_table_columns.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/get_anomalies_network_table_columns.test.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/get_anomalies_network_table_columns.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/host_equality.test.ts (98%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/host_equality.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/network_equality.test.ts (97%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/network_equality.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/tables/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/types.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml/types.ts (91%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/__mocks__/api.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/__snapshots__/popover_description.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/__snapshots__/upgrade_contents.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/api.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/helpers.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/hooks/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/hooks/use_ml_capabilities.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/hooks/use_siem_jobs.tsx (94%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/hooks/use_siem_jobs_helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/hooks/use_siem_jobs_helpers.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/__snapshots__/job_switch.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/__snapshots__/jobs_table.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/__snapshots__/showing_count.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/filters/__snapshots__/groups_filter_popover.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/filters/__snapshots__/jobs_table_filters.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/filters/groups_filter_popover.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/filters/toggle_selected_group.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/filters/toggle_selected_group.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/filters/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/job_switch.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/job_switch.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/jobs_table.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/jobs_table.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/showing_count.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/showing_count.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/jobs_table/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/ml_modules.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/ml_popover.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/ml_popover.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/popover_description.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/popover_description.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/types.ts (98%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/upgrade_contents.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/ml_popover/upgrade_contents.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/breadcrumbs/index.test.ts (98%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/breadcrumbs/index.ts (91%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/helpers.ts (93%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/index.test.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/tab_navigation/index.test.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/tab_navigation/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/tab_navigation/types.ts (80%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/types.ts (83%) rename x-pack/plugins/siem/public/{ => common}/components/navigation/use_get_url_search.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/news_feed/helpers.test.ts (99%) rename x-pack/plugins/siem/public/{ => common}/components/news_feed/helpers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/news_feed/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/news_feed/news_feed.tsx (86%) rename x-pack/plugins/siem/public/{ => common}/components/news_feed/news_link/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/news_feed/no_news/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/news_feed/post/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/news_feed/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/news_feed/types.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/page/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/page/manage_query.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/components/page/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/page_route/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/page_route/pageroute.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/page_route/pageroute.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/paginated_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/paginated_table/helpers.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/paginated_table/helpers.ts (89%) rename x-pack/plugins/siem/public/{ => common}/components/paginated_table/index.mock.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/paginated_table/index.test.tsx (99%) rename x-pack/plugins/siem/public/{ => common}/components/paginated_table/index.tsx (91%) rename x-pack/plugins/siem/public/{ => common}/components/paginated_table/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/panel/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/panel/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/progress_inline/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/progress_inline/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/progress_inline/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/query_bar/index.test.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/query_bar/index.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/scroll_to_top/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/scroll_to_top/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/search_bar/index.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/components/search_bar/selectors.ts (91%) rename x-pack/plugins/siem/public/{ => common}/components/selectable_text/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/selectable_text/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/selectable_text/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/sidebar_header/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/stat_items/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/stat_items/index.test.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/components/stat_items/index.tsx (99%) rename x-pack/plugins/siem/public/{ => common}/components/subtitle/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/subtitle/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/subtitle/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/super_date_picker/index.test.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/super_date_picker/index.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/super_date_picker/selectors.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/super_date_picker/selectors.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/tables/__snapshots__/helpers.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/tables/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/tables/helpers.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/toasters/errors.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/toasters/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/toasters/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/toasters/modal_all_errors.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/toasters/modal_all_errors.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/toasters/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/toasters/utils.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/toasters/utils.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/top_n/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/top_n/helpers.ts (96%) rename x-pack/plugins/siem/public/{ => common}/components/top_n/index.test.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/components/top_n/index.tsx (91%) rename x-pack/plugins/siem/public/{ => common}/components/top_n/top_n.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/top_n/top_n.tsx (93%) rename x-pack/plugins/siem/public/{ => common}/components/top_n/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/truncatable_text/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/truncatable_text/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/truncatable_text/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/constants.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/helpers.test.ts (91%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/helpers.ts (95%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/index.test.tsx (99%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/index.tsx (92%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/index_mocked.test.tsx (99%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/initialize_redux_by_url.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/normalize_time_range.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/normalize_time_range.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/test_dependencies.ts (95%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/types.ts (96%) rename x-pack/plugins/siem/public/{ => common}/components/url_state/use_url_state.tsx (99%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/__snapshots__/utility_bar.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/__snapshots__/utility_bar_action.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/__snapshots__/utility_bar_group.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/__snapshots__/utility_bar_section.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/__snapshots__/utility_bar_text.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/styles.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar_action.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar_action.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar_group.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar_group.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar_section.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar_section.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar_text.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utility_bar/utility_bar_text.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/utils.ts (100%) rename x-pack/plugins/siem/public/{ => common}/components/with_hover_actions/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/wrapper_page/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => common}/components/wrapper_page/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/components/wrapper_page/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts (94%) rename x-pack/plugins/siem/public/{ => common}/containers/anomalies/anomalies_query_tab_body/index.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/containers/anomalies/anomalies_query_tab_body/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/containers/anomalies/anomalies_query_tab_body/types.ts (78%) rename x-pack/plugins/siem/public/{ => common}/containers/anomalies/anomalies_query_tab_body/utils.ts (93%) rename x-pack/plugins/siem/public/{ => common}/containers/errors/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/containers/errors/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/containers/errors/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/containers/events/last_event_time/index.ts (93%) rename x-pack/plugins/siem/public/{ => common}/containers/events/last_event_time/last_event_time.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => common}/containers/events/last_event_time/mock.ts (93%) rename x-pack/plugins/siem/public/{ => common}/containers/global_time/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/containers/helpers.test.ts (94%) rename x-pack/plugins/siem/public/{ => common}/containers/helpers.ts (91%) rename x-pack/plugins/siem/public/{ => common}/containers/kuery_autocompletion/index.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/containers/matrix_histogram/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => common}/containers/matrix_histogram/index.test.tsx (99%) rename x-pack/plugins/siem/public/{ => common}/containers/matrix_histogram/index.ts (97%) rename x-pack/plugins/siem/public/{ => common}/containers/query_template.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/containers/query_template_paginated.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/containers/source/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => common}/containers/source/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/containers/source/index.tsx (97%) rename x-pack/plugins/siem/public/{ => common}/containers/source/mock.ts (99%) rename x-pack/plugins/siem/public/{ => common}/hooks/api/__mock__/api.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/hooks/api/api.tsx (94%) rename x-pack/plugins/siem/public/{ => common}/hooks/api/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/hooks/api/helpers.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/hooks/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/hooks/types.ts (80%) rename x-pack/plugins/siem/public/{ => common}/hooks/use_add_to_timeline.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/hooks/use_index_patterns.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/hooks/use_providers_portal.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/lib/clipboard/clipboard.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/lib/clipboard/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/clipboard/with_copy_to_clipboard.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/lib/compose/helpers.test.ts (94%) rename x-pack/plugins/siem/public/{ => common}/lib/compose/helpers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/compose/kibana_compose.tsx (83%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/components/connector_flyout/index.tsx (94%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/config.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/jira/config.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/jira/flyout.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/jira/index.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/jira/logo.svg (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/jira/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/jira/types.ts (78%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/servicenow/config.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/servicenow/flyout.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/servicenow/index.tsx (95%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/servicenow/logo.svg (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/servicenow/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/servicenow/types.ts (78%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/types.ts (82%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/utils.ts (93%) rename x-pack/plugins/siem/public/{ => common}/lib/connectors/validators.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/helpers/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/lib/helpers/index.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/lib/helpers/scheduler.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/history/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/keury/index.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/keury/index.ts (95%) rename x-pack/plugins/siem/public/{ => common}/lib/kibana/__mocks__/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/kibana/hooks.ts (95%) rename x-pack/plugins/siem/public/{ => common}/lib/kibana/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/kibana/kibana_react.ts (86%) rename x-pack/plugins/siem/public/{ => common}/lib/kibana/services.ts (89%) rename x-pack/plugins/siem/public/{ => common}/lib/lib.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/note/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/lib/telemetry/index.ts (96%) rename x-pack/plugins/siem/public/{ => common}/lib/telemetry/middleware.ts (91%) rename x-pack/plugins/siem/public/{ => common}/lib/theme/use_eui_theme.tsx (89%) rename x-pack/plugins/siem/public/{ => common}/mock/global_state.ts (95%) rename x-pack/plugins/siem/public/{ => common}/mock/header.ts (94%) rename x-pack/plugins/siem/public/{ => common}/mock/hook_wrapper.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/mock/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/mock/index_pattern.ts (100%) rename x-pack/plugins/siem/public/{ => common}/mock/kibana_core.ts (66%) rename x-pack/plugins/siem/public/{ => common}/mock/kibana_react.ts (95%) rename x-pack/plugins/siem/public/{ => common}/mock/match_media.ts (100%) rename x-pack/plugins/siem/public/{ => common}/mock/mock_detail_item.ts (98%) rename x-pack/plugins/siem/public/{ => common}/mock/mock_ecs.ts (99%) rename x-pack/plugins/siem/public/{ => common}/mock/mock_endgame_ecs_data.ts (99%) rename x-pack/plugins/siem/public/{ => common}/mock/mock_timeline_data.ts (99%) rename x-pack/plugins/siem/public/{ => common}/mock/netflow.ts (92%) rename x-pack/plugins/siem/public/{ => common}/mock/news.ts (100%) rename x-pack/plugins/siem/public/{ => common}/mock/raw_news.ts (100%) rename x-pack/plugins/siem/public/{ => common}/mock/test_providers.tsx (92%) rename x-pack/plugins/siem/public/{ => common}/mock/timeline_results.ts (99%) rename x-pack/plugins/siem/public/{ => common}/mock/utils.ts (57%) rename x-pack/plugins/siem/public/{ => common}/store/actions.ts (74%) rename x-pack/plugins/siem/public/{ => common}/store/app/actions.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/app/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/app/model.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/app/reducer.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/app/selectors.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/constants.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/drag_and_drop/actions.ts (86%) rename x-pack/plugins/siem/public/{ => common}/store/drag_and_drop/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/drag_and_drop/model.ts (79%) rename x-pack/plugins/siem/public/{ => common}/store/drag_and_drop/reducer.test.ts (85%) rename x-pack/plugins/siem/public/{ => common}/store/drag_and_drop/reducer.ts (93%) rename x-pack/plugins/siem/public/{ => common}/store/drag_and_drop/selectors.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/epic.ts (59%) rename x-pack/plugins/siem/public/{ => common}/store/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/inputs/actions.ts (96%) rename x-pack/plugins/siem/public/{ => common}/store/inputs/constants.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/inputs/helpers.test.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/inputs/helpers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/inputs/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/inputs/model.ts (96%) rename x-pack/plugins/siem/public/{ => common}/store/inputs/reducer.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/inputs/selectors.ts (100%) rename x-pack/plugins/siem/public/{ => common}/store/model.ts (83%) create mode 100644 x-pack/plugins/siem/public/common/store/reducer.ts rename x-pack/plugins/siem/public/{ => common}/store/selectors.ts (73%) rename x-pack/plugins/siem/public/{ => common}/store/store.ts (87%) rename x-pack/plugins/siem/public/{ => common}/store/types.ts (100%) rename x-pack/plugins/siem/public/{pages => }/common/translations.ts (100%) rename x-pack/plugins/siem/public/{ => common}/utils/api/index.ts (100%) rename x-pack/plugins/siem/public/{ => common}/utils/apollo_context.ts (100%) rename x-pack/plugins/siem/public/{ => common}/utils/default_date_settings.test.ts (99%) rename x-pack/plugins/siem/public/{ => common}/utils/default_date_settings.ts (98%) rename x-pack/plugins/siem/public/{ => common}/utils/kql/use_update_kql.test.tsx (92%) rename x-pack/plugins/siem/public/{ => common}/utils/kql/use_update_kql.tsx (96%) rename x-pack/plugins/siem/public/{ => common}/utils/logo_endpoint/64_color.svg (100%) rename x-pack/plugins/siem/public/{ => common}/utils/route/helpers.ts (100%) rename x-pack/plugins/siem/public/{ => common}/utils/route/index.test.tsx (98%) rename x-pack/plugins/siem/public/{ => common}/utils/route/manage_spy_routes.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/utils/route/spy_routes.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/utils/route/types.ts (86%) rename x-pack/plugins/siem/public/{ => common}/utils/route/use_route_spy.tsx (100%) rename x-pack/plugins/siem/public/{ => common}/utils/saved_query_services/index.tsx (93%) rename x-pack/plugins/siem/public/{ => common}/utils/timeline/use_show_timeline.tsx (94%) rename x-pack/plugins/siem/public/{ => common}/utils/use_mount_appended.ts (100%) rename x-pack/plugins/siem/public/{ => common}/utils/validators/index.ts (100%) delete mode 100644 x-pack/plugins/siem/public/components/page/network/index.tsx rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/authentications_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/authentications_table/index.test.tsx (89%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/authentications_table/index.tsx (90%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/authentications_table/mock.ts (96%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/authentications_table/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/first_last_seen_host/index.test.tsx (96%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/first_last_seen_host/index.tsx (89%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/hosts_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/hosts_table/columns.tsx (79%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/hosts_table/index.test.tsx (87%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/hosts_table/index.tsx (94%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/hosts_table/mock.ts (96%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/hosts_table/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/kpi_hosts/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/kpi_hosts/index.test.tsx (97%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/kpi_hosts/index.tsx (87%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/kpi_hosts/kpi_host_details_mapping.ts (96%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/kpi_hosts/kpi_hosts_mapping.ts (96%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/kpi_hosts/mock.tsx (100%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/kpi_hosts/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/kpi_hosts/types.ts (100%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/uncommon_process_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/uncommon_process_table/index.test.tsx (97%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/uncommon_process_table/index.tsx (92%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/uncommon_process_table/mock.ts (97%) rename x-pack/plugins/siem/public/{components/page/hosts => hosts/components}/uncommon_process_table/translations.ts (100%) rename x-pack/plugins/siem/public/{ => hosts}/containers/authentications/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => hosts}/containers/authentications/index.tsx (87%) rename x-pack/plugins/siem/public/{ => hosts}/containers/hosts/first_last_seen/first_last_seen.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => hosts}/containers/hosts/first_last_seen/index.ts (87%) rename x-pack/plugins/siem/public/{ => hosts}/containers/hosts/first_last_seen/mock.ts (89%) rename x-pack/plugins/siem/public/{ => hosts}/containers/hosts/hosts_table.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => hosts}/containers/hosts/index.tsx (88%) rename x-pack/plugins/siem/public/{ => hosts}/containers/hosts/overview/host_overview.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => hosts}/containers/hosts/overview/index.tsx (85%) rename x-pack/plugins/siem/public/{ => hosts}/containers/kpi_host_details/index.gql_query.tsx (100%) rename x-pack/plugins/siem/public/{ => hosts}/containers/kpi_host_details/index.tsx (86%) rename x-pack/plugins/siem/public/{ => hosts}/containers/kpi_hosts/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => hosts}/containers/kpi_hosts/index.tsx (83%) rename x-pack/plugins/siem/public/{ => hosts}/containers/uncommon_processes/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => hosts}/containers/uncommon_processes/index.tsx (87%) create mode 100644 x-pack/plugins/siem/public/hosts/index.ts rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/details/details_tabs.test.tsx (92%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/details/details_tabs.tsx (85%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/details/helpers.test.ts (100%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/details/helpers.ts (95%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/details/index.tsx (81%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/details/nav_tabs.test.tsx (94%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/details/nav_tabs.tsx (93%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/details/types.ts (85%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/details/utils.ts (83%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/hosts.test.tsx (88%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/hosts.tsx (81%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/hosts_empty_page.tsx (85%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/hosts_tabs.tsx (84%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/index.tsx (94%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/nav_tabs.test.tsx (95%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/nav_tabs.tsx (95%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/navigation/alerts_query_tab_body.tsx (95%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/navigation/authentications_query_tab_body.tsx (86%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/navigation/events_query_tab_body.tsx (85%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/navigation/hosts_query_tab_body.tsx (88%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/navigation/index.ts (100%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/navigation/types.ts (81%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/navigation/uncommon_process_query_tab_body.tsx (86%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/hosts => hosts/pages}/types.ts (79%) create mode 100644 x-pack/plugins/siem/public/hosts/routes.tsx rename x-pack/plugins/siem/public/{store/hosts => hosts/store}/actions.ts (100%) rename x-pack/plugins/siem/public/{store/hosts => hosts/store}/helpers.test.ts (97%) rename x-pack/plugins/siem/public/{store/hosts => hosts/store}/helpers.ts (96%) rename x-pack/plugins/siem/public/{store/hosts => hosts/store}/index.ts (68%) rename x-pack/plugins/siem/public/{store/hosts => hosts/store}/model.ts (100%) rename x-pack/plugins/siem/public/{store/hosts => hosts/store}/reducer.ts (99%) rename x-pack/plugins/siem/public/{store/hosts => hosts/store}/selectors.ts (95%) rename x-pack/plugins/siem/public/{ => network}/components/arrows/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/arrows/helpers.test.ts (100%) rename x-pack/plugins/siem/public/{ => network}/components/arrows/helpers.ts (100%) rename x-pack/plugins/siem/public/{ => network}/components/arrows/index.test.tsx (95%) rename x-pack/plugins/siem/public/{ => network}/components/arrows/index.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/direction/direction.test.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/direction/index.tsx (93%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/__mocks__/mock.ts (99%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/__snapshots__/embeddable.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/__snapshots__/embeddable_header.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/__snapshots__/embedded_map.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/embeddable.test.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/embeddable.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/embeddable_header.test.tsx (96%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/embeddable_header.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/embedded_map.test.tsx (85%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/embedded_map.tsx (89%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/embedded_map_helpers.test.tsx (97%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/embedded_map_helpers.tsx (92%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/index_patterns_missing_prompt.test.tsx (93%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/index_patterns_missing_prompt.tsx (97%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_config.test.ts (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_config.ts (99%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/__snapshots__/line_tool_tip_content.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/__snapshots__/map_tool_tip.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/__snapshots__/point_tool_tip_content.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/__snapshots__/tooltip_footer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/line_tool_tip_content.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/map_tool_tip.test.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/map_tool_tip.tsx (98%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx (89%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/point_tool_tip_content.tsx (81%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/tooltip_footer.test.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/map_tool_tip/tooltip_footer.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/translations.ts (100%) rename x-pack/plugins/siem/public/{ => network}/components/embeddables/types.ts (88%) rename x-pack/plugins/siem/public/{ => network}/components/flow_controls/__snapshots__/flow_direction_select.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/flow_controls/__snapshots__/flow_target_select.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/flow_controls/flow_direction_select.test.tsx (96%) rename x-pack/plugins/siem/public/{ => network}/components/flow_controls/flow_direction_select.tsx (95%) rename x-pack/plugins/siem/public/{ => network}/components/flow_controls/flow_target_select.test.tsx (97%) rename x-pack/plugins/siem/public/{ => network}/components/flow_controls/flow_target_select.tsx (96%) rename x-pack/plugins/siem/public/{ => network}/components/flow_controls/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/flow_target_select_connected/index.test.tsx (92%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/flow_target_select_connected/index.tsx (88%) rename x-pack/plugins/siem/public/{ => network}/components/ip/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/ip/index.test.tsx (90%) rename x-pack/plugins/siem/public/{ => network}/components/ip/index.tsx (89%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/ip_overview/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/ip_overview/index.test.tsx (71%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/ip_overview/index.tsx (80%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/ip_overview/mock.ts (96%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/ip_overview/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/kpi_network/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/kpi_network/index.test.tsx (84%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/kpi_network/index.tsx (96%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/kpi_network/mock.ts (97%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/kpi_network/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_dns_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_dns_table/__snapshots__/is_ptr_included.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_dns_table/columns.tsx (81%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_dns_table/index.test.tsx (86%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_dns_table/index.tsx (95%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_dns_table/is_ptr_included.test.tsx (95%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_dns_table/is_ptr_included.tsx (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_dns_table/mock.ts (98%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_dns_table/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_http_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_http_table/columns.tsx (88%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_http_table/index.test.tsx (86%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_http_table/index.tsx (95%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_http_table/mock.ts (97%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_http_table/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_countries_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_countries_table/columns.tsx (85%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_countries_table/index.test.tsx (91%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_countries_table/index.tsx (96%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_countries_table/mock.ts (94%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_countries_table/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_n_flow_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_n_flow_table/columns.tsx (87%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_n_flow_table/index.test.tsx (89%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_n_flow_table/index.tsx (96%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_n_flow_table/mock.ts (99%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/network_top_n_flow_table/translations.ts (100%) rename x-pack/plugins/siem/public/{ => network}/components/port/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/port/index.test.tsx (92%) rename x-pack/plugins/siem/public/{ => network}/components/port/index.tsx (80%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/country_flag.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/field_names.ts (100%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/geo_fields.tsx (98%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/index.test.tsx (96%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/index.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/ip_with_port.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/label.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/network.tsx (96%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/source_destination_arrows.tsx (98%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/source_destination_ip.test.tsx (99%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/source_destination_ip.tsx (98%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/source_destination_with_arrows.tsx (100%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/translations.ts (100%) rename x-pack/plugins/siem/public/{ => network}/components/source_destination/types.ts (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/tls_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/tls_table/columns.tsx (85%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/tls_table/index.test.tsx (85%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/tls_table/index.tsx (93%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/tls_table/mock.ts (96%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/tls_table/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/users_table/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/users_table/columns.tsx (86%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/users_table/index.test.tsx (85%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/users_table/index.tsx (92%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/users_table/mock.ts (95%) rename x-pack/plugins/siem/public/{components/page/network => network/components}/users_table/translations.ts (100%) rename x-pack/plugins/siem/public/{ => network}/containers/ip_overview/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => network}/containers/ip_overview/index.tsx (82%) rename x-pack/plugins/siem/public/{ => network}/containers/kpi_network/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => network}/containers/kpi_network/index.tsx (83%) rename x-pack/plugins/siem/public/{ => network}/containers/network_dns/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => network}/containers/network_dns/index.tsx (85%) rename x-pack/plugins/siem/public/{ => network}/containers/network_http/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => network}/containers/network_http/index.tsx (87%) rename x-pack/plugins/siem/public/{ => network}/containers/network_top_countries/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => network}/containers/network_top_countries/index.tsx (88%) rename x-pack/plugins/siem/public/{ => network}/containers/network_top_n_flow/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => network}/containers/network_top_n_flow/index.tsx (88%) rename x-pack/plugins/siem/public/{ => network}/containers/tls/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => network}/containers/tls/index.tsx (87%) rename x-pack/plugins/siem/public/{ => network}/containers/users/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{ => network}/containers/users/index.tsx (87%) create mode 100644 x-pack/plugins/siem/public/network/index.ts rename x-pack/plugins/siem/public/{pages/network => network/pages}/index.tsx (93%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/index.test.tsx (84%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/index.tsx (84%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/network_http_query_table.tsx (86%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/network_top_countries_query_table.tsx (86%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/network_top_n_flow_query_table.tsx (86%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/tls_query_table.tsx (87%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/types.ts (86%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/users_query_table.tsx (87%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/ip_details/utils.ts (82%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/alerts_query_tab_body.tsx (96%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/conditional_flex_group.tsx (100%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/countries_query_tab_body.tsx (85%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/dns_query_tab_body.tsx (88%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/http_query_tab_body.tsx (84%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/index.ts (100%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/ips_query_tab_body.tsx (84%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/nav_tabs.tsx (100%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/network_routes.tsx (90%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/network_routes_loading.tsx (100%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/tls_query_tab_body.tsx (87%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/types.ts (89%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/navigation/utils.ts (100%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/network.test.tsx (89%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/network.tsx (83%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/network_empty_page.tsx (85%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/translations.ts (100%) rename x-pack/plugins/siem/public/{pages/network => network/pages}/types.ts (82%) create mode 100644 x-pack/plugins/siem/public/network/routes.tsx rename x-pack/plugins/siem/public/{store/network => network/store}/actions.ts (95%) rename x-pack/plugins/siem/public/{store/network => network/store}/helpers.test.ts (99%) rename x-pack/plugins/siem/public/{store/network => network/store}/helpers.ts (97%) rename x-pack/plugins/siem/public/{store/network => network/store}/index.ts (64%) rename x-pack/plugins/siem/public/{store/network => network/store}/model.ts (100%) rename x-pack/plugins/siem/public/{store/network => network/store}/reducer.ts (99%) rename x-pack/plugins/siem/public/{store/network => network/store}/selectors.ts (98%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/alerts_by_category/index.test.tsx (92%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/alerts_by_category/index.tsx (76%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/event_counts/index.test.tsx (87%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/event_counts/index.tsx (81%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/events_by_dataset/__mocks__/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/events_by_dataset/index.tsx (82%) rename x-pack/plugins/siem/public/{components/page/hosts => overview/components}/host_overview/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/hosts => overview/components}/host_overview/index.test.tsx (89%) rename x-pack/plugins/siem/public/{components/page/hosts => overview/components}/host_overview/index.tsx (81%) rename x-pack/plugins/siem/public/{components/page/hosts => overview/components}/host_overview/mock.ts (96%) rename x-pack/plugins/siem/public/{components/page/hosts => overview/components}/host_overview/translations.ts (100%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/loading_placeholders/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/overview_empty/index.tsx (85%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_host/index.test.tsx (85%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_host/index.tsx (82%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_host_stats/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_host_stats/index.test.tsx (96%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_host_stats/index.tsx (99%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_host_stats/mock.ts (92%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_network/index.test.tsx (84%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_network/index.tsx (84%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_network_stats/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_network_stats/index.test.tsx (96%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_network_stats/index.tsx (98%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/overview_network_stats/mock.ts (89%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_cases/filters/index.tsx (100%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_cases/index.tsx (82%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_cases/no_cases/index.tsx (76%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_cases/recent_cases.tsx (82%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_cases/translations.ts (100%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_cases/types.ts (100%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_timelines/counts/index.tsx (88%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_timelines/filters/index.tsx (100%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_timelines/header/index.tsx (82%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_timelines/index.tsx (81%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_timelines/recent_timelines.tsx (93%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_timelines/translations.ts (100%) rename x-pack/plugins/siem/public/{ => overview}/components/recent_timelines/types.ts (100%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/sidebar/index.tsx (82%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/sidebar/sidebar.tsx (78%) rename x-pack/plugins/siem/public/{pages/overview => overview/components}/signals_by_category/index.tsx (80%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/stat_value.tsx (94%) rename x-pack/plugins/siem/public/{components/page/overview => overview/components}/types.ts (100%) rename x-pack/plugins/siem/public/{containers/overview => overview/containers}/overview_host/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/overview => overview/containers}/overview_host/index.tsx (87%) rename x-pack/plugins/siem/public/{containers/overview => overview/containers}/overview_network/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/overview => overview/containers}/overview_network/index.tsx (88%) create mode 100644 x-pack/plugins/siem/public/overview/index.ts rename x-pack/plugins/siem/public/{pages/overview => overview/pages}/index.tsx (100%) rename x-pack/plugins/siem/public/{pages/overview => overview/pages}/overview.test.tsx (88%) rename x-pack/plugins/siem/public/{pages/overview => overview/pages}/overview.tsx (82%) rename x-pack/plugins/siem/public/{pages/overview => overview/pages}/summary.tsx (98%) rename x-pack/plugins/siem/public/{pages/overview => overview/pages}/translations.ts (100%) create mode 100644 x-pack/plugins/siem/public/overview/routes.tsx delete mode 100644 x-pack/plugins/siem/public/pages/home/types.ts delete mode 100644 x-pack/plugins/siem/public/store/reducer.ts rename x-pack/plugins/siem/public/{ => timelines}/components/certificate_fingerprint/index.test.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/certificate_fingerprint/index.tsx (89%) rename x-pack/plugins/siem/public/{ => timelines}/components/certificate_fingerprint/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/duration/index.test.tsx (87%) rename x-pack/plugins/siem/public/{ => timelines}/components/duration/index.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/edit_data_provider/helpers.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/edit_data_provider/helpers.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/edit_data_provider/index.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/edit_data_provider/index.tsx (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/edit_data_provider/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/field_renderers/field_renderers.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/field_renderers/field_renderers.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/categories_pane.test.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/categories_pane.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/category.test.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/category.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/category_columns.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/category_columns.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/category_title.test.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/category_title.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/field_browser.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/field_browser.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/field_items.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/field_items.tsx (85%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/field_name.test.tsx (91%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/field_name.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/fields_pane.test.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/fields_pane.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/header.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/header.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/helpers.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/helpers.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/index.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/index.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/fields_browser/types.ts (90%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/button/index.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/button/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/header/index.tsx (87%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/header_with_close_button/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/header_with_close_button/index.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/header_with_close_button/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/header_with_close_button/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/index.test.tsx (90%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/index.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/pane/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/pane/index.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/pane/index.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/pane/timeline_resize_handle.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/flyout/pane/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/formatted_duration/helpers.test.ts (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/formatted_duration/helpers.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/formatted_duration/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/formatted_duration/tooltip/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/formatted_duration/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/formatted_ip/index.tsx (86%) rename x-pack/plugins/siem/public/{ => timelines}/components/ja3_fingerprint/index.test.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/ja3_fingerprint/index.tsx (86%) rename x-pack/plugins/siem/public/{ => timelines}/components/ja3_fingerprint/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/lazy_accordion/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/loading/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/netflow/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/netflow/fingerprints/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/netflow/index.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/netflow/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/netflow/netflow_columns/duration_event_start_end.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/netflow/netflow_columns/index.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/netflow/netflow_columns/types.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/netflow/netflow_columns/user_process.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/netflow/types.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/add_note/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/add_note/__snapshots__/new_note.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/add_note/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/add_note/index.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/add_note/new_note.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/add_note/new_note.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/columns.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/helpers.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/index.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_card/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_card/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_card/note_card_body.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_card/note_card_body.tsx (82%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_card/note_card_header.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_card/note_card_header.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_card/note_created.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_card/note_created.tsx (89%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_cards/index.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/note_cards/index.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/notes/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/constants.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/delete_timeline_modal/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/delete_timeline_modal/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/edit_timeline_actions.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/edit_timeline_batch_actions.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/export_timeline/export_timeline.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/export_timeline/export_timeline.tsx (90%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/export_timeline/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/export_timeline/index.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/export_timeline/mocks.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/helpers.test.ts (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/helpers.ts (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/index.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/index.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/note_previews/index.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/note_previews/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/note_previews/note_preview.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/note_previews/note_preview.tsx (90%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/open_timeline.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/open_timeline.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/open_timeline_modal/index.test.tsx (83%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/open_timeline_modal/index.tsx (91%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx (89%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/open_timeline_modal/open_timeline_modal_button.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/search_row/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/search_row/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/actions_columns.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/actions_columns.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/common_columns.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/common_columns.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/common_styles.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/extended_columns.test.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/extended_columns.tsx (91%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/icon_header_columns.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/icon_header_columns.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/index.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/timelines_table/mocks.ts (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/title_row/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/title_row/index.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/types.ts (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/open_timeline/use_timeline_types.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/__snapshots__/timeline.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline}/and_or_badge/__examples__/index.stories.tsx (100%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline}/and_or_badge/index.tsx (100%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline}/and_or_badge/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/auto_save_warning/index.tsx (91%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/auto_save_warning/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/actions/index.test.tsx (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/actions/index.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/actions/index.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/column_header.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/common/dragging_container.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/common/styles.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/default_headers.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/events_select/helpers.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/events_select/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/events_select/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/filter/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/filter/index.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/filter/index.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/header/header_content.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/header/helpers.ts (86%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/header/index.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/header/index.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/header_tooltip_content/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/header_tooltip_content/index.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/helpers.test.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/helpers.ts (90%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/index.test.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/index.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/range_picker/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/range_picker/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/range_picker/ranges.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/range_picker/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/text_filter/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/text_filter/index.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/text_filter/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_headers/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/column_id.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/constants.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/data_driven_columns/index.test.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/data_driven_columns/index.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/events/event_column_view.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/events/index.tsx (89%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/events/stateful_event.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/helpers.test.ts (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/helpers.ts (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/index.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/index.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/mini_map/date_ranges.test.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/mini_map/date_ranges.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/args.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/empty_column_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/get_row_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/host_working_dir.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/plain_row_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/process_draggable.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/unknown_column_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/__snapshots__/user_host_working_dir.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/args.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/args.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/__snapshots__/generic_details.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/__snapshots__/generic_file_details.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/__snapshots__/primary_secondary_user_info.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/__snapshots__/session_user_host_working_dir.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/generic_details.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/generic_details.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/generic_file_details.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/generic_file_details.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/generic_row_renderer.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/auditd/translations.ts (100%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline/body/renderers}/bytes/index.test.tsx (74%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline/body/renderers}/bytes/index.tsx (83%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/column_renderer.ts (82%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/constants.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx (82%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/dns/dns_request_event_details.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/dns/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/empty_column_renderer.test.tsx (91%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/empty_column_renderer.tsx (81%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/endgame/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/endgame/helpers.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/endgame/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/exit_code_draggable.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/exit_code_draggable.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/file_draggable.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/file_draggable.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/formatted_field.test.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/formatted_field.tsx (88%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/formatted_field_helpers.tsx (89%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/get_column_renderer.test.tsx (89%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/get_column_renderer.ts (91%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/get_row_renderer.test.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/get_row_renderer.ts (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/helpers.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/helpers.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/host_working_dir.test.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/host_working_dir.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/index.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/netflow.tsx (86%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/netflow/__snapshots__/netflow_row_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx (91%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx (90%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/parent_process_draggable.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/parent_process_draggable.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/parse_query_value.test.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/parse_query_value.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/parse_value.test.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/parse_value.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/plain_column_renderer.test.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/plain_column_renderer.tsx (88%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/plain_row_renderer.test.tsx (88%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/plain_row_renderer.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/process_draggable.test.tsx (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/process_draggable.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/process_hash.test.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/process_hash.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/row_renderer.tsx (87%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/__snapshots__/suricata_details.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/__snapshots__/suricata_signature.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/suricata_details.test.tsx (83%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/suricata_details.tsx (91%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/suricata_links.test.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/suricata_links.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/suricata_refs.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx (85%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/suricata_signature.test.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/suricata/suricata_signature.tsx (87%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/__snapshots__/auth_ssh.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/__snapshots__/generic_details.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/__snapshots__/generic_file_details.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/__snapshots__/package.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/auth_ssh.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/auth_ssh.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/generic_details.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/generic_details.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/generic_file_details.test.tsx (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/generic_file_details.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/generic_row_renderer.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/generic_row_renderer.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/package.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/package.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/system/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/unknown_column_renderer.test.tsx (91%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/unknown_column_renderer.tsx (83%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/user_host_working_dir.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/user_host_working_dir.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/__snapshots__/zeek_signature.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/zeek_details.test.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/zeek_details.tsx (88%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx (87%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/zeek_signature.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/renderers/zeek/zeek_signature.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/sort/__snapshots__/sort_indicator.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/sort/index.ts (89%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/sort/sort_indicator.test.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/sort/sort_indicator.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/stateful_body.test.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/stateful_body.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/body/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/__snapshots__/data_providers.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/__snapshots__/empty.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/__snapshots__/provider.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/__snapshots__/providers.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/data_provider.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/data_providers.test.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/empty.test.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/empty.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/helpers.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/index.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/mock/mock_data_providers.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/provider.test.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/provider.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/provider_badge.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/provider_item_actions.tsx (98%) create mode 100644 x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_and.tsx create mode 100644 x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_and_drag_drop.tsx rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/provider_item_badge.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/providers.test.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/providers.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/data_providers/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/events.ts (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/expandable_event/index.tsx (84%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/expandable_event/translations.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/fetch_kql_timeline.tsx (88%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/footer/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/footer/index.test.tsx (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/footer/index.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/footer/last_updated.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/footer/mock.ts (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/footer/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/header/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/header/index.test.tsx (87%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/header/index.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/header/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/helpers.test.tsx (99%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/helpers.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/index.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/insert_timeline_popover/index.test.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/insert_timeline_popover/index.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/insert_timeline_popover/use_insert_timeline.tsx (87%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline}/pin/index.test.tsx (100%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline}/pin/index.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/properties/helpers.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/properties/index.test.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/properties/index.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/properties/notes_size.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/properties/properties_left.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/properties/properties_right.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/properties/styles.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/properties/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/query_bar/index.test.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/query_bar/index.tsx (94%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/refetch_timeline.tsx (83%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/search_or_filter/helpers.test.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/search_or_filter/helpers.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/search_or_filter/index.tsx (92%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/search_or_filter/pick_events.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/search_or_filter/search_or_filter.tsx (93%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/search_or_filter/translations.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/search_super_select/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/selectable_timeline/index.tsx (97%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline}/skeleton_row/__snapshots__/index.test.tsx.snap (100%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline}/skeleton_row/index.test.tsx (96%) rename x-pack/plugins/siem/public/{components => timelines/components/timeline}/skeleton_row/index.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/styles.tsx (98%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/timeline.test.tsx (96%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/timeline.tsx (95%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/timeline_context.tsx (97%) rename x-pack/plugins/siem/public/{ => timelines}/components/timeline/translations.ts (100%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/all/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/all/index.tsx (93%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/api.ts (90%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/delete/persist.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/details/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/details/index.tsx (97%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/favorite/persist.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/index.tsx (92%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/notes/persist.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/one/index.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/persist.gql_query.ts (100%) rename x-pack/plugins/siem/public/{containers/timeline => timelines/containers}/pinned_event/persist.gql_query.ts (100%) create mode 100644 x-pack/plugins/siem/public/timelines/index.ts rename x-pack/plugins/siem/public/{pages/timelines => timelines/pages}/index.tsx (84%) rename x-pack/plugins/siem/public/{pages/timelines => timelines/pages}/timelines_page.test.tsx (92%) rename x-pack/plugins/siem/public/{pages/timelines => timelines/pages}/timelines_page.tsx (85%) rename x-pack/plugins/siem/public/{pages/timelines => timelines/pages}/translations.ts (100%) create mode 100644 x-pack/plugins/siem/public/timelines/routes.tsx rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/actions.ts (94%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/defaults.ts (80%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/epic.test.ts (97%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/epic.ts (96%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/epic_dispatcher_timeline_persistence_queue.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/epic_favorite.ts (95%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/epic_note.ts (93%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/epic_pinned_event.ts (95%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/helpers.ts (98%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/index.ts (61%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/manage_timeline_id.tsx (100%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/model.ts (91%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/my_epic_timeline_id.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/reducer.test.ts (99%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/reducer.ts (100%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/refetch_queries.ts (69%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/selectors.ts (95%) rename x-pack/plugins/siem/public/{ => timelines}/store/timeline/types.ts (100%) diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx b/x-pack/plugins/siem/public/alerts/components/activity_monitor/columns.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx rename to x-pack/plugins/siem/public/alerts/components/activity_monitor/columns.tsx index 78315d3ba79d4d..51a5397637e7ca 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/columns.tsx +++ b/x-pack/plugins/siem/public/alerts/components/activity_monitor/columns.tsx @@ -14,7 +14,7 @@ import { EuiTableActionsColumnType, } from '@elastic/eui'; import React from 'react'; -import { getEmptyTagValue } from '../../../../components/empty_value'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; import { ColumnTypes } from './types'; const actions: EuiTableActionsColumnType['actions'] = [ diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/activity_monitor/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/activity_monitor/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/index.tsx b/x-pack/plugins/siem/public/alerts/components/activity_monitor/index.tsx similarity index 98% rename from x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/index.tsx rename to x-pack/plugins/siem/public/alerts/components/activity_monitor/index.tsx index 31420ad07cd509..c2b6b0f025e1d6 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/activity_monitor/index.tsx @@ -6,14 +6,14 @@ import { EuiBasicTable, EuiPanel, EuiSpacer } from '@elastic/eui'; import React, { useState, useCallback } from 'react'; -import { HeaderSection } from '../../../../components/header_section'; +import { HeaderSection } from '../../../common/components/header_section'; import { UtilityBar, UtilityBarAction, UtilityBarGroup, UtilityBarSection, UtilityBarText, -} from '../../../../components/utility_bar'; +} from '../../../common/components/utility_bar'; import { columns } from './columns'; import { ColumnTypes, PageTypes, SortTypes } from './types'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/types.ts b/x-pack/plugins/siem/public/alerts/components/activity_monitor/types.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/activity_monitor/types.ts rename to x-pack/plugins/siem/public/alerts/components/activity_monitor/types.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/detection_engine_header_page/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/detection_engine_header_page/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/detection_engine_header_page/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/detection_engine_header_page/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/detection_engine_header_page/index.tsx b/x-pack/plugins/siem/public/alerts/components/detection_engine_header_page/index.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/detection_engine/components/detection_engine_header_page/index.tsx rename to x-pack/plugins/siem/public/alerts/components/detection_engine_header_page/index.tsx index c9450739190139..42a5afb600fba6 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/detection_engine_header_page/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/detection_engine_header_page/index.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { HeaderPage, HeaderPageProps } from '../../../../components/header_page'; +import { HeaderPage, HeaderPageProps } from '../../../common/components/header_page'; import * as i18n from './translations'; const DetectionEngineHeaderPageComponent: React.FC = props => ( diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/detection_engine_header_page/translations.ts b/x-pack/plugins/siem/public/alerts/components/detection_engine_header_page/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/detection_engine_header_page/translations.ts rename to x-pack/plugins/siem/public/alerts/components/detection_engine_header_page/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/no_api_integration_callout/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/no_api_integration_callout/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/index.tsx b/x-pack/plugins/siem/public/alerts/components/no_api_integration_callout/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/index.tsx rename to x-pack/plugins/siem/public/alerts/components/no_api_integration_callout/index.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/translations.ts b/x-pack/plugins/siem/public/alerts/components/no_api_integration_callout/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/no_api_integration_callout/translations.ts rename to x-pack/plugins/siem/public/alerts/components/no_api_integration_callout/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/no_write_signals_callout/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/no_write_signals_callout/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/no_write_signals_callout/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/no_write_signals_callout/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/no_write_signals_callout/index.tsx b/x-pack/plugins/siem/public/alerts/components/no_write_signals_callout/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/no_write_signals_callout/index.tsx rename to x-pack/plugins/siem/public/alerts/components/no_write_signals_callout/index.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/no_write_signals_callout/translations.ts b/x-pack/plugins/siem/public/alerts/components/no_write_signals_callout/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/no_write_signals_callout/translations.ts rename to x-pack/plugins/siem/public/alerts/components/no_write_signals_callout/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/accordion_title/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/accordion_title/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/accordion_title/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/accordion_title/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/accordion_title/index.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/add_item_form/index.test.tsx similarity index 90% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/add_item_form/index.test.tsx index eafa89a33f5964..890e66c8767c4b 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/add_item_form/index.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { AddItem } from './index'; -import { useFormFieldMock } from '../../../../../../public/mock/test_providers'; +import { useFormFieldMock } from '../../../../common/mock/test_providers'; describe('AddItem', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/add_item_form/index.tsx similarity index 98% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/add_item_form/index.tsx index abbaa6d6192eed..d6c18078f8acd4 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/add_item_form/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/add_item_form/index.tsx @@ -17,8 +17,8 @@ import { isEmpty } from 'lodash/fp'; import React, { ChangeEvent, useCallback, useEffect, useState, useRef } from 'react'; import styled from 'styled-components'; -import * as RuleI18n from '../../translations'; -import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../../shared_imports'; +import * as RuleI18n from '../../../pages/detection_engine/rules/translations'; +import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../shared_imports'; interface AddItemProps { addText: string; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/all_rules_tables/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/all_rules_tables/index.test.tsx index 8afb8db0c8d5b4..d841af69a7537d 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/all_rules_tables/index.test.tsx @@ -8,7 +8,7 @@ import React, { useRef } from 'react'; import { shallow } from 'enzyme'; import { AllRulesTables } from './index'; -import { AllRulesTabs } from '../../all'; +import { AllRulesTabs } from '../../../pages/detection_engine/rules/all'; describe('AllRulesTables', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/all_rules_tables/index.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/all_rules_tables/index.tsx index 8ea5606d0082c0..8fd3f648bc812c 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/all_rules_tables/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/all_rules_tables/index.tsx @@ -14,14 +14,14 @@ import { import React, { useMemo, memo } from 'react'; import styled from 'styled-components'; -import { EuiBasicTableOnChange } from '../../types'; -import * as i18n from '../../translations'; +import { EuiBasicTableOnChange } from '../../../pages/detection_engine/rules/types'; +import * as i18n from '../../../pages/detection_engine/rules/translations'; import { RulesColumns, RuleStatusRowItemType, -} from '../../../../../pages/detection_engine/rules/all/columns'; -import { Rule, Rules } from '../../../../../containers/detection_engine/rules'; -import { AllRulesTabs } from '../../all'; +} from '../../../pages/detection_engine/rules/all/columns'; +import { Rule, Rules } from '../../../containers/detection_engine/rules/types'; +import { AllRulesTabs } from '../../../pages/detection_engine/rules/all'; // EuiBasicTable give me a hardtime with adding the ref attributes so I went the easy way // after few hours of fight with typescript !!!! I lost :( diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/anomaly_threshold_slider/index.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/anomaly_threshold_slider/index.test.tsx index c0e957d94261fe..5e65ff2fca59b3 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/anomaly_threshold_slider/index.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { AnomalyThresholdSlider } from './index'; -import { useFormFieldMock } from '../../../../../mock'; +import { useFormFieldMock } from '../../../../common/mock'; describe('AnomalyThresholdSlider', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/anomaly_threshold_slider/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/anomaly_threshold_slider/index.tsx index 01fddf98b97d83..705626c77621c7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/anomaly_threshold_slider/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/anomaly_threshold_slider/index.tsx @@ -7,7 +7,7 @@ import React, { useCallback } from 'react'; import { EuiFlexGroup, EuiFlexItem, EuiRange, EuiFormRow } from '@elastic/eui'; -import { FieldHook } from '../../../../../shared_imports'; +import { FieldHook } from '../../../../shared_imports'; interface AnomalyThresholdSliderProps { describedByIds: string[]; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/alerts/components/rules/description_step/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/assets/list_tree_icon.svg b/x-pack/plugins/siem/public/alerts/components/rules/description_step/assets/list_tree_icon.svg similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/assets/list_tree_icon.svg rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/assets/list_tree_icon.svg diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/description_step/helpers.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/helpers.test.tsx index 186aeae42246d3..70de3d2a72dcc2 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/description_step/helpers.test.tsx @@ -8,8 +8,8 @@ import React from 'react'; import { shallow } from 'enzyme'; import { EuiLoadingSpinner } from '@elastic/eui'; -import { coreMock } from '../../../../../../../../../src/core/public/mocks'; -import { esFilters, FilterManager } from '../../../../../../../../../src/plugins/data/public'; +import { coreMock } from '../../../../../../../../src/core/public/mocks'; +import { esFilters, FilterManager } from '../../../../../../../../src/plugins/data/public'; import { SeverityBadge } from '../severity_badge'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx b/x-pack/plugins/siem/public/alerts/components/rules/description_step/helpers.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/helpers.tsx index 1ac371a3f68297..ad3ed538c875b7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/helpers.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/description_step/helpers.tsx @@ -19,8 +19,8 @@ import { isEmpty } from 'lodash/fp'; import React from 'react'; import styled from 'styled-components'; -import { RuleType } from '../../../../../../common/detection_engine/types'; -import { esFilters } from '../../../../../../../../../src/plugins/data/public'; +import { RuleType } from '../../../../../common/detection_engine/types'; +import { esFilters } from '../../../../../../../../src/plugins/data/public'; import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques'; @@ -28,7 +28,7 @@ import * as i18n from './translations'; import { BuildQueryBarDescription, BuildThreatDescription, ListItems } from './types'; import { SeverityBadge } from '../severity_badge'; import ListTreeIcon from './assets/list_tree_icon.svg'; -import { assertUnreachable } from '../../../../../lib/helpers'; +import { assertUnreachable } from '../../../../common/lib/helpers'; const NoteDescriptionContainer = styled(EuiFlexItem)` height: 105px; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/description_step/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/index.test.tsx index fdfcfd0fd85fe3..0cd79f1db78a03 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/description_step/index.test.tsx @@ -11,23 +11,23 @@ import { addFilterStateIfNotThere, buildListItems, getDescriptionItem, -} from './'; +} from '.'; +import { esFilters, Filter, FilterManager } from '../../../../../../../../src/plugins/data/public'; import { - esFilters, - Filter, - FilterManager, -} from '../../../../../../../../../src/plugins/data/public'; -import { mockAboutStepRule, mockDefineStepRule } from '../../all/__mocks__/mock'; -import { coreMock } from '../../../../../../../../../src/core/public/mocks'; -import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations'; + mockAboutStepRule, + mockDefineStepRule, +} from '../../../pages/detection_engine/rules/all/__mocks__/mock'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import { coreMock } from '../../../../../../../../src/core/public/mocks'; +import { DEFAULT_TIMELINE_TITLE } from '../../../../timelines/components/timeline/translations'; import * as i18n from './translations'; import { schema } from '../step_about_rule/schema'; import { ListItems } from './types'; -import { AboutStepRule } from '../../types'; +import { AboutStepRule } from '../../../pages/detection_engine/rules/types'; -jest.mock('../../../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('description_step', () => { const setupMock = coreMock.createSetup(); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/description_step/index.tsx similarity index 91% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/index.tsx index 108f2138114122..86fe128b0a4fb7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/description_step/index.tsx @@ -9,18 +9,18 @@ import { isEmpty, chunk, get, pick, isNumber } from 'lodash/fp'; import React, { memo, useState } from 'react'; import styled from 'styled-components'; -import { RuleType } from '../../../../../../common/detection_engine/types'; +import { RuleType } from '../../../../../common/detection_engine/types'; import { IIndexPattern, Filter, esFilters, FilterManager, -} from '../../../../../../../../../src/plugins/data/public'; -import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations'; -import { useKibana } from '../../../../../lib/kibana'; -import { IMitreEnterpriseAttack } from '../../types'; +} from '../../../../../../../../src/plugins/data/public'; +import { DEFAULT_TIMELINE_TITLE } from '../../../../timelines/components/timeline/translations'; +import { useKibana } from '../../../../common/lib/kibana'; +import { IMitreEnterpriseAttack } from '../../../pages/detection_engine/rules/types'; import { FieldValueTimeline } from '../pick_timeline'; -import { FormSchema } from '../../../../../shared_imports'; +import { FormSchema } from '../../../../shared_imports'; import { ListItems } from './types'; import { buildQueryBarDescription, @@ -32,7 +32,7 @@ import { buildNoteDescription, buildRuleTypeDescription, } from './helpers'; -import { useSiemJobs } from '../../../../../components/ml_popover/hooks/use_siem_jobs'; +import { useSiemJobs } from '../../../../common/components/ml_popover/hooks/use_siem_jobs'; import { buildMlJobDescription } from './ml_job_description'; const DescriptionListContainer = styled(EuiDescriptionList)` diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/description_step/ml_job_description.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/ml_job_description.test.tsx index 59231c31d15bb4..c82a465f08c3a7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/description_step/ml_job_description.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { MlJobDescription, AuditIcon, JobStatusBadge } from './ml_job_description'; -jest.mock('../../../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); const job = { moduleId: 'moduleId', diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx b/x-pack/plugins/siem/public/alerts/components/rules/description_step/ml_job_description.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/ml_job_description.tsx index 33d3dbcba86312..c5df8b1a3db706 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/ml_job_description.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/description_step/ml_job_description.tsx @@ -8,9 +8,9 @@ import React from 'react'; import styled from 'styled-components'; import { EuiBadge, EuiIcon, EuiLink, EuiToolTip } from '@elastic/eui'; -import { isJobStarted } from '../../../../../../common/machine_learning/helpers'; -import { useKibana } from '../../../../../lib/kibana'; -import { SiemJob } from '../../../../../components/ml_popover/types'; +import { isJobStarted } from '../../../../../common/machine_learning/helpers'; +import { useKibana } from '../../../../common/lib/kibana'; +import { SiemJob } from '../../../../common/components/ml_popover/types'; import { ListItems } from './types'; import { ML_JOB_STARTED, ML_JOB_STOPPED } from './translations'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/translations.tsx b/x-pack/plugins/siem/public/alerts/components/rules/description_step/translations.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/translations.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/translations.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/types.ts b/x-pack/plugins/siem/public/alerts/components/rules/description_step/types.ts similarity index 83% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/types.ts rename to x-pack/plugins/siem/public/alerts/components/rules/description_step/types.ts index 564a3c5dc2c018..bcda5ff67a9a62 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/description_step/types.ts +++ b/x-pack/plugins/siem/public/alerts/components/rules/description_step/types.ts @@ -9,8 +9,8 @@ import { IIndexPattern, Filter, FilterManager, -} from '../../../../../../../../../src/plugins/data/public'; -import { IMitreEnterpriseAttack } from '../../types'; +} from '../../../../../../../../src/plugins/data/public'; +import { IMitreEnterpriseAttack } from '../../../pages/detection_engine/rules/types'; export interface ListItems { title: NonNullable; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/helpers.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/mitre/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/helpers.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/mitre/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/helpers.ts b/x-pack/plugins/siem/public/alerts/components/rules/mitre/helpers.ts similarity index 87% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/helpers.ts rename to x-pack/plugins/siem/public/alerts/components/rules/mitre/helpers.ts index 7a28a16214df63..2dc7a6d8f45e59 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/helpers.ts +++ b/x-pack/plugins/siem/public/alerts/components/rules/mitre/helpers.ts @@ -5,7 +5,7 @@ */ import { isEmpty } from 'lodash/fp'; -import { IMitreAttack } from '../../types'; +import { IMitreAttack } from '../../../pages/detection_engine/rules/types'; export const isMitreAttackInvalid = ( tacticName: string | null | undefined, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/mitre/index.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/mitre/index.test.tsx index 3e8d5426824560..ecf1bda807b68c 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/mitre/index.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { AddMitreThreat } from './index'; -import { useFormFieldMock } from '../../../../../mock'; +import { useFormFieldMock } from '../../../../common/mock'; describe('AddMitreThreat', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/mitre/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/mitre/index.tsx index a2d81e72af40e4..4170ce5ebeabd7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/mitre/index.tsx @@ -19,10 +19,10 @@ import React, { useCallback, useState } from 'react'; import styled from 'styled-components'; import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques'; -import * as Rulei18n from '../../translations'; -import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../../shared_imports'; +import * as Rulei18n from '../../../pages/detection_engine/rules/translations'; +import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../shared_imports'; import { threatDefault } from '../step_about_rule/default_value'; -import { IMitreEnterpriseAttack } from '../../types'; +import { IMitreEnterpriseAttack } from '../../../pages/detection_engine/rules/types'; import { MyAddItemButton } from '../add_item_form'; import { isMitreAttackInvalid } from './helpers'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/translations.ts b/x-pack/plugins/siem/public/alerts/components/rules/mitre/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/mitre/translations.ts rename to x-pack/plugins/siem/public/alerts/components/rules/mitre/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/ml_job_select/index.test.tsx similarity index 74% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/ml_job_select/index.test.tsx index dea27d8d045365..6f6581e4de1c37 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/ml_job_select/index.test.tsx @@ -8,10 +8,10 @@ import React from 'react'; import { shallow } from 'enzyme'; import { MlJobSelect } from './index'; -import { useSiemJobs } from '../../../../../components/ml_popover/hooks/use_siem_jobs'; -import { useFormFieldMock } from '../../../../../mock'; -jest.mock('../../../../../components/ml_popover/hooks/use_siem_jobs'); -jest.mock('../../../../../lib/kibana'); +import { useSiemJobs } from '../../../../common/components/ml_popover/hooks/use_siem_jobs'; +import { useFormFieldMock } from '../../../../common/mock'; +jest.mock('../../../../common/components/ml_popover/hooks/use_siem_jobs'); +jest.mock('../../../../common/lib/kibana'); describe('MlJobSelect', () => { beforeAll(() => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/ml_job_select/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/ml_job_select/index.tsx index c011c06e86542e..d3b6de6cf0c405 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/ml_job_select/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/ml_job_select/index.tsx @@ -17,10 +17,10 @@ import { } from '@elastic/eui'; import styled from 'styled-components'; -import { isJobStarted } from '../../../../../../common/machine_learning/helpers'; -import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../../shared_imports'; -import { useSiemJobs } from '../../../../../components/ml_popover/hooks/use_siem_jobs'; -import { useKibana } from '../../../../../lib/kibana'; +import { isJobStarted } from '../../../../../common/machine_learning/helpers'; +import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../shared_imports'; +import { useSiemJobs } from '../../../../common/components/ml_popover/hooks/use_siem_jobs'; +import { useKibana } from '../../../../common/lib/kibana'; import { ML_JOB_SELECT_PLACEHOLDER_TEXT, ENABLE_ML_JOB_WARNING, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/next_step/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/alerts/components/rules/next_step/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/next_step/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/alerts/components/rules/next_step/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/next_step/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/next_step/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/next_step/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/next_step/index.tsx index 11332e7af92662..d97c2b4c8c0aa4 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/next_step/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/next_step/index.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui'; -import * as RuleI18n from '../../translations'; +import * as RuleI18n from '../../../pages/detection_engine/rules/translations'; interface NextStepProps { onClick: () => Promise; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/optional_field_label/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/optional_field_label/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/optional_field_label/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/optional_field_label/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/optional_field_label/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/optional_field_label/index.tsx similarity index 84% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/optional_field_label/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/optional_field_label/index.tsx index 0dab87b0a3b744..0d144e30cbaba9 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/optional_field_label/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/optional_field_label/index.tsx @@ -7,7 +7,7 @@ import { EuiText } from '@elastic/eui'; import React from 'react'; -import * as RuleI18n from '../../translations'; +import * as RuleI18n from '../../../pages/detection_engine/rules/translations'; export const OptionalFieldLabel = ( diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/pick_timeline/index.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/pick_timeline/index.test.tsx index fefc9697176c4c..379a8a48e1ad7a 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/pick_timeline/index.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { PickTimeline } from './index'; -import { useFormFieldMock } from '../../../../../mock'; +import { useFormFieldMock } from '../../../../common/mock'; describe('PickTimeline', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/pick_timeline/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/pick_timeline/index.tsx index 27d668dc6166c4..0029e70e4edda8 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pick_timeline/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/pick_timeline/index.tsx @@ -7,8 +7,8 @@ import { EuiFormRow } from '@elastic/eui'; import React, { useCallback, useEffect, useState } from 'react'; -import { SearchTimelineSuperSelect } from '../../../../../components/timeline/search_super_select'; -import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../../shared_imports'; +import { SearchTimelineSuperSelect } from '../../../../timelines/components/timeline/search_super_select'; +import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../shared_imports'; export interface FieldValueTimeline { id: string | null; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/load_empty_prompt.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/load_empty_prompt.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/load_empty_prompt.tsx b/x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/load_empty_prompt.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.tsx index 5d136265ef1f23..cd88c4ce72af80 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/load_empty_prompt.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/load_empty_prompt.tsx @@ -8,7 +8,7 @@ import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/e import React, { memo, useCallback } from 'react'; import styled from 'styled-components'; -import { DETECTION_ENGINE_PAGE_NAME } from '../../../../../components/link_to/redirect_to_detection_engine'; +import { DETECTION_ENGINE_PAGE_NAME } from '../../../../common/components/link_to/redirect_to_detection_engine'; import * as i18n from './translations'; const EmptyPrompt = styled(EuiEmptyPrompt)` diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/translations.ts b/x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/translations.ts rename to x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/update_callout.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/update_callout.test.tsx similarity index 89% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/update_callout.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/update_callout.test.tsx index 807da79fb7a1ab..b5dca70ad95758 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/update_callout.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/update_callout.test.tsx @@ -8,8 +8,8 @@ import React from 'react'; import { shallow } from 'enzyme'; import { UpdatePrePackagedRulesCallOut } from './update_callout'; -import { useKibana } from '../../../../../lib/kibana'; -jest.mock('../../../../../lib/kibana'); +import { useKibana } from '../../../../common/lib/kibana'; +jest.mock('../../../../common/lib/kibana'); describe('UpdatePrePackagedRulesCallOut', () => { beforeAll(() => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/update_callout.tsx b/x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/update_callout.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/update_callout.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/update_callout.tsx index c2887508a9ae9a..0faf4074ed890d 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/pre_packaged_rules/update_callout.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/pre_packaged_rules/update_callout.tsx @@ -8,7 +8,7 @@ import React, { memo } from 'react'; import { EuiCallOut, EuiButton, EuiLink } from '@elastic/eui'; -import { useKibana } from '../../../../../lib/kibana'; +import { useKibana } from '../../../../common/lib/kibana'; import * as i18n from './translations'; interface UpdatePrePackagedRulesCallOutProps { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/query_bar/index.test.tsx similarity index 90% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/query_bar/index.test.tsx index cdd06ad58bb4b2..e22359edecd1a9 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/query_bar/index.test.tsx @@ -8,9 +8,9 @@ import React from 'react'; import { shallow } from 'enzyme'; import { QueryBarDefineRule } from './index'; -import { useFormFieldMock } from '../../../../../mock'; +import { useFormFieldMock } from '../../../../common/mock'; -jest.mock('../../../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('QueryBarDefineRule', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/query_bar/index.tsx similarity index 90% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/query_bar/index.tsx index b92d98a4afb13b..1aa5ce66d371ef 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/query_bar/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/query_bar/index.tsx @@ -17,19 +17,19 @@ import { FilterManager, SavedQuery, SavedQueryTimeFilter, -} from '../../../../../../../../../src/plugins/data/public'; +} from '../../../../../../../../src/plugins/data/public'; -import { BrowserFields } from '../../../../../containers/source'; -import { OpenTimelineModal } from '../../../../../components/open_timeline/open_timeline_modal'; -import { ActionTimelineToShow } from '../../../../../components/open_timeline/types'; -import { QueryBar } from '../../../../../components/query_bar'; -import { buildGlobalQuery } from '../../../../../components/timeline/helpers'; -import { getDataProviderFilter } from '../../../../../components/timeline/query_bar'; -import { convertKueryToElasticSearchQuery } from '../../../../../lib/keury'; -import { useKibana } from '../../../../../lib/kibana'; -import { TimelineModel } from '../../../../../store/timeline/model'; -import { useSavedQueryServices } from '../../../../../utils/saved_query_services'; -import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../../shared_imports'; +import { BrowserFields } from '../../../../common/containers/source'; +import { OpenTimelineModal } from '../../../../timelines/components/open_timeline/open_timeline_modal'; +import { ActionTimelineToShow } from '../../../../timelines/components/open_timeline/types'; +import { QueryBar } from '../../../../common/components/query_bar'; +import { buildGlobalQuery } from '../../../../timelines/components/timeline/helpers'; +import { getDataProviderFilter } from '../../../../timelines/components/timeline/query_bar'; +import { convertKueryToElasticSearchQuery } from '../../../../common/lib/keury'; +import { useKibana } from '../../../../common/lib/kibana'; +import { TimelineModel } from '../../../../timelines/store/timeline/model'; +import { useSavedQueryServices } from '../../../../common/utils/saved_query_services'; +import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../shared_imports'; import * as i18n from './translations'; export interface FieldValueQueryBar { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/query_bar/translations.tsx b/x-pack/plugins/siem/public/alerts/components/rules/query_bar/translations.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/query_bar/translations.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/query_bar/translations.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/read_only_callout/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/read_only_callout/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/read_only_callout/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/read_only_callout/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/read_only_callout/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/read_only_callout/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/read_only_callout/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/read_only_callout/index.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/read_only_callout/translations.ts b/x-pack/plugins/siem/public/alerts/components/rules/read_only_callout/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/read_only_callout/translations.ts rename to x-pack/plugins/siem/public/alerts/components/rules/read_only_callout/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_field/index.test.tsx similarity index 86% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/rule_actions_field/index.test.tsx index 13ae3ee3d3b7de..579f8869c08b17 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_field/index.test.tsx @@ -8,9 +8,9 @@ import React from 'react'; import { shallow } from 'enzyme'; import { RuleActionsField } from './index'; -import { useKibana } from '../../../../../lib/kibana'; -import { useFormFieldMock } from '../../../../../mock'; -jest.mock('../../../../../lib/kibana'); +import { useKibana } from '../../../../common/lib/kibana'; +import { useFormFieldMock } from '../../../../common/mock'; +jest.mock('../../../../common/lib/kibana'); describe('RuleActionsField', () => { it('should not render ActionForm is no actions are supported', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_field/index.tsx similarity index 86% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/rule_actions_field/index.tsx index d53cf52cc67b94..2e9a793bbdef2a 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_field/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_field/index.tsx @@ -7,13 +7,13 @@ import React, { useCallback, useEffect, useState } from 'react'; import deepMerge from 'deepmerge'; -import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../../common/constants'; +import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../common/constants'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { loadActionTypes } from '../../../../../../../triggers_actions_ui/public/application/lib/action_connector_api'; -import { SelectField } from '../../../../../shared_imports'; -import { ActionForm, ActionType } from '../../../../../../../triggers_actions_ui/public'; -import { AlertAction } from '../../../../../../../alerting/common'; -import { useKibana } from '../../../../../lib/kibana'; +import { loadActionTypes } from '../../../../../../triggers_actions_ui/public/application/lib/action_connector_api'; +import { SelectField } from '../../../../shared_imports'; +import { ActionForm, ActionType } from '../../../../../../triggers_actions_ui/public'; +import { AlertAction } from '../../../../../../alerting/common'; +import { useKibana } from '../../../../common/lib/kibana'; type ThrottleSelectField = typeof SelectField; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/index.test.tsx index b54938e6a3cf18..a648a1bdb9aa86 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/index.test.tsx @@ -7,9 +7,12 @@ import { shallow, mount } from 'enzyme'; import React from 'react'; -import { deleteRulesAction, duplicateRulesAction } from '../../all/actions'; +import { + deleteRulesAction, + duplicateRulesAction, +} from '../../../pages/detection_engine/rules/all/actions'; import { RuleActionsOverflow } from './index'; -import { mockRule } from '../../all/__mocks__/mock'; +import { mockRule } from '../../../pages/detection_engine/rules/all/__mocks__/mock'; jest.mock('react-router-dom', () => ({ useHistory: () => ({ @@ -17,7 +20,7 @@ jest.mock('react-router-dom', () => ({ }), })); -jest.mock('../../all/actions', () => ({ +jest.mock('../../../pages/detection_engine/rules/all/actions', () => ({ deleteRulesAction: jest.fn(), duplicateRulesAction: jest.fn(), })); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/index.tsx similarity index 89% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/index.tsx index a7ce0c85ffdcf7..2d8e6bef8ee90d 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/index.tsx @@ -16,13 +16,16 @@ import styled from 'styled-components'; import { noop } from 'lodash/fp'; import { useHistory } from 'react-router-dom'; -import { Rule, exportRules } from '../../../../../containers/detection_engine/rules'; +import { Rule, exportRules } from '../../../../alerts/containers/detection_engine/rules'; import * as i18n from './translations'; -import * as i18nActions from '../../../rules/translations'; -import { displaySuccessToast, useStateToaster } from '../../../../../components/toasters'; -import { deleteRulesAction, duplicateRulesAction } from '../../all/actions'; -import { GenericDownloader } from '../../../../../components/generic_downloader'; -import { DETECTION_ENGINE_PAGE_NAME } from '../../../../../components/link_to/redirect_to_detection_engine'; +import * as i18nActions from '../../../pages/detection_engine/rules/translations'; +import { displaySuccessToast, useStateToaster } from '../../../../common/components/toasters'; +import { + deleteRulesAction, + duplicateRulesAction, +} from '../../../pages/detection_engine/rules/all/actions'; +import { GenericDownloader } from '../../../../common/components/generic_downloader'; +import { DETECTION_ENGINE_PAGE_NAME } from '../../../../common/components/link_to/redirect_to_detection_engine'; const MyEuiButtonIcon = styled(EuiButtonIcon)` &.euiButtonIcon { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/translations.ts b/x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_actions_overflow/translations.ts rename to x-pack/plugins/siem/public/alerts/components/rules/rule_actions_overflow/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/helpers.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/rule_status/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/helpers.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/rule_status/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/helpers.ts b/x-pack/plugins/siem/public/alerts/components/rules/rule_status/helpers.ts similarity index 85% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/helpers.ts rename to x-pack/plugins/siem/public/alerts/components/rules/rule_status/helpers.ts index 263f602251ea77..88fca3d95604e7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/helpers.ts +++ b/x-pack/plugins/siem/public/alerts/components/rules/rule_status/helpers.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { RuleStatusType } from '../../../../../containers/detection_engine/rules'; +import { RuleStatusType } from '../../../../alerts/containers/detection_engine/rules'; export const getStatusColor = (status: RuleStatusType | string | null) => status == null diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/rule_status/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/rule_status/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/rule_status/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/rule_status/index.tsx index ac457d7345c29e..53be48bc988509 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/rule_status/index.tsx @@ -15,9 +15,12 @@ import { import React, { memo, useCallback, useEffect, useState } from 'react'; import deepEqual from 'fast-deep-equal'; -import { useRuleStatus, RuleInfoStatus } from '../../../../../containers/detection_engine/rules'; -import { FormattedDate } from '../../../../../components/formatted_date'; -import { getEmptyTagValue } from '../../../../../components/empty_value'; +import { + useRuleStatus, + RuleInfoStatus, +} from '../../../../alerts/containers/detection_engine/rules'; +import { FormattedDate } from '../../../../common/components/formatted_date'; +import { getEmptyTagValue } from '../../../../common/components/empty_value'; import { getStatusColor } from './helpers'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/translations.ts b/x-pack/plugins/siem/public/alerts/components/rules/rule_status/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_status/translations.ts rename to x-pack/plugins/siem/public/alerts/components/rules/rule_status/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/alerts/components/rules/rule_switch/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/alerts/components/rules/rule_switch/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/rule_switch/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/rule_switch/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/rule_switch/index.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/rule_switch/index.tsx index 44845ea68d954a..2f718818ff2e73 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/rule_switch/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/rule_switch/index.tsx @@ -15,12 +15,12 @@ import { isEmpty } from 'lodash/fp'; import styled from 'styled-components'; import React, { useCallback, useState, useEffect } from 'react'; -import * as i18n from '../../translations'; -import { enableRules } from '../../../../../containers/detection_engine/rules'; -import { enableRulesAction } from '../../all/actions'; -import { Action } from '../../all/reducer'; -import { useStateToaster, displayErrorToast } from '../../../../../components/toasters'; -import { bucketRulesResponse } from '../../all/helpers'; +import * as i18n from '../../../pages/detection_engine/rules/translations'; +import { enableRules } from '../../../../alerts/containers/detection_engine/rules'; +import { enableRulesAction } from '../../../pages/detection_engine/rules/all/actions'; +import { Action } from '../../../pages/detection_engine/rules/all/reducer'; +import { useStateToaster, displayErrorToast } from '../../../../common/components/toasters'; +import { bucketRulesResponse } from '../../../pages/detection_engine/rules/all/helpers'; const StaticSwitch = styled(EuiSwitch)` .euiSwitch__thumb, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/schedule_item_form/index.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/schedule_item_form/index.test.tsx index 3829af02ca4f17..9dddd9e6c40851 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/schedule_item_form/index.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { ScheduleItem } from './index'; -import { useFormFieldMock } from '../../../../../mock'; +import { useFormFieldMock } from '../../../../common/mock'; describe('ScheduleItem', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/schedule_item_form/index.tsx similarity index 99% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/schedule_item_form/index.tsx index 1b7d17016f83c3..ffb6c4eda32438 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/schedule_item_form/index.tsx @@ -16,7 +16,7 @@ import { isEmpty } from 'lodash/fp'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; -import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../../shared_imports'; +import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../shared_imports'; import * as I18n from './translations'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/translations.ts b/x-pack/plugins/siem/public/alerts/components/rules/schedule_item_form/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/schedule_item_form/translations.ts rename to x-pack/plugins/siem/public/alerts/components/rules/schedule_item_form/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/select_rule_type/index.test.tsx similarity index 86% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/select_rule_type/index.test.tsx index 3d832d61abb283..87401408c3cc18 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/select_rule_type/index.test.tsx @@ -8,8 +8,8 @@ import React from 'react'; import { shallow } from 'enzyme'; import { SelectRuleType } from './index'; -import { useFormFieldMock } from '../../../../../mock'; -jest.mock('../../../../../lib/kibana'); +import { useFormFieldMock } from '../../../../common/mock'; +jest.mock('../../../../common/lib/kibana'); describe('SelectRuleType', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/select_rule_type/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/select_rule_type/index.tsx index dc9a832f820ba7..58112732bea3b1 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/select_rule_type/index.tsx @@ -16,10 +16,10 @@ import { EuiText, } from '@elastic/eui'; -import { isMlRule } from '../../../../../../common/machine_learning/helpers'; -import { RuleType } from '../../../../../../common/detection_engine/types'; -import { FieldHook } from '../../../../../shared_imports'; -import { useKibana } from '../../../../../lib/kibana'; +import { isMlRule } from '../../../../../common/machine_learning/helpers'; +import { RuleType } from '../../../../../common/detection_engine/types'; +import { FieldHook } from '../../../../shared_imports'; +import { useKibana } from '../../../../common/lib/kibana'; import * as i18n from './translations'; const MlCardDescription = ({ diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/translations.ts b/x-pack/plugins/siem/public/alerts/components/rules/select_rule_type/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/select_rule_type/translations.ts rename to x-pack/plugins/siem/public/alerts/components/rules/select_rule_type/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/severity_badge/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/severity_badge/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/severity_badge/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/severity_badge/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/severity_badge/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/severity_badge/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/severity_badge/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/severity_badge/index.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/status_icon/index.test.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/status_icon/index.test.tsx index 89b8a56e790541..6a16008e9d616d 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/status_icon/index.test.tsx @@ -7,9 +7,9 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { TestProviders } from '../../../../../mock'; +import { TestProviders } from '../../../../common/mock'; import { RuleStatusIcon } from './index'; -jest.mock('../../../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('RuleStatusIcon', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/status_icon/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/status_icon/index.tsx index 3ec5bf1a12eb0f..443ee3e1811f62 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/status_icon/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/status_icon/index.tsx @@ -8,8 +8,8 @@ import { EuiAvatar, EuiIcon } from '@elastic/eui'; import React, { memo } from 'react'; import styled from 'styled-components'; -import { useEuiTheme } from '../../../../../lib/theme/use_eui_theme'; -import { RuleStatusType } from '../../types'; +import { useEuiTheme } from '../../../../common/lib/theme/use_eui_theme'; +import { RuleStatusType } from '../../../pages/detection_engine/rules/types'; export interface RuleStatusIconProps { name: string; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/data.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/data.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/data.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/default_value.ts similarity index 89% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/default_value.ts index 52b0038507b594..977769158481e0 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/default_value.ts +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/default_value.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { AboutStepRule } from '../../types'; +import { AboutStepRule } from '../../../pages/detection_engine/rules/types'; export const threatDefault = [ { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/helpers.test.ts b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/helpers.test.ts rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/helpers.test.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/helpers.ts b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/helpers.ts rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/helpers.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/index.test.tsx index 3c28e697789acf..13a62cee047ba9 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/index.test.tsx @@ -8,8 +8,9 @@ import { mount, shallow } from 'enzyme'; import { ThemeProvider } from 'styled-components'; import euiDarkVars from '@elastic/eui/dist/eui_theme_light.json'; -import { StepAboutRule } from './'; -import { mockAboutStepRule } from '../../all/__mocks__/mock'; +import { StepAboutRule } from '.'; + +import { mockAboutStepRule } from '../../../pages/detection_engine/rules/all/__mocks__/mock'; import { StepRuleDescription } from '../description_step'; import { stepAboutDefaultValue } from './default_value'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/index.tsx index eaf543780d7774..78ae3e44705c70 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/index.tsx @@ -9,8 +9,11 @@ import React, { FC, memo, useCallback, useEffect, useState } from 'react'; import styled from 'styled-components'; import deepEqual from 'fast-deep-equal'; -import { setFieldValue } from '../../helpers'; -import { RuleStepProps, RuleStep, AboutStepRule } from '../../types'; +import { + RuleStepProps, + RuleStep, + AboutStepRule, +} from '../../../pages/detection_engine/rules/types'; import { AddItem } from '../add_item_form'; import { StepRuleDescription } from '../description_step'; import { AddMitreThreat } from '../mitre'; @@ -21,7 +24,7 @@ import { getUseField, UseField, useForm, -} from '../../../../../shared_imports'; +} from '../../../../shared_imports'; import { defaultRiskScoreBySeverity, severityOptions, SeverityValue } from './data'; import { stepAboutDefaultValue } from './default_value'; @@ -30,7 +33,8 @@ import { schema } from './schema'; import * as I18n from './translations'; import { StepContentWrapper } from '../step_content_wrapper'; import { NextStep } from '../next_step'; -import { MarkdownEditorForm } from '../../../../../components/markdown_editor/form'; +import { MarkdownEditorForm } from '../../../../common/components/markdown_editor/form'; +import { setFieldValue } from '../../../pages/detection_engine/rules/helpers'; const CommonUseField = getUseField({ component: Field }); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/schema.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/schema.tsx index 7c088c068c9b25..3cb5e9a0dd5f01 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/schema.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/schema.tsx @@ -6,14 +6,14 @@ import { i18n } from '@kbn/i18n'; -import { IMitreEnterpriseAttack } from '../../types'; import { FIELD_TYPES, fieldValidators, FormSchema, ValidationFunc, ERROR_CODE, -} from '../../../../../shared_imports'; +} from '../../../../shared_imports'; +import { IMitreEnterpriseAttack } from '../../../pages/detection_engine/rules/types'; import { isMitreAttackInvalid } from '../mitre/helpers'; import { OptionalFieldLabel } from '../optional_field_label'; import { isUrlInvalid } from './helpers'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/translations.ts b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule/translations.ts rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule_details/index.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule_details/index.test.tsx index 76a3c590a62a6d..cd499c60b12337 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule_details/index.test.tsx @@ -9,13 +9,13 @@ import { EuiProgress, EuiButtonGroup } from '@elastic/eui'; import { ThemeProvider } from 'styled-components'; import euiDarkVars from '@elastic/eui/dist/eui_theme_light.json'; -import { StepAboutRuleToggleDetails } from './'; -import { mockAboutStepRule } from '../../all/__mocks__/mock'; -import { HeaderSection } from '../../../../../components/header_section'; -import { StepAboutRule } from '../step_about_rule/'; -import { AboutStepRule } from '../../types'; +import { StepAboutRuleToggleDetails } from '.'; +import { mockAboutStepRule } from '../../../pages/detection_engine/rules/all/__mocks__/mock'; +import { HeaderSection } from '../../../../common/components/header_section'; +import { StepAboutRule } from '../step_about_rule'; +import { AboutStepRule } from '../../../pages/detection_engine/rules/types'; -jest.mock('../../../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); const theme = () => ({ eui: euiDarkVars, darkMode: true }); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule_details/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule_details/index.tsx index 5d9803214fa0a6..2163ea80f673ae 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule_details/index.tsx @@ -19,11 +19,11 @@ import React, { memo, useCallback, useState } from 'react'; import styled from 'styled-components'; import { isEmpty } from 'lodash/fp'; -import { HeaderSection } from '../../../../../components/header_section'; -import { Markdown } from '../../../../../components/markdown'; -import { AboutStepRule, AboutStepRuleDetails } from '../../types'; +import { HeaderSection } from '../../../../common/components/header_section'; +import { Markdown } from '../../../../common/components/markdown'; +import { AboutStepRule, AboutStepRuleDetails } from '../../../pages/detection_engine/rules/types'; import * as i18n from './translations'; -import { StepAboutRule } from '../step_about_rule/'; +import { StepAboutRule } from '../step_about_rule'; const MyPanel = styled(EuiPanel)` position: relative; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/translations.ts b/x-pack/plugins/siem/public/alerts/components/rules/step_about_rule_details/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_about_rule_details/translations.ts rename to x-pack/plugins/siem/public/alerts/components/rules/step_about_rule_details/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_content_wrapper/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_content_wrapper/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_content_wrapper/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_content_wrapper/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_content_wrapper/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_content_wrapper/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_content_wrapper/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_content_wrapper/index.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/index.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/index.test.tsx index ebef6348d477ea..6831548992ff10 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/index.test.tsx @@ -9,7 +9,7 @@ import { shallow } from 'enzyme'; import { StepDefineRule } from './index'; -jest.mock('../../../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('StepDefineRule', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/index.tsx similarity index 89% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/index.tsx index 3517c6fb21e695..119f851ecdfe45 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/index.tsx @@ -9,15 +9,24 @@ import React, { FC, memo, useCallback, useState, useEffect } from 'react'; import styled from 'styled-components'; import deepEqual from 'fast-deep-equal'; -import { DEFAULT_INDEX_KEY } from '../../../../../../common/constants'; -import { isMlRule } from '../../../../../../common/machine_learning/helpers'; -import { IIndexPattern } from '../../../../../../../../../src/plugins/data/public'; -import { useFetchIndexPatterns } from '../../../../../containers/detection_engine/rules'; -import { DEFAULT_TIMELINE_TITLE } from '../../../../../components/timeline/translations'; -import { useMlCapabilities } from '../../../../../components/ml_popover/hooks/use_ml_capabilities'; -import { useUiSetting$ } from '../../../../../lib/kibana'; -import { setFieldValue } from '../../helpers'; -import { DefineStepRule, RuleStep, RuleStepProps } from '../../types'; +import { DEFAULT_INDEX_KEY } from '../../../../../common/constants'; +import { isMlRule } from '../../../../../common/machine_learning/helpers'; +import { hasMlAdminPermissions } from '../../../../../common/machine_learning/has_ml_admin_permissions'; +import { IIndexPattern } from '../../../../../../../../src/plugins/data/public'; +import { useFetchIndexPatterns } from '../../../../alerts/containers/detection_engine/rules'; +import { DEFAULT_TIMELINE_TITLE } from '../../../../timelines/components/timeline/translations'; +import { useMlCapabilities } from '../../../../common/components/ml_popover/hooks/use_ml_capabilities'; +import { useUiSetting$ } from '../../../../common/lib/kibana'; +import { setFieldValue } from '../../../pages/detection_engine/rules/helpers'; +import { + filterRuleFieldsForType, + RuleFields, +} from '../../../pages/detection_engine/rules/create/helpers'; +import { + DefineStepRule, + RuleStep, + RuleStepProps, +} from '../../../pages/detection_engine/rules/types'; import { StepRuleDescription } from '../description_step'; import { QueryBarDefineRule } from '../query_bar'; import { SelectRuleType } from '../select_rule_type'; @@ -34,11 +43,9 @@ import { UseField, useForm, FormSchema, -} from '../../../../../shared_imports'; +} from '../../../../shared_imports'; import { schema } from './schema'; import * as i18n from './translations'; -import { filterRuleFieldsForType, RuleFields } from '../../create/helpers'; -import { hasMlAdminPermissions } from '../../../../../../common/machine_learning/has_ml_admin_permissions'; const CommonUseField = getUseField({ component: Field }); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/schema.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/schema.tsx index 08832c5dfe4f53..babfebb2c6ca7c 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/schema.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/schema.tsx @@ -9,8 +9,8 @@ import { EuiText } from '@elastic/eui'; import { isEmpty } from 'lodash/fp'; import React from 'react'; -import { isMlRule } from '../../../../../../common/machine_learning/helpers'; -import { esKuery } from '../../../../../../../../../src/plugins/data/public'; +import { isMlRule } from '../../../../../common/machine_learning/helpers'; +import { esKuery } from '../../../../../../../../src/plugins/data/public'; import { FieldValueQueryBar } from '../query_bar'; import { ERROR_CODE, @@ -18,7 +18,7 @@ import { fieldValidators, FormSchema, ValidationFunc, -} from '../../../../../shared_imports'; +} from '../../../../shared_imports'; import { CUSTOM_QUERY_REQUIRED, INVALID_CUSTOM_QUERY, INDEX_HELPER_TEXT } from './translations'; export const schema: FormSchema = { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/translations.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/translations.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/translations.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/types.ts b/x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/types.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_define_rule/types.ts rename to x-pack/plugins/siem/public/alerts/components/rules/step_define_rule/types.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_panel/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_panel/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_panel/index.tsx similarity index 91% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_panel/index.tsx index 1923ed09252dda..ef8cfc99a3b11f 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_panel/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_panel/index.tsx @@ -8,7 +8,7 @@ import { EuiPanel, EuiProgress } from '@elastic/eui'; import React, { memo } from 'react'; import styled from 'styled-components'; -import { HeaderSection } from '../../../../../components/header_section'; +import { HeaderSection } from '../../../../common/components/header_section'; interface StepPanelProps { children: React.ReactNode; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.test.tsx index 69d118ba9f28eb..712aacd3e3e822 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.test.tsx @@ -9,7 +9,7 @@ import { shallow } from 'enzyme'; import { StepRuleActions } from './index'; -jest.mock('../../../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('StepRuleActions', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.tsx index aec315938b6aef..2d22f0a3437f1c 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/index.tsx @@ -8,14 +8,18 @@ import { EuiHorizontalRule, EuiFlexGroup, EuiFlexItem, EuiButton, EuiSpacer } fr import React, { FC, memo, useCallback, useEffect, useMemo, useState } from 'react'; import deepEqual from 'fast-deep-equal'; -import { setFieldValue } from '../../helpers'; -import { RuleStep, RuleStepProps, ActionsStepRule } from '../../types'; +import { setFieldValue } from '../../../pages/detection_engine/rules/helpers'; +import { + RuleStep, + RuleStepProps, + ActionsStepRule, +} from '../../../pages/detection_engine/rules/types'; import { StepRuleDescription } from '../description_step'; -import { Form, UseField, useForm } from '../../../../../shared_imports'; +import { Form, UseField, useForm } from '../../../../shared_imports'; import { StepContentWrapper } from '../step_content_wrapper'; import { ThrottleSelectField, THROTTLE_OPTIONS } from '../throttle_select_field'; import { RuleActionsField } from '../rule_actions_field'; -import { useKibana } from '../../../../../lib/kibana'; +import { useKibana } from '../../../../common/lib/kibana'; import { schema } from './schema'; import * as I18n from './translations'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/schema.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/schema.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/schema.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/schema.tsx index 1b27d0e0fcc0ed..a978e038985f64 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/schema.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/schema.tsx @@ -8,7 +8,7 @@ import { i18n } from '@kbn/i18n'; -import { FormSchema } from '../../../../../shared_imports'; +import { FormSchema } from '../../../../shared_imports'; export const schema: FormSchema = { actions: {}, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/translations.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/translations.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_rule_actions/translations.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_rule_actions/translations.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/index.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/index.test.tsx index 98de933590d606..6f5eddfe051a13 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/index.test.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { shallow, mount } from 'enzyme'; -import { TestProviders } from '../../../../../mock'; +import { TestProviders } from '../../../../common/mock'; import { StepScheduleRule } from './index'; describe('StepScheduleRule', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/index.tsx index de9abcefdea2e6..fa49637a0c830d 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/index.tsx @@ -8,11 +8,15 @@ import React, { FC, memo, useCallback, useEffect, useState } from 'react'; import deepEqual from 'fast-deep-equal'; import styled from 'styled-components'; -import { setFieldValue } from '../../helpers'; -import { RuleStep, RuleStepProps, ScheduleStepRule } from '../../types'; +import { setFieldValue } from '../../../pages/detection_engine/rules/helpers'; +import { + RuleStep, + RuleStepProps, + ScheduleStepRule, +} from '../../../pages/detection_engine/rules/types'; import { StepRuleDescription } from '../description_step'; import { ScheduleItem } from '../schedule_item_form'; -import { Form, UseField, useForm } from '../../../../../shared_imports'; +import { Form, UseField, useForm } from '../../../../shared_imports'; import { StepContentWrapper } from '../step_content_wrapper'; import { NextStep } from '../next_step'; import { schema } from './schema'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/schema.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/schema.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/schema.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/schema.tsx index e79aec2be6e153..99ff8a67273727 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/schema.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/schema.tsx @@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n'; import { OptionalFieldLabel } from '../optional_field_label'; -import { FormSchema } from '../../../../../shared_imports'; +import { FormSchema } from '../../../../shared_imports'; export const schema: FormSchema = { interval: { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/translations.tsx b/x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/translations.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/step_schedule_rule/translations.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/step_schedule_rule/translations.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.test.tsx index 0ab19b671494ef..2a13c40a0dd170 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { ThrottleSelectField } from './index'; -import { useFormFieldMock } from '../../../../../mock'; +import { useFormFieldMock } from '../../../../common/mock'; describe('ThrottleSelectField', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx b/x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.tsx similarity index 91% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx rename to x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.tsx index 0cf15c41a0f913..281c45b19ece58 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/components/throttle_select_field/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/rules/throttle_select_field/index.tsx @@ -9,8 +9,8 @@ import React, { useCallback } from 'react'; import { NOTIFICATION_THROTTLE_RULE, NOTIFICATION_THROTTLE_NO_ACTIONS, -} from '../../../../../../common/constants'; -import { SelectField } from '../../../../../shared_imports'; +} from '../../../../../common/constants'; +import { SelectField } from '../../../../shared_imports'; export const THROTTLE_OPTIONS = [ { value: NOTIFICATION_THROTTLE_NO_ACTIONS, text: 'Perform no actions' }, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/actions.test.tsx b/x-pack/plugins/siem/public/alerts/components/signals/actions.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/actions.test.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/actions.test.tsx index ab75fcb6d6d1fe..d3be87ce7c39cc 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/actions.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals/actions.test.tsx @@ -12,10 +12,10 @@ import { defaultTimelineProps, apolloClient, mockTimelineApolloResult, -} from '../../../../mock/'; +} from '../../../common/mock/'; import { CreateTimeline, UpdateTimelineLoading } from './types'; -import { Ecs } from '../../../../graphql/types'; -import { TimelineType } from '../../../../../common/types/timeline'; +import { Ecs } from '../../../graphql/types'; +import { TimelineType } from '../../../../common/types/timeline'; jest.mock('apollo-client'); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/actions.tsx b/x-pack/plugins/siem/public/alerts/components/signals/actions.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/actions.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/actions.tsx index c71ede32d8403e..044633da62f610 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/actions.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals/actions.tsx @@ -8,16 +8,16 @@ import dateMath from '@elastic/datemath'; import { getOr, isEmpty } from 'lodash/fp'; import moment from 'moment'; -import { updateSignalStatus } from '../../../../containers/detection_engine/signals/api'; +import { updateSignalStatus } from '../../containers/detection_engine/signals/api'; import { SendSignalToTimelineActionProps, UpdateSignalStatusActionProps } from './types'; -import { TimelineNonEcsData, GetOneTimeline, TimelineResult, Ecs } from '../../../../graphql/types'; -import { oneTimelineQuery } from '../../../../containers/timeline/one/index.gql_query'; +import { TimelineNonEcsData, GetOneTimeline, TimelineResult, Ecs } from '../../../graphql/types'; +import { oneTimelineQuery } from '../../../timelines/containers/one/index.gql_query'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; import { omitTypenameInTimeline, formatTimelineResultToModel, -} from '../../../../components/open_timeline/helpers'; -import { convertKueryToElasticSearchQuery } from '../../../../lib/keury'; -import { timelineDefaults } from '../../../../store/timeline/defaults'; +} from '../../../timelines/components/open_timeline/helpers'; +import { convertKueryToElasticSearchQuery } from '../../../common/lib/keury'; import { replaceTemplateFieldFromQuery, replaceTemplateFieldFromMatchFilters, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/default_config.test.tsx b/x-pack/plugins/siem/public/alerts/components/signals/default_config.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/default_config.test.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/default_config.test.tsx index 5428b9932fbde7..71da68108da7ee 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/default_config.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals/default_config.test.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { mount, ReactWrapper } from 'enzyme'; import { EuiButtonIcon, EuiToolTip } from '@elastic/eui'; -import { Filter } from '../../../../../../../../src/plugins/data/common/es_query'; -import { TimelineAction } from '../../../../components/timeline/body/actions'; +import { Filter } from '../../../../../../../src/plugins/data/common/es_query'; +import { TimelineAction } from '../../../timelines/components/timeline/body/actions'; import { buildSignalsRuleIdFilter, getSignalsActions } from './default_config'; import { CreateTimeline, @@ -16,7 +16,7 @@ import { SetEventsLoadingProps, UpdateTimelineLoading, } from './types'; -import { mockEcsDataWithSignal } from '../../../../mock/mock_ecs'; +import { mockEcsDataWithSignal } from '../../../common/mock/mock_ecs'; import { sendSignalToTimelineAction, updateSignalStatusAction } from './actions'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx b/x-pack/plugins/siem/public/alerts/components/signals/default_config.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/default_config.tsx index 81b643b7894dfc..05e0baba66d0a2 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/default_config.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals/default_config.tsx @@ -10,15 +10,18 @@ import { EuiButtonIcon, EuiToolTip } from '@elastic/eui'; import ApolloClient from 'apollo-client'; import React from 'react'; -import { Filter } from '../../../../../../../../src/plugins/data/common/es_query'; -import { TimelineAction, TimelineActionProps } from '../../../../components/timeline/body/actions'; -import { defaultColumnHeaderType } from '../../../../components/timeline/body/column_headers/default_headers'; +import { Filter } from '../../../../../../../src/plugins/data/common/es_query'; +import { + TimelineAction, + TimelineActionProps, +} from '../../../timelines/components/timeline/body/actions'; +import { defaultColumnHeaderType } from '../../../timelines/components/timeline/body/column_headers/default_headers'; import { DEFAULT_COLUMN_MIN_WIDTH, DEFAULT_DATE_COLUMN_MIN_WIDTH, -} from '../../../../components/timeline/body/constants'; -import { ColumnHeaderOptions, SubsetTimelineModel } from '../../../../store/timeline/model'; -import { timelineDefaults } from '../../../../store/timeline/defaults'; +} from '../../../timelines/components/timeline/body/constants'; +import { ColumnHeaderOptions, SubsetTimelineModel } from '../../../timelines/store/timeline/model'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; import { FILTER_OPEN } from './signals_filter_group'; import { sendSignalToTimelineAction, updateSignalStatusAction } from './actions'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/helpers.test.ts b/x-pack/plugins/siem/public/alerts/components/signals/helpers.test.ts similarity index 96% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/helpers.test.ts rename to x-pack/plugins/siem/public/alerts/components/signals/helpers.test.ts index a948d2b940b0c9..ad4f5cf8b4aa88 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/helpers.test.ts +++ b/x-pack/plugins/siem/public/alerts/components/signals/helpers.test.ts @@ -3,6 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ +import { cloneDeep } from 'lodash/fp'; + +import { mockEcsData } from '../../../common/mock/mock_ecs'; +import { Filter } from '../../../../../../../src/plugins/data/public'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { mockDataProviders } from '../../../timelines/components/timeline/data_providers/mock/mock_data_providers'; import { getStringArray, @@ -10,11 +16,6 @@ import { replaceTemplateFieldFromMatchFilters, reformatDataProviderWithNewValue, } from './helpers'; -import { mockEcsData } from '../../../../mock/mock_ecs'; -import { Filter } from '../../../../../../../../src/plugins/data/public'; -import { DataProvider } from '../../../../components/timeline/data_providers/data_provider'; -import { mockDataProviders } from '../../../../components/timeline/data_providers/mock/mock_data_providers'; -import { cloneDeep } from 'lodash/fp'; describe('helpers', () => { let mockEcsDataClone = cloneDeep(mockEcsData); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/helpers.ts b/x-pack/plugins/siem/public/alerts/components/signals/helpers.ts similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/helpers.ts rename to x-pack/plugins/siem/public/alerts/components/signals/helpers.ts index 3fa2da37046b00..5099d61254caa7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/helpers.ts +++ b/x-pack/plugins/siem/public/alerts/components/signals/helpers.ts @@ -5,12 +5,12 @@ */ import { get, isEmpty } from 'lodash/fp'; -import { Filter, esKuery, KueryNode } from '../../../../../../../../src/plugins/data/public'; +import { Filter, esKuery, KueryNode } from '../../../../../../../src/plugins/data/public'; import { DataProvider, DataProvidersAnd, -} from '../../../../components/timeline/data_providers/data_provider'; -import { Ecs } from '../../../../graphql/types'; +} from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Ecs } from '../../../graphql/types'; interface FindValueToChangeInQuery { field: string; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/signals/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/index.tsx b/x-pack/plugins/siem/public/alerts/components/signals/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/index.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/index.tsx index 5442c8c19b5a70..eb19cfea97324f 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals/index.tsx @@ -10,17 +10,17 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import { Dispatch } from 'redux'; -import { Filter, esQuery } from '../../../../../../../../src/plugins/data/public'; -import { useFetchIndexPatterns } from '../../../../containers/detection_engine/rules/fetch_index_patterns'; -import { StatefulEventsViewer } from '../../../../components/events_viewer'; -import { HeaderSection } from '../../../../components/header_section'; -import { combineQueries } from '../../../../components/timeline/helpers'; -import { useKibana } from '../../../../lib/kibana'; -import { inputsSelectors, State, inputsModel } from '../../../../store'; -import { timelineActions, timelineSelectors } from '../../../../store/timeline'; -import { TimelineModel } from '../../../../store/timeline/model'; -import { timelineDefaults } from '../../../../store/timeline/defaults'; -import { useApolloClient } from '../../../../utils/apollo_context'; +import { Filter, esQuery } from '../../../../../../../src/plugins/data/public'; +import { useFetchIndexPatterns } from '../../../alerts/containers/detection_engine/rules/fetch_index_patterns'; +import { StatefulEventsViewer } from '../../../common/components/events_viewer'; +import { HeaderSection } from '../../../common/components/header_section'; +import { combineQueries } from '../../../timelines/components/timeline/helpers'; +import { useKibana } from '../../../common/lib/kibana'; +import { inputsSelectors, State, inputsModel } from '../../../common/store'; +import { timelineActions, timelineSelectors } from '../../../timelines/store/timeline'; +import { TimelineModel } from '../../../timelines/store/timeline/model'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; +import { useApolloClient } from '../../../common/utils/apollo_context'; import { updateSignalStatusAction } from './actions'; import { @@ -45,7 +45,7 @@ import { UpdateSignalsStatusCallback, UpdateSignalsStatusProps, } from './types'; -import { dispatchUpdateTimeline } from '../../../../components/open_timeline/helpers'; +import { dispatchUpdateTimeline } from '../../../timelines/components/open_timeline/helpers'; export const SIGNALS_PAGE_TIMELINE_ID = 'signals-page'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/signals/signals_filter_group/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/signals_filter_group/index.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.tsx b/x-pack/plugins/siem/public/alerts/components/signals/signals_filter_group/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_filter_group/index.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/signals_filter_group/index.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/signals/signals_utility_bar/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/signals_utility_bar/index.test.tsx index 6cab43b5285b50..3b43185c2c16b4 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals/signals_utility_bar/index.test.tsx @@ -9,7 +9,7 @@ import { shallow } from 'enzyme'; import { SignalsUtilityBar } from './index'; -jest.mock('../../../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('SignalsUtilityBar', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx b/x-pack/plugins/siem/public/alerts/components/signals/signals_utility_bar/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx rename to x-pack/plugins/siem/public/alerts/components/signals/signals_utility_bar/index.tsx index b9268716f85f01..e23f4ebdd3d30a 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals/signals_utility_bar/index.tsx @@ -8,17 +8,17 @@ import { isEmpty } from 'lodash/fp'; import React, { useCallback } from 'react'; import numeral from '@elastic/numeral'; -import { DEFAULT_NUMBER_FORMAT } from '../../../../../../common/constants'; +import { DEFAULT_NUMBER_FORMAT } from '../../../../../common/constants'; import { UtilityBar, UtilityBarAction, UtilityBarGroup, UtilityBarSection, UtilityBarText, -} from '../../../../../components/utility_bar'; +} from '../../../../common/components/utility_bar'; import * as i18n from './translations'; -import { useUiSetting$ } from '../../../../../lib/kibana'; -import { TimelineNonEcsData } from '../../../../../graphql/types'; +import { useUiSetting$ } from '../../../../common/lib/kibana'; +import { TimelineNonEcsData } from '../../../../graphql/types'; import { UpdateSignalsStatus } from '../types'; import { FILTER_CLOSED, FILTER_OPEN } from '../signals_filter_group'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/translations.ts b/x-pack/plugins/siem/public/alerts/components/signals/signals_utility_bar/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/signals_utility_bar/translations.ts rename to x-pack/plugins/siem/public/alerts/components/signals/signals_utility_bar/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/translations.ts b/x-pack/plugins/siem/public/alerts/components/signals/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/translations.ts rename to x-pack/plugins/siem/public/alerts/components/signals/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/types.ts b/x-pack/plugins/siem/public/alerts/components/signals/types.ts similarity index 90% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals/types.ts rename to x-pack/plugins/siem/public/alerts/components/signals/types.ts index 909b2176467461..b3c770415ed574 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals/types.ts +++ b/x-pack/plugins/siem/public/alerts/components/signals/types.ts @@ -6,9 +6,9 @@ import ApolloClient from 'apollo-client'; -import { Ecs } from '../../../../graphql/types'; -import { TimelineModel } from '../../../../store/timeline/model'; -import { inputsModel } from '../../../../store'; +import { Ecs } from '../../../graphql/types'; +import { TimelineModel } from '../../../timelines/store/timeline/model'; +import { inputsModel } from '../../../common/store'; export interface SetEventsLoadingProps { eventIds: string[]; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/config.ts b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/config.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/config.ts rename to x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/config.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.test.tsx b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.test.tsx rename to x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/helpers.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx rename to x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/helpers.tsx index 24b12cae62d85d..0c9fa39e53d00b 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/helpers.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/helpers.tsx @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { showAllOthersBucket } from '../../../../../common/constants'; +import { showAllOthersBucket } from '../../../../common/constants'; import { HistogramData, SignalsAggregation, SignalsBucket, SignalsGroupBucket } from './types'; -import { SignalSearchResponse } from '../../../../containers/detection_engine/signals/types'; +import { SignalSearchResponse } from '../../containers/detection_engine/signals/types'; import * as i18n from './translations'; export const formatSignalsData = ( diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/index.test.tsx similarity index 86% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/index.test.tsx index 6921c49d8a8b48..6578af19094df7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/index.test.tsx @@ -9,8 +9,8 @@ import { shallow } from 'enzyme'; import { SignalsHistogramPanel } from './index'; -jest.mock('../../../../lib/kibana'); -jest.mock('../../../../components/navigation/use_get_url_search'); +jest.mock('../../../common/lib/kibana'); +jest.mock('../../../common/components/navigation/use_get_url_search'); describe('SignalsHistogramPanel', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx rename to x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/index.tsx index 9b336766b1724f..0a1ce5a39af895 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/index.tsx @@ -11,21 +11,21 @@ import styled from 'styled-components'; import { isEmpty } from 'lodash/fp'; import uuid from 'uuid'; -import { DEFAULT_NUMBER_FORMAT } from '../../../../../common/constants'; -import { UpdateDateRange } from '../../../../components/charts/common'; -import { LegendItem } from '../../../../components/charts/draggable_legend_item'; -import { escapeDataProviderId } from '../../../../components/drag_and_drop/helpers'; -import { HeaderSection } from '../../../../components/header_section'; -import { Filter, esQuery, Query } from '../../../../../../../../src/plugins/data/public'; -import { useQuerySignals } from '../../../../containers/detection_engine/signals/use_query'; -import { getDetectionEngineUrl } from '../../../../components/link_to'; -import { defaultLegendColors } from '../../../../components/matrix_histogram/utils'; -import { InspectButtonContainer } from '../../../../components/inspect'; -import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search'; -import { MatrixLoader } from '../../../../components/matrix_histogram/matrix_loader'; -import { MatrixHistogramOption } from '../../../../components/matrix_histogram/types'; -import { useKibana, useUiSetting$ } from '../../../../lib/kibana'; -import { navTabs } from '../../../home/home_navigations'; +import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants'; +import { UpdateDateRange } from '../../../common/components/charts/common'; +import { LegendItem } from '../../../common/components/charts/draggable_legend_item'; +import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers'; +import { HeaderSection } from '../../../common/components/header_section'; +import { Filter, esQuery, Query } from '../../../../../../../src/plugins/data/public'; +import { useQuerySignals } from '../../containers/detection_engine/signals/use_query'; +import { getDetectionEngineUrl } from '../../../common/components/link_to'; +import { defaultLegendColors } from '../../../common/components/matrix_histogram/utils'; +import { InspectButtonContainer } from '../../../common/components/inspect'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { MatrixLoader } from '../../../common/components/matrix_histogram/matrix_loader'; +import { MatrixHistogramOption } from '../../../common/components/matrix_histogram/types'; +import { useKibana, useUiSetting$ } from '../../../common/lib/kibana'; +import { navTabs } from '../../../app/home/home_navigations'; import { signalsHistogramOptions } from './config'; import { formatSignalsData, getSignalsHistogramQuery, showInitialLoadingSpinner } from './helpers'; import { SignalsHistogram } from './signals_histogram'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.test.tsx b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/signals_histogram.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.test.tsx rename to x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/signals_histogram.test.tsx index 6a116efb8f2f8b..f921c00cdafb7b 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/signals_histogram.test.tsx @@ -9,7 +9,7 @@ import { shallow } from 'enzyme'; import { SignalsHistogram } from './signals_histogram'; -jest.mock('../../../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); describe('SignalsHistogram', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/signals_histogram.tsx similarity index 89% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx rename to x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/signals_histogram.tsx index a031f2542b8779..3c6e7b84fd2b41 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/signals_histogram.tsx @@ -15,10 +15,10 @@ import { import { EuiFlexGroup, EuiFlexItem, EuiProgress } from '@elastic/eui'; import React, { useMemo } from 'react'; -import { useTheme, UpdateDateRange } from '../../../../components/charts/common'; -import { histogramDateTimeFormatter } from '../../../../components/utils'; -import { DraggableLegend } from '../../../../components/charts/draggable_legend'; -import { LegendItem } from '../../../../components/charts/draggable_legend_item'; +import { useTheme, UpdateDateRange } from '../../../common/components/charts/common'; +import { histogramDateTimeFormatter } from '../../../common/components/utils'; +import { DraggableLegend } from '../../../common/components/charts/draggable_legend'; +import { LegendItem } from '../../../common/components/charts/draggable_legend_item'; import { HistogramData } from './types'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/translations.ts b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/translations.ts rename to x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/types.ts b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/types.ts similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/types.ts rename to x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/types.ts index 6ef4cecc4ec8b4..41d58a4a7391d9 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/types.ts +++ b/x-pack/plugins/siem/public/alerts/components/signals_histogram_panel/types.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { inputsModel } from '../../../../store'; +import { inputsModel } from '../../../common/store'; export interface SignalsHistogramOption { text: string; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_info/index.tsx b/x-pack/plugins/siem/public/alerts/components/signals_info/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_info/index.tsx rename to x-pack/plugins/siem/public/alerts/components/signals_info/index.tsx index e7cdc3345c031a..b1d7f2cfe7eb52 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_info/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/signals_info/index.tsx @@ -8,7 +8,7 @@ import { EuiLoadingSpinner } from '@elastic/eui'; import { FormattedRelative } from '@kbn/i18n/react'; import React, { useState, useEffect } from 'react'; -import { useQuerySignals } from '../../../../containers/detection_engine/signals/use_query'; +import { useQuerySignals } from '../../containers/detection_engine/signals/use_query'; import { buildLastSignalsQuery } from './query.dsl'; import { Aggs } from './types'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_info/query.dsl.ts b/x-pack/plugins/siem/public/alerts/components/signals_info/query.dsl.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_info/query.dsl.ts rename to x-pack/plugins/siem/public/alerts/components/signals_info/query.dsl.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/signals_info/types.ts b/x-pack/plugins/siem/public/alerts/components/signals_info/types.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/components/signals_info/types.ts rename to x-pack/plugins/siem/public/alerts/components/signals_info/types.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/user_info/index.test.tsx b/x-pack/plugins/siem/public/alerts/components/user_info/index.test.tsx similarity index 71% rename from x-pack/plugins/siem/public/pages/detection_engine/components/user_info/index.test.tsx rename to x-pack/plugins/siem/public/alerts/components/user_info/index.test.tsx index b3d710de5e94e8..81b2c4347e17c7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/user_info/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/components/user_info/index.test.tsx @@ -7,12 +7,12 @@ import { renderHook } from '@testing-library/react-hooks'; import { useUserInfo } from './index'; -import { usePrivilegeUser } from '../../../../containers/detection_engine/signals/use_privilege_user'; -import { useSignalIndex } from '../../../../containers/detection_engine/signals/use_signal_index'; -import { useKibana } from '../../../../lib/kibana'; -jest.mock('../../../../containers/detection_engine/signals/use_privilege_user'); -jest.mock('../../../../containers/detection_engine/signals/use_signal_index'); -jest.mock('../../../../lib/kibana'); +import { usePrivilegeUser } from '../../containers/detection_engine/signals/use_privilege_user'; +import { useSignalIndex } from '../../containers/detection_engine/signals/use_signal_index'; +import { useKibana } from '../../../common/lib/kibana'; +jest.mock('../../containers/detection_engine/signals/use_privilege_user'); +jest.mock('../../containers/detection_engine/signals/use_signal_index'); +jest.mock('../../../common/lib/kibana'); describe('useUserInfo', () => { beforeAll(() => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/components/user_info/index.tsx b/x-pack/plugins/siem/public/alerts/components/user_info/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/detection_engine/components/user_info/index.tsx rename to x-pack/plugins/siem/public/alerts/components/user_info/index.tsx index 9e45371fb6058e..faf90162925595 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/components/user_info/index.tsx +++ b/x-pack/plugins/siem/public/alerts/components/user_info/index.tsx @@ -7,9 +7,9 @@ import { noop } from 'lodash/fp'; import React, { useEffect, useReducer, Dispatch, createContext, useContext } from 'react'; -import { usePrivilegeUser } from '../../../../containers/detection_engine/signals/use_privilege_user'; -import { useSignalIndex } from '../../../../containers/detection_engine/signals/use_signal_index'; -import { useKibana } from '../../../../lib/kibana'; +import { usePrivilegeUser } from '../../containers/detection_engine/signals/use_privilege_user'; +import { useSignalIndex } from '../../containers/detection_engine/signals/use_signal_index'; +import { useKibana } from '../../../common/lib/kibana'; export interface State { canUserCRUD: boolean | null; diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/__mocks__/api.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/__mocks__/api.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/__mocks__/api.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/__mocks__/api.ts diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/api.test.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/api.test.ts similarity index 99% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/api.test.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/api.test.ts index 9eb4acbdb61641..abba7c02cf8757 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/api.test.ts +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/api.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaServices } from '../../../lib/kibana'; +import { KibanaServices } from '../../../../common/lib/kibana'; import { addRule, fetchRules, @@ -23,7 +23,7 @@ import { ruleMock, rulesMock } from './mock'; const abortCtrl = new AbortController(); const mockKibanaServices = KibanaServices.get as jest.Mock; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); const fetchMock = jest.fn(); mockKibanaServices.mockReturnValue({ http: { fetch: fetchMock } }); diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/api.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/api.ts similarity index 98% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/api.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/api.ts index c1fadf289ef4d9..9ae29a740dd870 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/api.ts +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/api.ts @@ -10,7 +10,7 @@ import { DETECTION_ENGINE_RULES_STATUS_URL, DETECTION_ENGINE_PREPACKAGED_RULES_STATUS_URL, DETECTION_ENGINE_TAGS_URL, -} from '../../../../common/constants'; +} from '../../../../../common/constants'; import { AddRulesProps, DeleteRulesProps, @@ -29,7 +29,7 @@ import { PrePackagedRulesStatusResponse, BulkRuleResponse, } from './types'; -import { KibanaServices } from '../../../lib/kibana'; +import { KibanaServices } from '../../../../common/lib/kibana'; import * as i18n from '../../../pages/detection_engine/rules/translations'; /** diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/fetch_index_patterns.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/fetch_index_patterns.test.tsx index 8c688fe5615f00..79d5886f8845f1 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.test.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/fetch_index_patterns.test.tsx @@ -6,14 +6,14 @@ import { renderHook, act } from '@testing-library/react-hooks'; -import { DEFAULT_INDEX_PATTERN } from '../../../../common/constants'; -import { useApolloClient } from '../../../utils/apollo_context'; -import { mocksSource } from '../../source/mock'; +import { DEFAULT_INDEX_PATTERN } from '../../../../../common/constants'; +import { useApolloClient } from '../../../../common/utils/apollo_context'; +import { mocksSource } from '../../../../common/containers/source/mock'; import { useFetchIndexPatterns, Return } from './fetch_index_patterns'; const mockUseApolloClient = useApolloClient as jest.Mock; -jest.mock('../../../utils/apollo_context'); +jest.mock('../../../../common/utils/apollo_context'); describe('useFetchIndexPatterns', () => { beforeEach(() => { diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/fetch_index_patterns.tsx similarity index 89% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/fetch_index_patterns.tsx index 7e222045a1a3ba..dec9f344e16b83 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/fetch_index_patterns.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/fetch_index_patterns.tsx @@ -8,16 +8,16 @@ import { isEmpty, get } from 'lodash/fp'; import { useEffect, useState, Dispatch, SetStateAction } from 'react'; import deepEqual from 'fast-deep-equal'; -import { IIndexPattern } from '../../../../../../../src/plugins/data/public'; +import { IIndexPattern } from '../../../../../../../../src/plugins/data/public'; import { BrowserFields, getBrowserFields, getIndexFields, sourceQuery, -} from '../../../containers/source'; -import { errorToToaster, useStateToaster } from '../../../components/toasters'; -import { SourceQuery } from '../../../graphql/types'; -import { useApolloClient } from '../../../utils/apollo_context'; +} from '../../../../common/containers/source'; +import { errorToToaster, useStateToaster } from '../../../../common/components/toasters'; +import { SourceQuery } from '../../../../graphql/types'; +import { useApolloClient } from '../../../../common/utils/apollo_context'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/index.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/index.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/index.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/index.ts diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/mock.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/mock.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/mock.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/mock.ts diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/persist_rule.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/persist_rule.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/persist_rule.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/persist_rule.test.tsx diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/persist_rule.tsx similarity index 94% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/persist_rule.tsx index 4d4f6c9d8f63a4..03080bf68cbf53 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/persist_rule.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/persist_rule.tsx @@ -6,7 +6,7 @@ import { useEffect, useState, Dispatch } from 'react'; -import { errorToToaster, useStateToaster } from '../../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../../../common/components/toasters'; import { addRule as persistRule } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/translations.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/translations.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/translations.ts diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/types.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/types.ts similarity index 98% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/types.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/types.ts index f89d21ef1aeb19..897568cdbf16ed 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/types.ts +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/types.ts @@ -6,7 +6,7 @@ import * as t from 'io-ts'; -import { RuleTypeSchema } from '../../../../common/detection_engine/types'; +import { RuleTypeSchema } from '../../../../../common/detection_engine/types'; /** * Params is an "record", since it is a type of AlertActionParams which is action templates. diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_pre_packaged_rules.test.tsx diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_pre_packaged_rules.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_pre_packaged_rules.tsx similarity index 98% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_pre_packaged_rules.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_pre_packaged_rules.tsx index 44d5de10e361a0..f1897002e13cde 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_pre_packaged_rules.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_pre_packaged_rules.tsx @@ -6,7 +6,11 @@ import { useEffect, useState } from 'react'; -import { errorToToaster, useStateToaster, displaySuccessToast } from '../../../components/toasters'; +import { + errorToToaster, + useStateToaster, + displaySuccessToast, +} from '../../../../common/components/toasters'; import { getPrePackagedRulesStatus, createPrepackagedRules } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule.test.tsx diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule.tsx similarity index 94% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule.tsx index d6a49e006e1b83..6ae5da3e56ff64 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule.tsx @@ -6,7 +6,7 @@ import { useEffect, useState } from 'react'; -import { errorToToaster, useStateToaster } from '../../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../../../common/components/toasters'; import { fetchRuleById } from './api'; import * as i18n from './translations'; import { Rule } from './types'; diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule_status.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule_status.test.tsx index f74c2bad1019e8..f203eca42cde62 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule_status.test.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule_status.test.tsx @@ -12,7 +12,7 @@ import { ReturnRulesStatuses, } from './use_rule_status'; import * as api from './api'; -import { Rule } from '../rules/types'; +import { Rule } from './types'; jest.mock('./api'); diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule_status.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule_status.tsx similarity index 97% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule_status.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule_status.tsx index 412fc0706b1517..9164f38d2ac287 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rule_status.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rule_status.tsx @@ -6,7 +6,7 @@ import { useEffect, useRef, useState } from 'react'; -import { errorToToaster, useStateToaster } from '../../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../../../common/components/toasters'; import { RuleStatusRowItemType } from '../../../pages/detection_engine/rules/all/columns'; import { getRuleStatusById, getRulesStatusByIds } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rules.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rules.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_rules.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rules.test.tsx diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rules.tsx similarity index 97% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rules.tsx index 6e41e229c24909..3a074f2bc3785a 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_rules.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_rules.tsx @@ -8,7 +8,7 @@ import { noop } from 'lodash/fp'; import { useEffect, useState, useRef } from 'react'; import { FetchRulesResponse, FilterOptions, PaginationOptions, Rule } from './types'; -import { errorToToaster, useStateToaster } from '../../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../../../common/components/toasters'; import { fetchRules } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_tags.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_tags.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_tags.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_tags.test.tsx diff --git a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_tags.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_tags.tsx similarity index 94% rename from x-pack/plugins/siem/public/containers/detection_engine/rules/use_tags.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_tags.tsx index 669efedc619bbc..ebfe73f2f08639 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/rules/use_tags.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/rules/use_tags.tsx @@ -6,7 +6,7 @@ import { noop } from 'lodash/fp'; import { useEffect, useState, useRef } from 'react'; -import { errorToToaster, useStateToaster } from '../../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../../../common/components/toasters'; import { fetchTags } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/__mocks__/api.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/__mocks__/api.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/__mocks__/api.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/__mocks__/api.ts diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/api.test.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/api.test.ts similarity index 97% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/api.test.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/api.test.ts index c011ecffb35bcd..67d81d19faa7c5 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/signals/api.test.ts +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/api.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaServices } from '../../../lib/kibana'; +import { KibanaServices } from '../../../../common/lib/kibana'; import { signalsMock, mockSignalsQuery, @@ -22,7 +22,7 @@ import { const abortCtrl = new AbortController(); const mockKibanaServices = KibanaServices.get as jest.Mock; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); const fetchMock = jest.fn(); mockKibanaServices.mockReturnValue({ http: { fetch: fetchMock } }); diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/api.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/api.ts similarity index 96% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/api.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/api.ts index 1397e4a8696be8..860305dd58e679 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/signals/api.ts +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/api.ts @@ -9,8 +9,8 @@ import { DETECTION_ENGINE_SIGNALS_STATUS_URL, DETECTION_ENGINE_INDEX_URL, DETECTION_ENGINE_PRIVILEGES_URL, -} from '../../../../common/constants'; -import { KibanaServices } from '../../../lib/kibana'; +} from '../../../../../common/constants'; +import { KibanaServices } from '../../../../common/lib/kibana'; import { BasicSignals, Privilege, diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/mock.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/mock.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/mock.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/mock.ts diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/translations.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/translations.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/translations.ts diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/types.ts b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/types.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/types.ts rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/types.ts diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_privilege_user.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_privilege_user.test.tsx diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_privilege_user.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_privilege_user.tsx index 140dd1544b12b0..e67afd686a7cab 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/signals/use_privilege_user.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_privilege_user.tsx @@ -6,7 +6,7 @@ import { useEffect, useState } from 'react'; -import { errorToToaster, useStateToaster } from '../../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../../../common/components/toasters'; import { getUserPrivilege } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/use_query.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_query.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/use_query.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_query.test.tsx diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/use_query.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_query.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/use_query.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_query.tsx diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/use_signal_index.test.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_signal_index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/use_signal_index.test.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_signal_index.test.tsx diff --git a/x-pack/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_signal_index.tsx similarity index 95% rename from x-pack/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx rename to x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_signal_index.tsx index a7f5c9731320e1..6c428bd9354ee3 100644 --- a/x-pack/plugins/siem/public/containers/detection_engine/signals/use_signal_index.tsx +++ b/x-pack/plugins/siem/public/alerts/containers/detection_engine/signals/use_signal_index.tsx @@ -6,10 +6,10 @@ import { useEffect, useState } from 'react'; -import { errorToToaster, useStateToaster } from '../../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../../../common/components/toasters'; import { createSignalIndex, getSignalIndex } from './api'; import * as i18n from './translations'; -import { isApiError } from '../../../utils/api'; +import { isApiError } from '../../../../common/utils/api'; type Func = () => void; diff --git a/x-pack/plugins/siem/public/alerts/index.ts b/x-pack/plugins/siem/public/alerts/index.ts new file mode 100644 index 00000000000000..c1501419a1cf6f --- /dev/null +++ b/x-pack/plugins/siem/public/alerts/index.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { getAlertsRoutes } from './routes'; +import { SecuritySubPlugin } from '../app/types'; + +export class Alerts { + public setup() {} + + public start(): SecuritySubPlugin { + return { + routes: getAlertsRoutes(), + }; + } +} diff --git a/x-pack/plugins/siem/public/pages/detection_engine/mitre/mitre_tactics_techniques.ts b/x-pack/plugins/siem/public/alerts/mitre/mitre_tactics_techniques.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/mitre/mitre_tactics_techniques.ts rename to x-pack/plugins/siem/public/alerts/mitre/mitre_tactics_techniques.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/mitre/types.ts b/x-pack/plugins/siem/public/alerts/mitre/types.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/mitre/types.ts rename to x-pack/plugins/siem/public/alerts/mitre/types.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine.test.tsx similarity index 80% rename from x-pack/plugins/siem/public/pages/detection_engine/detection_engine.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine.test.tsx index 779e9a4557f2af..de8a732839728d 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine.test.tsx @@ -8,13 +8,13 @@ import React from 'react'; import { shallow } from 'enzyme'; import { useParams } from 'react-router-dom'; -import '../../mock/match_media'; -import { setAbsoluteRangeDatePicker } from '../../store/inputs/actions'; +import '../../../common/mock/match_media'; +import { setAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions'; import { DetectionEnginePageComponent } from './detection_engine'; -import { useUserInfo } from './components/user_info'; +import { useUserInfo } from '../../components/user_info'; -jest.mock('./components/user_info'); -jest.mock('../../lib/kibana'); +jest.mock('../../components/user_info'); +jest.mock('../../../common/lib/kibana'); jest.mock('react-router-dom', () => { const originalModule = jest.requireActual('react-router-dom'); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine.tsx similarity index 80% rename from x-pack/plugins/siem/public/pages/detection_engine/detection_engine.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine.tsx index 3e23700b08e66d..a83a85678bd03e 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine.tsx @@ -10,35 +10,38 @@ import { useParams } from 'react-router-dom'; import { StickyContainer } from 'react-sticky'; import { connect, ConnectedProps } from 'react-redux'; -import { GlobalTime } from '../../containers/global_time'; -import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source'; -import { AlertsTable } from '../../components/alerts_viewer/alerts_table'; -import { UpdateDateRange } from '../../components/charts/common'; -import { FiltersGlobal } from '../../components/filters_global'; +import { GlobalTime } from '../../../common/containers/global_time'; +import { + indicesExistOrDataTemporarilyUnavailable, + WithSource, +} from '../../../common/containers/source'; +import { AlertsTable } from '../../../common/components/alerts_viewer/alerts_table'; +import { UpdateDateRange } from '../../../common/components/charts/common'; +import { FiltersGlobal } from '../../../common/components/filters_global'; import { getDetectionEngineTabUrl, getRulesUrl, -} from '../../components/link_to/redirect_to_detection_engine'; -import { SiemSearchBar } from '../../components/search_bar'; -import { WrapperPage } from '../../components/wrapper_page'; -import { SiemNavigation } from '../../components/navigation'; -import { NavTab } from '../../components/navigation/types'; -import { State } from '../../store'; -import { inputsSelectors } from '../../store/inputs'; -import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions'; -import { SpyRoute } from '../../utils/route/spy_routes'; -import { InputsRange } from '../../store/inputs/model'; -import { AlertsByCategory } from '../overview/alerts_by_category'; -import { useSignalInfo } from './components/signals_info'; -import { SignalsTable } from './components/signals'; -import { NoApiIntegrationKeyCallOut } from './components/no_api_integration_callout'; -import { NoWriteSignalsCallOut } from './components/no_write_signals_callout'; -import { SignalsHistogramPanel } from './components/signals_histogram_panel'; -import { signalsHistogramOptions } from './components/signals_histogram_panel/config'; -import { useUserInfo } from './components/user_info'; +} from '../../../common/components/link_to/redirect_to_detection_engine'; +import { SiemSearchBar } from '../../../common/components/search_bar'; +import { WrapperPage } from '../../../common/components/wrapper_page'; +import { SiemNavigation } from '../../../common/components/navigation'; +import { NavTab } from '../../../common/components/navigation/types'; +import { State } from '../../../common/store'; +import { inputsSelectors } from '../../../common/store/inputs'; +import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions'; +import { SpyRoute } from '../../../common/utils/route/spy_routes'; +import { InputsRange } from '../../../common/store/inputs/model'; +import { AlertsByCategory } from '../../../overview/components/alerts_by_category'; +import { useSignalInfo } from '../../components/signals_info'; +import { SignalsTable } from '../../components/signals'; +import { NoApiIntegrationKeyCallOut } from '../../components/no_api_integration_callout'; +import { NoWriteSignalsCallOut } from '../../components/no_write_signals_callout'; +import { SignalsHistogramPanel } from '../../components/signals_histogram_panel'; +import { signalsHistogramOptions } from '../../components/signals_histogram_panel/config'; +import { useUserInfo } from '../../components/user_info'; import { DetectionEngineEmptyPage } from './detection_engine_empty_page'; import { DetectionEngineNoIndex } from './detection_engine_no_signal_index'; -import { DetectionEngineHeaderPage } from './components/detection_engine_header_page'; +import { DetectionEngineHeaderPage } from '../../components/detection_engine_header_page'; import { DetectionEngineUserUnauthenticated } from './detection_engine_user_unauthenticated'; import * as i18n from './translations'; import { DetectionEngineTab } from './types'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_empty_page.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_empty_page.test.tsx index f64526fd2f7c46..039c878b121a09 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_empty_page.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DetectionEngineEmptyPage } from './detection_engine_empty_page'; -jest.mock('../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); describe('DetectionEngineEmptyPage', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_empty_page.tsx similarity index 83% rename from x-pack/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_empty_page.tsx index 7516bb13a9e750..3d8f221a023754 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_empty_page.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_empty_page.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import { useKibana } from '../../lib/kibana'; -import { EmptyPage } from '../../components/empty_page'; -import * as i18n from '../common/translations'; +import { useKibana } from '../../../common/lib/kibana'; +import { EmptyPage } from '../../../common/components/empty_page'; +import * as i18n from '../../../common/translations'; export const DetectionEngineEmptyPage = React.memo(() => ( { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_no_signal_index.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_no_signal_index.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/detection_engine/detection_engine_no_signal_index.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_no_signal_index.tsx index f1478ab5858c9a..59267b5d62a26d 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_no_signal_index.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_no_signal_index.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import { EmptyPage } from '../../components/empty_page'; +import { EmptyPage } from '../../../common/components/empty_page'; import * as i18n from './translations'; -import { useKibana } from '../../lib/kibana'; +import { useKibana } from '../../../common/lib/kibana'; export const DetectionEngineNoIndex = React.memo(() => { const docLinks = useKibana().services.docLinks; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx index e71f4de2b010bb..5a1efe1c71857b 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { DetectionEngineUserUnauthenticated } from './detection_engine_user_unauthenticated'; -jest.mock('../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); describe('DetectionEngineUserUnauthenticated', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_user_unauthenticated.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/detection_engine/detection_engine_user_unauthenticated.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.tsx index b5c805f92135ad..fc1fee1077bd65 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/detection_engine_user_unauthenticated.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/detection_engine_user_unauthenticated.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import { EmptyPage } from '../../components/empty_page'; +import { EmptyPage } from '../../../common/components/empty_page'; import * as i18n from './translations'; -import { useKibana } from '../../lib/kibana'; +import { useKibana } from '../../../common/lib/kibana'; export const DetectionEngineUserUnauthenticated = React.memo(() => { const docLinks = useKibana().services.docLinks; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/index.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/index.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/index.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/index.test.tsx index 6c4980f1d15002..d4e654321ef988 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/index.test.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import '../../mock/match_media'; +import '../../../common/mock/match_media'; import { DetectionEngineContainer } from './index'; describe('DetectionEngineContainer', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/index.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/detection_engine/index.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/index.tsx index 15093488195106..756e222c029502 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/index.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/index.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom'; -import { ManageUserInfo } from './components/user_info'; +import { ManageUserInfo } from '../../components/user_info'; import { CreateRulePage } from './rules/create'; import { DetectionEnginePage } from './detection_engine'; import { EditRulePage } from './rules/edit'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/__mocks__/mock.ts similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/__mocks__/mock.ts index 66964fae70f941..1b43a513d0d297 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/__mocks__/mock.ts +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/__mocks__/mock.ts @@ -4,10 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import { esFilters } from '../../../../../../../../../src/plugins/data/public'; -import { Rule, RuleError } from '../../../../../containers/detection_engine/rules'; +import { esFilters } from '../../../../../../../../../../src/plugins/data/public'; +import { Rule, RuleError } from '../../../../../../alerts/containers/detection_engine/rules'; import { AboutStepRule, ActionsStepRule, DefineStepRule, ScheduleStepRule } from '../../types'; -import { FieldValueQueryBar } from '../../components/query_bar'; +import { FieldValueQueryBar } from '../../../../../../alerts/components/rules/query_bar'; export const mockQueryBar: FieldValueQueryBar = { query: { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/actions.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/actions.tsx index bc5d0c32bb9c6c..5ed7221b68bf35 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/actions.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/actions.tsx @@ -7,13 +7,13 @@ import * as H from 'history'; import React, { Dispatch } from 'react'; -import { DETECTION_ENGINE_PAGE_NAME } from '../../../../components/link_to/redirect_to_detection_engine'; +import { DETECTION_ENGINE_PAGE_NAME } from '../../../../../common/components/link_to/redirect_to_detection_engine'; import { deleteRules, duplicateRules, enableRules, Rule, -} from '../../../../containers/detection_engine/rules'; +} from '../../../../../alerts/containers/detection_engine/rules'; import { Action } from './reducer'; import { @@ -21,8 +21,8 @@ import { displayErrorToast, displaySuccessToast, errorToToaster, -} from '../../../../components/toasters'; -import { track, METRIC_TYPE, TELEMETRY_EVENT } from '../../../../lib/telemetry'; +} from '../../../../../common/components/toasters'; +import { track, METRIC_TYPE, TELEMETRY_EVENT } from '../../../../../common/lib/telemetry'; import * as i18n from '../translations'; import { bucketRulesResponse } from './helpers'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/batch_actions.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/batch_actions.tsx index 454ef18e0ae143..769839a62091b0 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/batch_actions.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/batch_actions.tsx @@ -14,8 +14,8 @@ import { enableRulesAction, exportRulesAction, } from './actions'; -import { ActionToaster, displayWarningToast } from '../../../../components/toasters'; -import { Rule } from '../../../../containers/detection_engine/rules'; +import { ActionToaster, displayWarningToast } from '../../../../../common/components/toasters'; +import { Rule } from '../../../../../alerts/containers/detection_engine/rules'; import * as detectionI18n from '../../translations'; interface GetBatchItems { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/columns.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/columns.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/columns.tsx similarity index 90% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/columns.tsx index 542a004cb37272..224a32ef6ac9d8 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/columns.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/columns.tsx @@ -19,16 +19,16 @@ import { FormattedRelative } from '@kbn/i18n/react'; import * as H from 'history'; import React, { Dispatch } from 'react'; -import { isMlRule } from '../../../../../common/machine_learning/helpers'; -import { Rule, RuleStatus } from '../../../../containers/detection_engine/rules'; -import { getEmptyTagValue } from '../../../../components/empty_value'; -import { FormattedDate } from '../../../../components/formatted_date'; -import { getRuleDetailsUrl } from '../../../../components/link_to/redirect_to_detection_engine'; -import { ActionToaster } from '../../../../components/toasters'; -import { TruncatableText } from '../../../../components/truncatable_text'; -import { getStatusColor } from '../components/rule_status/helpers'; -import { RuleSwitch } from '../components/rule_switch'; -import { SeverityBadge } from '../components/severity_badge'; +import { isMlRule } from '../../../../../../common/machine_learning/helpers'; +import { Rule, RuleStatus } from '../../../../../alerts/containers/detection_engine/rules'; +import { getEmptyTagValue } from '../../../../../common/components/empty_value'; +import { FormattedDate } from '../../../../../common/components/formatted_date'; +import { getRuleDetailsUrl } from '../../../../../common/components/link_to/redirect_to_detection_engine'; +import { ActionToaster } from '../../../../../common/components/toasters'; +import { TruncatableText } from '../../../../../common/components/truncatable_text'; +import { getStatusColor } from '../../../../components/rules/rule_status/helpers'; +import { RuleSwitch } from '../../../../components/rules/rule_switch'; +import { SeverityBadge } from '../../../../components/rules/severity_badge'; import * as i18n from '../translations'; import { deleteRulesAction, @@ -37,7 +37,7 @@ import { exportRulesAction, } from './actions'; import { Action } from './reducer'; -import { LocalizedDateTooltip } from '../../../../components/localized_date_tooltip'; +import { LocalizedDateTooltip } from '../../../../../common/components/localized_date_tooltip'; import * as detectionI18n from '../../translations'; export const getActions = ( diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/helpers.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/helpers.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/helpers.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/helpers.test.tsx index 062d7967bf3018..7350cec0115fb9 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/helpers.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/helpers.test.tsx @@ -7,7 +7,7 @@ import { bucketRulesResponse, showRulesTable } from './helpers'; import { mockRule, mockRuleError } from './__mocks__/mock'; import uuid from 'uuid'; -import { Rule, RuleError } from '../../../../containers/detection_engine/rules'; +import { Rule, RuleError } from '../../../../../alerts/containers/detection_engine/rules'; describe('AllRulesTable Helpers', () => { const mockRule1: Readonly = mockRule(uuid.v4()); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/helpers.ts similarity index 94% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/helpers.ts index 0ebeb84d57468c..632d03cebef713 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/helpers.ts +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/helpers.ts @@ -7,7 +7,7 @@ import { BulkRuleResponse, RuleResponseBuckets, -} from '../../../../containers/detection_engine/rules'; +} from '../../../../../alerts/containers/detection_engine/rules'; /** * Separates rules/errors from bulk rules API response (create/update/delete) diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/index.test.tsx index 59b3b02ff3587a..11909ae7d9c531 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/index.test.tsx @@ -8,9 +8,9 @@ import React from 'react'; import { shallow, mount } from 'enzyme'; import { act } from 'react-dom/test-utils'; -import { createKibanaContextProviderMock } from '../../../../mock/kibana_react'; -import { TestProviders } from '../../../../mock'; -import { wait } from '../../../../lib/helpers'; +import { createKibanaContextProviderMock } from '../../../../../common/mock/kibana_react'; +import { TestProviders } from '../../../../../common/mock'; +import { wait } from '../../../../../common/lib/helpers'; import { AllRules } from './index'; jest.mock('./reducer', () => { @@ -67,7 +67,7 @@ jest.mock('./reducer', () => { }; }); -jest.mock('../../../../containers/detection_engine/rules', () => { +jest.mock('../../../../../alerts/containers/detection_engine/rules', () => { return { useRules: jest.fn().mockReturnValue([ false, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/index.tsx index d9a2fafd144bcb..c1fd24e24a38bb 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/index.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/index.tsx @@ -24,21 +24,21 @@ import { Rule, PaginationOptions, exportRules, -} from '../../../../containers/detection_engine/rules'; -import { HeaderSection } from '../../../../components/header_section'; +} from '../../../../../alerts/containers/detection_engine/rules'; +import { HeaderSection } from '../../../../../common/components/header_section'; import { UtilityBar, UtilityBarAction, UtilityBarGroup, UtilityBarSection, UtilityBarText, -} from '../../../../components/utility_bar'; -import { useStateToaster } from '../../../../components/toasters'; -import { Loader } from '../../../../components/loader'; -import { Panel } from '../../../../components/panel'; -import { PrePackagedRulesPrompt } from '../components/pre_packaged_rules/load_empty_prompt'; -import { GenericDownloader } from '../../../../components/generic_downloader'; -import { AllRulesTables, SortingType } from '../components/all_rules_tables'; +} from '../../../../../common/components/utility_bar'; +import { useStateToaster } from '../../../../../common/components/toasters'; +import { Loader } from '../../../../../common/components/loader'; +import { Panel } from '../../../../../common/components/panel'; +import { PrePackagedRulesPrompt } from '../../../../components/rules/pre_packaged_rules/load_empty_prompt'; +import { GenericDownloader } from '../../../../../common/components/generic_downloader'; +import { AllRulesTables, SortingType } from '../../../../components/rules/all_rules_tables'; import { getPrePackagedRuleStatus } from '../helpers'; import * as i18n from '../translations'; import { EuiBasicTableOnChange } from '../types'; @@ -47,8 +47,8 @@ import { getColumns, getMonitoringColumns } from './columns'; import { showRulesTable } from './helpers'; import { allRulesReducer, State } from './reducer'; import { RulesTableFilters } from './rules_table_filters/rules_table_filters'; -import { useMlCapabilities } from '../../../../components/ml_popover/hooks/use_ml_capabilities'; -import { hasMlAdminPermissions } from '../../../../../common/machine_learning/has_ml_admin_permissions'; +import { useMlCapabilities } from '../../../../../common/components/ml_popover/hooks/use_ml_capabilities'; +import { hasMlAdminPermissions } from '../../../../../../common/machine_learning/has_ml_admin_permissions'; const SORT_FIELD = 'enabled'; const initialState: State = { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/reducer.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/reducer.ts similarity index 98% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/reducer.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/reducer.ts index bc5297e7628b7f..72559d84eeab42 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/reducer.ts +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/reducer.ts @@ -9,7 +9,7 @@ import { FilterOptions, PaginationOptions, Rule, -} from '../../../../containers/detection_engine/rules'; +} from '../../../../../alerts/containers/detection_engine/rules'; type LoadingRuleAction = 'duplicate' | 'enable' | 'disable' | 'export' | 'delete' | null; export interface State { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx index ddb8894c206b56..de4804f37f1bc9 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/rules_table_filters.tsx @@ -16,8 +16,8 @@ import { import { isEqual } from 'lodash/fp'; import * as i18n from '../../translations'; -import { FilterOptions } from '../../../../../containers/detection_engine/rules'; -import { useTags } from '../../../../../containers/detection_engine/rules/use_tags'; +import { FilterOptions } from '../../../../../../alerts/containers/detection_engine/rules'; +import { useTags } from '../../../../../../alerts/containers/detection_engine/rules/use_tags'; import { TagsFilterPopover } from './tags_filter_popover'; interface RulesTableFiltersProps { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx index 44149a072f5c1e..b453125223c307 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/all/rules_table_filters/tags_filter_popover.tsx @@ -16,7 +16,7 @@ import { } from '@elastic/eui'; import styled from 'styled-components'; import * as i18n from '../../translations'; -import { toggleSelectedGroup } from '../../../../../components/ml_popover/jobs_table/filters/toggle_selected_group'; +import { toggleSelectedGroup } from '../../../../../../common/components/ml_popover/jobs_table/filters/toggle_selected_group'; interface TagsFilterPopoverProps { selectedTags: string[]; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/helpers.test.ts similarity index 99% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/helpers.test.ts index 8d793f39afa997..1894d0ab1a9e7b 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.test.ts +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/helpers.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { NewRule } from '../../../../containers/detection_engine/rules'; +import { NewRule } from '../../../../../alerts/containers/detection_engine/rules'; import { DefineStepRuleJson, ScheduleStepRuleJson, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/helpers.ts similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/helpers.ts index b912c182a7c658..7f200ef421c489 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/helpers.ts +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/helpers.ts @@ -8,11 +8,11 @@ import { has, isEmpty } from 'lodash/fp'; import moment from 'moment'; import deepmerge from 'deepmerge'; -import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../common/constants'; -import { transformAlertToRuleAction } from '../../../../../common/detection_engine/transform_actions'; -import { RuleType } from '../../../../../common/detection_engine/types'; -import { isMlRule } from '../../../../../common/machine_learning/helpers'; -import { NewRule } from '../../../../containers/detection_engine/rules'; +import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../../common/constants'; +import { transformAlertToRuleAction } from '../../../../../../common/detection_engine/transform_actions'; +import { RuleType } from '../../../../../../common/detection_engine/types'; +import { isMlRule } from '../../../../../../common/machine_learning/helpers'; +import { NewRule } from '../../../../../alerts/containers/detection_engine/rules'; import { AboutStepRule, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/index.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/index.test.tsx similarity index 78% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/create/index.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/index.test.tsx index db32be652d0f76..7749e38578e906 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/index.test.tsx @@ -7,11 +7,11 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../../../common/mock'; import { CreateRulePage } from './index'; -import { useUserInfo } from '../../components/user_info'; +import { useUserInfo } from '../../../../components/user_info'; -jest.mock('../../components/user_info'); +jest.mock('../../../../components/user_info'); describe('CreateRulePage', () => { it('renders correctly', () => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/index.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/create/index.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/index.tsx index 2686bb47925b6c..5cf7f9e5b15a30 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/index.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/index.tsx @@ -9,20 +9,20 @@ import React, { useCallback, useRef, useState, useMemo } from 'react'; import { Redirect } from 'react-router-dom'; import styled, { StyledComponent } from 'styled-components'; -import { usePersistRule } from '../../../../containers/detection_engine/rules'; +import { usePersistRule } from '../../../../../alerts/containers/detection_engine/rules'; -import { DETECTION_ENGINE_PAGE_NAME } from '../../../../components/link_to/redirect_to_detection_engine'; -import { WrapperPage } from '../../../../components/wrapper_page'; -import { displaySuccessToast, useStateToaster } from '../../../../components/toasters'; -import { SpyRoute } from '../../../../utils/route/spy_routes'; -import { useUserInfo } from '../../components/user_info'; -import { AccordionTitle } from '../components/accordion_title'; -import { FormData, FormHook } from '../../../../shared_imports'; -import { StepAboutRule } from '../components/step_about_rule'; -import { StepDefineRule } from '../components/step_define_rule'; -import { StepScheduleRule } from '../components/step_schedule_rule'; -import { StepRuleActions } from '../components/step_rule_actions'; -import { DetectionEngineHeaderPage } from '../../components/detection_engine_header_page'; +import { DETECTION_ENGINE_PAGE_NAME } from '../../../../../common/components/link_to/redirect_to_detection_engine'; +import { WrapperPage } from '../../../../../common/components/wrapper_page'; +import { displaySuccessToast, useStateToaster } from '../../../../../common/components/toasters'; +import { SpyRoute } from '../../../../../common/utils/route/spy_routes'; +import { useUserInfo } from '../../../../components/user_info'; +import { AccordionTitle } from '../../../../components/rules/accordion_title'; +import { FormData, FormHook } from '../../../../../shared_imports'; +import { StepAboutRule } from '../../../../components/rules/step_about_rule'; +import { StepDefineRule } from '../../../../components/rules/step_define_rule'; +import { StepScheduleRule } from '../../../../components/rules/step_schedule_rule'; +import { StepRuleActions } from '../../../../components/rules/step_rule_actions'; +import { DetectionEngineHeaderPage } from '../../../../components/detection_engine_header_page'; import * as RuleI18n from '../translations'; import { redirectToDetections, getActionMessageParams, userHasNoPermissions } from '../helpers'; import { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/create/translations.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/create/translations.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/create/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/failure_history.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/failure_history.test.tsx similarity index 76% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/details/failure_history.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/failure_history.test.tsx index a83ff4c54b0761..fc16bcd96f7665 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/failure_history.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/failure_history.test.tsx @@ -7,10 +7,10 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../../../common/mock'; import { FailureHistory } from './failure_history'; -import { useRuleStatus } from '../../../../containers/detection_engine/rules'; -jest.mock('../../../../containers/detection_engine/rules'); +import { useRuleStatus } from '../../../../../alerts/containers/detection_engine/rules'; +jest.mock('../../../../../alerts/containers/detection_engine/rules'); describe('FailureHistory', () => { beforeAll(() => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/failure_history.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/failure_history.tsx similarity index 87% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/details/failure_history.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/failure_history.tsx index f660c1763d5e01..f03f320c514184 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/failure_history.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/failure_history.tsx @@ -15,10 +15,13 @@ import { } from '@elastic/eui'; import React, { memo } from 'react'; -import { useRuleStatus, RuleInfoStatus } from '../../../../containers/detection_engine/rules'; -import { HeaderSection } from '../../../../components/header_section'; +import { + useRuleStatus, + RuleInfoStatus, +} from '../../../../../alerts/containers/detection_engine/rules'; +import { HeaderSection } from '../../../../../common/components/header_section'; import * as i18n from './translations'; -import { FormattedDate } from '../../../../components/formatted_date'; +import { FormattedDate } from '../../../../../common/components/formatted_date'; interface FailureHistoryProps { id?: string | null; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/index.test.tsx similarity index 78% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/index.test.tsx index 19c6f39a9bc7ef..d755f972f29501 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/index.test.tsx @@ -7,14 +7,14 @@ import React from 'react'; import { shallow } from 'enzyme'; -import '../../../../mock/match_media'; -import { TestProviders } from '../../../../mock'; +import '../../../../../common/mock/match_media'; +import { TestProviders } from '../../../../../common/mock'; import { RuleDetailsPageComponent } from './index'; -import { setAbsoluteRangeDatePicker } from '../../../../store/inputs/actions'; -import { useUserInfo } from '../../components/user_info'; +import { setAbsoluteRangeDatePicker } from '../../../../../common/store/inputs/actions'; +import { useUserInfo } from '../../../../components/user_info'; import { useParams } from 'react-router-dom'; -jest.mock('../../components/user_info'); +jest.mock('../../../../components/user_info'); jest.mock('react-router-dom', () => { const originalModule = jest.requireActual('react-router-dom'); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/index.tsx similarity index 84% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/index.tsx index 6a43c217e5ff5b..60491387c492d7 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/index.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/index.tsx @@ -22,54 +22,54 @@ import { Redirect, useParams } from 'react-router-dom'; import { StickyContainer } from 'react-sticky'; import { connect, ConnectedProps } from 'react-redux'; -import { UpdateDateRange } from '../../../../components/charts/common'; -import { FiltersGlobal } from '../../../../components/filters_global'; -import { FormattedDate } from '../../../../components/formatted_date'; +import { UpdateDateRange } from '../../../../../common/components/charts/common'; +import { FiltersGlobal } from '../../../../../common/components/filters_global'; +import { FormattedDate } from '../../../../../common/components/formatted_date'; import { getEditRuleUrl, getRulesUrl, DETECTION_ENGINE_PAGE_NAME, -} from '../../../../components/link_to/redirect_to_detection_engine'; -import { SiemSearchBar } from '../../../../components/search_bar'; -import { WrapperPage } from '../../../../components/wrapper_page'; -import { useRule } from '../../../../containers/detection_engine/rules'; +} from '../../../../../common/components/link_to/redirect_to_detection_engine'; +import { SiemSearchBar } from '../../../../../common/components/search_bar'; +import { WrapperPage } from '../../../../../common/components/wrapper_page'; +import { useRule } from '../../../../../alerts/containers/detection_engine/rules'; import { indicesExistOrDataTemporarilyUnavailable, WithSource, -} from '../../../../containers/source'; -import { SpyRoute } from '../../../../utils/route/spy_routes'; +} from '../../../../../common/containers/source'; +import { SpyRoute } from '../../../../../common/utils/route/spy_routes'; -import { StepAboutRuleToggleDetails } from '../components/step_about_rule_details/'; -import { DetectionEngineHeaderPage } from '../../components/detection_engine_header_page'; -import { SignalsHistogramPanel } from '../../components/signals_histogram_panel'; -import { SignalsTable } from '../../components/signals'; -import { useUserInfo } from '../../components/user_info'; +import { StepAboutRuleToggleDetails } from '../../../../components/rules/step_about_rule_details'; +import { DetectionEngineHeaderPage } from '../../../../components/detection_engine_header_page'; +import { SignalsHistogramPanel } from '../../../../components/signals_histogram_panel'; +import { SignalsTable } from '../../../../components/signals'; +import { useUserInfo } from '../../../../components/user_info'; import { DetectionEngineEmptyPage } from '../../detection_engine_empty_page'; -import { useSignalInfo } from '../../components/signals_info'; -import { StepDefineRule } from '../components/step_define_rule'; -import { StepScheduleRule } from '../components/step_schedule_rule'; -import { buildSignalsRuleIdFilter } from '../../components/signals/default_config'; -import { NoWriteSignalsCallOut } from '../../components/no_write_signals_callout'; +import { useSignalInfo } from '../../../../components/signals_info'; +import { StepDefineRule } from '../../../../components/rules/step_define_rule'; +import { StepScheduleRule } from '../../../../components/rules/step_schedule_rule'; +import { buildSignalsRuleIdFilter } from '../../../../components/signals/default_config'; +import { NoWriteSignalsCallOut } from '../../../../components/no_write_signals_callout'; import * as detectionI18n from '../../translations'; -import { ReadOnlyCallOut } from '../components/read_only_callout'; -import { RuleSwitch } from '../components/rule_switch'; -import { StepPanel } from '../components/step_panel'; +import { ReadOnlyCallOut } from '../../../../components/rules/read_only_callout'; +import { RuleSwitch } from '../../../../components/rules/rule_switch'; +import { StepPanel } from '../../../../components/rules/step_panel'; import { getStepsData, redirectToDetections, userHasNoPermissions } from '../helpers'; import * as ruleI18n from '../translations'; import * as i18n from './translations'; -import { GlobalTime } from '../../../../containers/global_time'; -import { signalsHistogramOptions } from '../../components/signals_histogram_panel/config'; -import { inputsSelectors } from '../../../../store/inputs'; -import { State } from '../../../../store'; -import { InputsRange } from '../../../../store/inputs/model'; -import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../../../store/inputs/actions'; -import { RuleActionsOverflow } from '../components/rule_actions_overflow'; +import { GlobalTime } from '../../../../../common/containers/global_time'; +import { signalsHistogramOptions } from '../../../../components/signals_histogram_panel/config'; +import { inputsSelectors } from '../../../../../common/store/inputs'; +import { State } from '../../../../../common/store'; +import { InputsRange } from '../../../../../common/store/inputs/model'; +import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../../../../common/store/inputs/actions'; +import { RuleActionsOverflow } from '../../../../components/rules/rule_actions_overflow'; import { RuleStatusFailedCallOut } from './status_failed_callout'; import { FailureHistory } from './failure_history'; -import { RuleStatus } from '../components/rule_status'; -import { useMlCapabilities } from '../../../../components/ml_popover/hooks/use_ml_capabilities'; -import { hasMlAdminPermissions } from '../../../../../common/machine_learning/has_ml_admin_permissions'; +import { RuleStatus } from '../../../../components/rules//rule_status'; +import { useMlCapabilities } from '../../../../../common/components/ml_popover/hooks/use_ml_capabilities'; +import { hasMlAdminPermissions } from '../../../../../../common/machine_learning/has_ml_admin_permissions'; enum RuleDetailTabs { signals = 'signals', diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/status_failed_callout.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/status_failed_callout.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/details/status_failed_callout.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/status_failed_callout.test.tsx diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/status_failed_callout.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/status_failed_callout.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/details/status_failed_callout.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/status_failed_callout.tsx index d1699a83becafa..5b5b96ace8670c 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/status_failed_callout.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/status_failed_callout.tsx @@ -7,7 +7,7 @@ import { EuiCallOut, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import React, { memo } from 'react'; -import { FormattedDate } from '../../../../components/formatted_date'; +import { FormattedDate } from '../../../../../common/components/formatted_date'; import * as i18n from './translations'; interface RuleStatusFailedCallOutComponentProps { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/details/translations.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/details/translations.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/details/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/edit/index.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/edit/index.test.tsx similarity index 84% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/edit/index.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/edit/index.test.tsx index d22bc12abf9fa1..91bc2ce7bce253 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/edit/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/edit/index.test.tsx @@ -7,12 +7,12 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../../../common/mock'; import { EditRulePage } from './index'; -import { useUserInfo } from '../../components/user_info'; +import { useUserInfo } from '../../../../components/user_info'; import { useParams } from 'react-router-dom'; -jest.mock('../../components/user_info'); +jest.mock('../../../../components/user_info'); jest.mock('react-router-dom', () => { const originalModule = jest.requireActual('react-router-dom'); diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/edit/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/edit/index.tsx index c42e7b902cd5c5..041f932c412cf4 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/edit/index.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/edit/index.tsx @@ -19,19 +19,19 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React, { FC, memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Redirect, useParams } from 'react-router-dom'; -import { useRule, usePersistRule } from '../../../../containers/detection_engine/rules'; -import { WrapperPage } from '../../../../components/wrapper_page'; -import { DETECTION_ENGINE_PAGE_NAME } from '../../../../components/link_to/redirect_to_detection_engine'; -import { displaySuccessToast, useStateToaster } from '../../../../components/toasters'; -import { SpyRoute } from '../../../../utils/route/spy_routes'; -import { useUserInfo } from '../../components/user_info'; -import { DetectionEngineHeaderPage } from '../../components/detection_engine_header_page'; -import { FormHook, FormData } from '../../../../shared_imports'; -import { StepPanel } from '../components/step_panel'; -import { StepAboutRule } from '../components/step_about_rule'; -import { StepDefineRule } from '../components/step_define_rule'; -import { StepScheduleRule } from '../components/step_schedule_rule'; -import { StepRuleActions } from '../components/step_rule_actions'; +import { useRule, usePersistRule } from '../../../../../alerts/containers/detection_engine/rules'; +import { WrapperPage } from '../../../../../common/components/wrapper_page'; +import { DETECTION_ENGINE_PAGE_NAME } from '../../../../../common/components/link_to/redirect_to_detection_engine'; +import { displaySuccessToast, useStateToaster } from '../../../../../common/components/toasters'; +import { SpyRoute } from '../../../../../common/utils/route/spy_routes'; +import { useUserInfo } from '../../../../components/user_info'; +import { DetectionEngineHeaderPage } from '../../../../components/detection_engine_header_page'; +import { FormHook, FormData } from '../../../../../shared_imports'; +import { StepPanel } from '../../../../components/rules/step_panel'; +import { StepAboutRule } from '../../../../components/rules/step_about_rule'; +import { StepDefineRule } from '../../../../components/rules/step_define_rule'; +import { StepScheduleRule } from '../../../../components/rules/step_schedule_rule'; +import { StepRuleActions } from '../../../../components/rules/step_rule_actions'; import { formatRule } from '../create/helpers'; import { getStepsData, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/edit/translations.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/edit/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/edit/translations.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/edit/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/helpers.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/helpers.test.tsx index f2a04a87ced278..6c64577b083df0 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/helpers.test.tsx @@ -17,8 +17,8 @@ import { userHasNoPermissions, } from './helpers'; import { mockRuleWithEverything, mockRule } from './all/__mocks__/mock'; -import { esFilters } from '../../../../../../../src/plugins/data/public'; -import { Rule } from '../../../containers/detection_engine/rules'; +import { esFilters } from '../../../../../../../../src/plugins/data/public'; +import { Rule } from '../../../../alerts/containers/detection_engine/rules'; import { AboutStepRule, AboutStepRuleDetails, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/helpers.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/helpers.tsx index 3dbcf3b2425cc6..8fbb8babe90c7b 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/helpers.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/helpers.tsx @@ -10,12 +10,12 @@ import moment from 'moment'; import memoizeOne from 'memoize-one'; import { useLocation } from 'react-router-dom'; -import { RuleAlertAction, RuleType } from '../../../../common/detection_engine/types'; -import { isMlRule } from '../../../../common/machine_learning/helpers'; -import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions'; -import { Filter } from '../../../../../../../src/plugins/data/public'; -import { Rule } from '../../../containers/detection_engine/rules'; -import { FormData, FormHook, FormSchema } from '../../../shared_imports'; +import { RuleAlertAction, RuleType } from '../../../../../common/detection_engine/types'; +import { isMlRule } from '../../../../../common/machine_learning/helpers'; +import { transformRuleToAlertAction } from '../../../../../common/detection_engine/transform_actions'; +import { Filter } from '../../../../../../../../src/plugins/data/public'; +import { Rule } from '../../../../alerts/containers/detection_engine/rules'; +import { FormData, FormHook, FormSchema } from '../../../../shared_imports'; import { AboutStepRule, AboutStepRuleDetails, diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/index.test.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/index.test.tsx similarity index 71% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/index.test.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/index.test.tsx index 3fa81ca3ced086..29f875d113a424 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/index.test.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/index.test.tsx @@ -8,11 +8,11 @@ import React from 'react'; import { shallow } from 'enzyme'; import { RulesPage } from './index'; -import { useUserInfo } from '../components/user_info'; -import { usePrePackagedRules } from '../../../containers/detection_engine/rules'; +import { useUserInfo } from '../../../components/user_info'; +import { usePrePackagedRules } from '../../../../alerts/containers/detection_engine/rules'; -jest.mock('../components/user_info'); -jest.mock('../../../containers/detection_engine/rules'); +jest.mock('../../../components/user_info'); +jest.mock('../../../../alerts/containers/detection_engine/rules'); describe('RulesPage', () => { beforeAll(() => { diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/index.tsx b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/index.tsx similarity index 89% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/index.tsx rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/index.tsx index 8831bc77691fa7..7a9620df3a7b37 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/index.tsx +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/index.tsx @@ -8,21 +8,24 @@ import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import React, { useCallback, useRef, useState } from 'react'; import { Redirect } from 'react-router-dom'; -import { usePrePackagedRules, importRules } from '../../../containers/detection_engine/rules'; +import { + usePrePackagedRules, + importRules, +} from '../../../../alerts/containers/detection_engine/rules'; import { DETECTION_ENGINE_PAGE_NAME, getDetectionEngineUrl, getCreateRuleUrl, -} from '../../../components/link_to/redirect_to_detection_engine'; -import { DetectionEngineHeaderPage } from '../components/detection_engine_header_page'; -import { WrapperPage } from '../../../components/wrapper_page'; -import { SpyRoute } from '../../../utils/route/spy_routes'; +} from '../../../../common/components/link_to/redirect_to_detection_engine'; +import { DetectionEngineHeaderPage } from '../../../components/detection_engine_header_page'; +import { WrapperPage } from '../../../../common/components/wrapper_page'; +import { SpyRoute } from '../../../../common/utils/route/spy_routes'; -import { useUserInfo } from '../components/user_info'; +import { useUserInfo } from '../../../components/user_info'; import { AllRules } from './all'; -import { ImportDataModal } from '../../../components/import_data_modal'; -import { ReadOnlyCallOut } from './components/read_only_callout'; -import { UpdatePrePackagedRulesCallOut } from './components/pre_packaged_rules/update_callout'; +import { ImportDataModal } from '../../../../common/components/import_data_modal'; +import { ReadOnlyCallOut } from '../../../components/rules/read_only_callout'; +import { UpdatePrePackagedRulesCallOut } from '../../../components/rules/pre_packaged_rules/update_callout'; import { getPrePackagedRuleStatus, redirectToDetections, userHasNoPermissions } from './helpers'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/translations.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/translations.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/types.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/types.ts similarity index 87% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/types.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/types.ts index dcb5397d28f7ce..92c9780a117221 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/types.ts +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/types.ts @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import { RuleAlertAction, RuleType } from '../../../../common/detection_engine/types'; -import { AlertAction } from '../../../../../alerting/common'; -import { Filter } from '../../../../../../../src/plugins/data/common'; -import { FieldValueQueryBar } from './components/query_bar'; -import { FormData, FormHook } from '../../../shared_imports'; -import { FieldValueTimeline } from './components/pick_timeline'; +import { RuleAlertAction, RuleType } from '../../../../../common/detection_engine/types'; +import { AlertAction } from '../../../../../../alerting/common'; +import { Filter } from '../../../../../../../../src/plugins/data/common'; +import { FormData, FormHook } from '../../../../shared_imports'; +import { FieldValueQueryBar } from '../../../components/rules/query_bar'; +import { FieldValueTimeline } from '../../../components/rules/pick_timeline'; export interface EuiBasicTableSortTypes { field: string; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/utils.test.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/utils.test.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/utils.test.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/utils.test.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/rules/utils.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/utils.ts similarity index 90% rename from x-pack/plugins/siem/public/pages/detection_engine/rules/utils.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/utils.ts index f93ad94dd462b0..159301a07de787 100644 --- a/x-pack/plugins/siem/public/pages/detection_engine/rules/utils.ts +++ b/x-pack/plugins/siem/public/alerts/pages/detection_engine/rules/utils.ts @@ -6,7 +6,8 @@ import { isEmpty } from 'lodash/fp'; -import { ChromeBreadcrumb } from '../../../../../../../src/core/public'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import { ChromeBreadcrumb } from '../../../../../../../../src/core/public'; import { getDetectionEngineUrl, getDetectionEngineTabUrl, @@ -14,10 +15,10 @@ import { getRuleDetailsUrl, getCreateRuleUrl, getEditRuleUrl, -} from '../../../components/link_to/redirect_to_detection_engine'; +} from '../../../../common/components/link_to/redirect_to_detection_engine'; import * as i18nDetections from '../translations'; import * as i18nRules from './translations'; -import { RouteSpyState } from '../../../utils/route/types'; +import { RouteSpyState } from '../../../../common/utils/route/types'; const getTabBreadcrumb = (pathname: string, search: string[]) => { const tabPath = pathname.split('/')[2]; diff --git a/x-pack/plugins/siem/public/pages/detection_engine/translations.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/translations.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/translations.ts diff --git a/x-pack/plugins/siem/public/pages/detection_engine/types.ts b/x-pack/plugins/siem/public/alerts/pages/detection_engine/types.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/detection_engine/types.ts rename to x-pack/plugins/siem/public/alerts/pages/detection_engine/types.ts diff --git a/x-pack/plugins/siem/public/alerts/routes.tsx b/x-pack/plugins/siem/public/alerts/routes.tsx new file mode 100644 index 00000000000000..897ba3269546fc --- /dev/null +++ b/x-pack/plugins/siem/public/alerts/routes.tsx @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Route } from 'react-router-dom'; + +import { DetectionEngineContainer } from './pages/detection_engine'; +import { SiemPageName } from '../app/types'; + +export const getAlertsRoutes = () => [ + ( + + )} + />, +]; diff --git a/x-pack/plugins/siem/public/pages/404.tsx b/x-pack/plugins/siem/public/app/404.tsx similarity index 90% rename from x-pack/plugins/siem/public/pages/404.tsx rename to x-pack/plugins/siem/public/app/404.tsx index ba1cb4f40cbed6..6a1b5c56dc853a 100644 --- a/x-pack/plugins/siem/public/pages/404.tsx +++ b/x-pack/plugins/siem/public/app/404.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; -import { WrapperPage } from '../components/wrapper_page'; +import { WrapperPage } from '../common/components/wrapper_page'; export const NotFoundPage = React.memo(() => ( diff --git a/x-pack/plugins/siem/public/app/app.tsx b/x-pack/plugins/siem/public/app/app.tsx index 6e2a4642f99a46..7aef91380b5225 100644 --- a/x-pack/plugins/siem/public/app/app.tsx +++ b/x-pack/plugins/siem/public/app/app.tsx @@ -17,32 +17,35 @@ import euiLightVars from '@elastic/eui/dist/eui_theme_light.json'; import { BehaviorSubject } from 'rxjs'; import { pluck } from 'rxjs/operators'; -import { KibanaContextProvider, useKibana, useUiSetting$ } from '../lib/kibana'; +import { KibanaContextProvider, useKibana, useUiSetting$ } from '../common/lib/kibana'; import { Storage } from '../../../../../src/plugins/kibana_utils/public'; import { DEFAULT_DARK_MODE } from '../../common/constants'; -import { ErrorToastDispatcher } from '../components/error_toast_dispatcher'; -import { compose } from '../lib/compose/kibana_compose'; -import { AppFrontendLibs, AppApolloClient } from '../lib/lib'; +import { ErrorToastDispatcher } from '../common/components/error_toast_dispatcher'; +import { compose } from '../common/lib/compose/kibana_compose'; +import { AppFrontendLibs, AppApolloClient } from '../common/lib/lib'; import { StartServices } from '../plugin'; -import { PageRouter } from '../routes'; -import { createStore, createInitialState } from '../store'; -import { GlobalToaster, ManageGlobalToaster } from '../components/toasters'; -import { MlCapabilitiesProvider } from '../components/ml/permissions/ml_capabilities_provider'; +import { PageRouter } from './routes'; +import { createStore, createInitialState } from '../common/store'; +import { GlobalToaster, ManageGlobalToaster } from '../common/components/toasters'; +import { MlCapabilitiesProvider } from '../common/components/ml/permissions/ml_capabilities_provider'; -import { ApolloClientContext } from '../utils/apollo_context'; +import { ApolloClientContext } from '../common/utils/apollo_context'; +import { SecuritySubPlugins } from './types'; interface AppPluginRootComponentProps { apolloClient: AppApolloClient; history: History; store: Store; + subPluginRoutes: React.ReactElement[]; theme: any; // eslint-disable-line @typescript-eslint/no-explicit-any } const AppPluginRootComponent: React.FC = ({ + apolloClient, theme, store, - apolloClient, + subPluginRoutes, history, }) => ( @@ -51,7 +54,7 @@ const AppPluginRootComponent: React.FC = ({ - + @@ -64,11 +67,22 @@ const AppPluginRootComponent: React.FC = ({ const AppPluginRoot = memo(AppPluginRootComponent); -const StartAppComponent: FC = libs => { +interface StartAppComponent extends AppFrontendLibs { + subPlugins: SecuritySubPlugins; +} + +const StartAppComponent: FC = ({ subPlugins, ...libs }) => { + const { routes: subPluginRoutes, store: subPluginsStore } = subPlugins; const { i18n } = useKibana().services; const history = createHashHistory(); const libs$ = new BehaviorSubject(libs); - const store = createStore(createInitialState(), libs$.pipe(pluck('apolloClient'))); + + const store = createStore( + createInitialState(subPluginsStore.initialState), + subPluginsStore.reducer, + libs$.pipe(pluck('apolloClient')) + ); + const [darkMode] = useUiSetting$(DEFAULT_DARK_MODE); const theme = useMemo( () => ({ @@ -82,9 +96,10 @@ const StartAppComponent: FC = libs => { @@ -96,9 +111,10 @@ const StartApp = memo(StartAppComponent); interface SiemAppComponentProps { services: StartServices; + subPlugins: SecuritySubPlugins; } -const SiemAppComponent: React.FC = ({ services }) => ( +const SiemAppComponent: React.FC = ({ services, subPlugins }) => ( = ({ services }) => ( ...services, }} > - + ); diff --git a/x-pack/plugins/siem/public/pages/home/home_navigations.tsx b/x-pack/plugins/siem/public/app/home/home_navigations.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/home/home_navigations.tsx rename to x-pack/plugins/siem/public/app/home/home_navigations.tsx index 543469e2fddb7f..2eed64a2b26e55 100644 --- a/x-pack/plugins/siem/public/pages/home/home_navigations.tsx +++ b/x-pack/plugins/siem/public/app/home/home_navigations.tsx @@ -11,9 +11,9 @@ import { getTimelinesUrl, getHostsUrl, getCaseUrl, -} from '../../components/link_to'; +} from '../../common/components/link_to'; import * as i18n from './translations'; -import { SiemPageName, SiemNavTab } from './types'; +import { SiemPageName, SiemNavTab } from '../types'; export const navTabs: SiemNavTab = { [SiemPageName.overview]: { diff --git a/x-pack/plugins/siem/public/pages/home/index.tsx b/x-pack/plugins/siem/public/app/home/index.tsx similarity index 56% rename from x-pack/plugins/siem/public/pages/home/index.tsx rename to x-pack/plugins/siem/public/app/home/index.tsx index a9e0962f16e6ed..b6116ad4f06664 100644 --- a/x-pack/plugins/siem/public/pages/home/index.tsx +++ b/x-pack/plugins/siem/public/app/home/index.tsx @@ -8,28 +8,25 @@ import React, { useMemo } from 'react'; import { Redirect, Route, Switch } from 'react-router-dom'; import styled from 'styled-components'; -import { useThrottledResizeObserver } from '../../components/utils'; -import { DragDropContextWrapper } from '../../components/drag_and_drop/drag_drop_context_wrapper'; -import { Flyout } from '../../components/flyout'; -import { HeaderGlobal } from '../../components/header_global'; -import { HelpMenu } from '../../components/help_menu'; -import { LinkToPage } from '../../components/link_to'; -import { MlHostConditionalContainer } from '../../components/ml/conditional_links/ml_host_conditional_container'; -import { MlNetworkConditionalContainer } from '../../components/ml/conditional_links/ml_network_conditional_container'; -import { AutoSaveWarningMsg } from '../../components/timeline/auto_save_warning'; -import { UseUrlState } from '../../components/url_state'; -import { WithSource, indicesExistOrDataTemporarilyUnavailable } from '../../containers/source'; -import { SpyRoute } from '../../utils/route/spy_routes'; -import { useShowTimeline } from '../../utils/timeline/use_show_timeline'; +import { useThrottledResizeObserver } from '../../common/components/utils'; +import { DragDropContextWrapper } from '../../common/components/drag_and_drop/drag_drop_context_wrapper'; +import { Flyout } from '../../timelines/components/flyout'; +import { HeaderGlobal } from '../../common/components/header_global'; +import { HelpMenu } from '../../common/components/help_menu'; +import { LinkToPage } from '../../common/components/link_to'; +import { MlHostConditionalContainer } from '../../common/components/ml/conditional_links/ml_host_conditional_container'; +import { MlNetworkConditionalContainer } from '../../common/components/ml/conditional_links/ml_network_conditional_container'; +import { AutoSaveWarningMsg } from '../../timelines/components/timeline/auto_save_warning'; +import { UseUrlState } from '../../common/components/url_state'; +import { + WithSource, + indicesExistOrDataTemporarilyUnavailable, +} from '../../common/containers/source'; +import { SpyRoute } from '../../common/utils/route/spy_routes'; +import { useShowTimeline } from '../../common/utils/timeline/use_show_timeline'; import { NotFoundPage } from '../404'; -import { DetectionEngineContainer } from '../detection_engine'; -import { HostsContainer } from '../hosts'; -import { NetworkContainer } from '../network'; -import { Overview } from '../overview'; -import { Case } from '../case'; -import { Timelines } from '../timelines'; import { navTabs } from './home_navigations'; -import { SiemPageName } from './types'; +import { SiemPageName } from '../types'; const WrappedByAutoSizer = styled.div` height: 100%; @@ -54,7 +51,11 @@ const calculateFlyoutHeight = ({ windowHeight: number; }): number => Math.max(0, windowHeight - globalHeaderSize); -export const HomePage: React.FC = () => { +interface HomePageProps { + subPlugins: JSX.Element[]; +} + +export const HomePage: React.FC = ({ subPlugins }) => { const { ref: measureRef, height: windowHeight = 0 } = useThrottledResizeObserver(); const flyoutHeight = useMemo( () => @@ -89,27 +90,7 @@ export const HomePage: React.FC = () => { - } /> - } - /> - ( - - )} - /> - ( - - )} - /> - } - /> + {subPlugins} } /> { )} /> - - - } /> diff --git a/x-pack/plugins/siem/public/pages/home/translations.ts b/x-pack/plugins/siem/public/app/home/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/home/translations.ts rename to x-pack/plugins/siem/public/app/home/translations.ts diff --git a/x-pack/plugins/siem/public/app/index.tsx b/x-pack/plugins/siem/public/app/index.tsx index 7275a718564eff..d69be6e09e6149 100644 --- a/x-pack/plugins/siem/public/app/index.tsx +++ b/x-pack/plugins/siem/public/app/index.tsx @@ -7,11 +7,17 @@ import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths import { AppMountParameters } from '../../../../../src/core/public'; import { StartServices } from '../plugin'; import { SiemApp } from './app'; +import { SecuritySubPlugins } from './types'; -export const renderApp = (services: StartServices, { element }: AppMountParameters) => { - render(, element); +export const renderApp = ( + services: StartServices, + { element }: AppMountParameters, + subPlugins: SecuritySubPlugins +) => { + render(, element); return () => unmountComponentAtNode(element); }; diff --git a/x-pack/plugins/siem/public/routes.tsx b/x-pack/plugins/siem/public/app/routes.tsx similarity index 69% rename from x-pack/plugins/siem/public/routes.tsx rename to x-pack/plugins/siem/public/app/routes.tsx index a989fa9873435e..ed3565df5f507b 100644 --- a/x-pack/plugins/siem/public/routes.tsx +++ b/x-pack/plugins/siem/public/app/routes.tsx @@ -8,20 +8,21 @@ import { History } from 'history'; import React, { FC, memo } from 'react'; import { Route, Router, Switch } from 'react-router-dom'; -import { NotFoundPage } from './pages/404'; -import { HomePage } from './pages/home'; -import { ManageRoutesSpy } from './utils/route/manage_spy_routes'; +import { NotFoundPage } from './404'; +import { HomePage } from './home'; +import { ManageRoutesSpy } from '../common/utils/route/manage_spy_routes'; interface RouterProps { history: History; + subPluginRoutes: JSX.Element[]; } -const PageRouterComponent: FC = ({ history }) => ( +const PageRouterComponent: FC = ({ history, subPluginRoutes }) => ( - + diff --git a/x-pack/plugins/siem/public/app/types.ts b/x-pack/plugins/siem/public/app/types.ts new file mode 100644 index 00000000000000..5fe4b5a8d82271 --- /dev/null +++ b/x-pack/plugins/siem/public/app/types.ts @@ -0,0 +1,61 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Reducer, AnyAction } from 'redux'; + +import { NavTab } from '../common/components/navigation/types'; +import { HostsState } from '../hosts/store'; +import { NetworkState } from '../network/store'; +import { TimelineState } from '../timelines/store/timeline/types'; + +export enum SiemPageName { + overview = 'overview', + hosts = 'hosts', + network = 'network', + detections = 'detections', + timelines = 'timelines', + case = 'case', +} + +export type SiemNavTabKey = + | SiemPageName.overview + | SiemPageName.hosts + | SiemPageName.network + | SiemPageName.detections + | SiemPageName.timelines + | SiemPageName.case; + +export type SiemNavTab = Record; + +export interface SecuritySubPluginStore { + initialState: Record; + reducer: Record>; +} + +export interface SecuritySubPlugin { + routes: React.ReactElement[]; +} + +type SecuritySubPluginKeyStore = 'hosts' | 'network' | 'timeline'; +export interface SecuritySubPluginWithStore + extends SecuritySubPlugin { + store: SecuritySubPluginStore; +} + +export interface SecuritySubPlugins extends SecuritySubPlugin { + store: { + initialState: { + hosts: HostsState; + network: NetworkState; + timeline: TimelineState; + }; + reducer: { + hosts: Reducer; + network: Reducer; + timeline: Reducer; + }; + }; +} diff --git a/x-pack/plugins/siem/public/pages/case/components/__mock__/form.ts b/x-pack/plugins/siem/public/cases/components/__mock__/form.ts similarity index 84% rename from x-pack/plugins/siem/public/pages/case/components/__mock__/form.ts rename to x-pack/plugins/siem/public/cases/components/__mock__/form.ts index 12946c3af06bdb..96c1217577ff25 100644 --- a/x-pack/plugins/siem/public/pages/case/components/__mock__/form.ts +++ b/x-pack/plugins/siem/public/cases/components/__mock__/form.ts @@ -3,9 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { useForm } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks'; +import { useForm } from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form'; jest.mock( - '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' + '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' ); export const mockFormHook = { isSubmitted: false, diff --git a/x-pack/plugins/siem/public/pages/case/components/__mock__/router.ts b/x-pack/plugins/siem/public/cases/components/__mock__/router.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/__mock__/router.ts rename to x-pack/plugins/siem/public/cases/components/__mock__/router.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/add_comment/index.test.tsx b/x-pack/plugins/siem/public/cases/components/add_comment/index.test.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/case/components/add_comment/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/add_comment/index.test.tsx index 7ba8ec96662532..ab61930cd841b7 100644 --- a/x-pack/plugins/siem/public/pages/case/components/add_comment/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/add_comment/index.test.tsx @@ -7,20 +7,22 @@ import React from 'react'; import { mount } from 'enzyme'; -import { AddComment } from './'; -import { TestProviders } from '../../../../mock'; +import { AddComment } from '.'; +import { TestProviders } from '../../../common/mock'; import { getFormMock } from '../__mock__/form'; import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router'; -import { useInsertTimeline } from '../../../../components/timeline/insert_timeline_popover/use_insert_timeline'; -import { usePostComment } from '../../../../containers/case/use_post_comment'; -import { useForm } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form'; -import { wait } from '../../../../lib/helpers'; +import { useInsertTimeline } from '../../../timelines/components/timeline/insert_timeline_popover/use_insert_timeline'; +import { usePostComment } from '../../containers/use_post_comment'; +import { useForm } from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form'; +import { wait } from '../../../common/lib/helpers'; + jest.mock( - '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' + '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' ); -jest.mock('../../../../components/timeline/insert_timeline_popover/use_insert_timeline'); -jest.mock('../../../../containers/case/use_post_comment'); + +jest.mock('../../../timelines/components/timeline/insert_timeline_popover/use_insert_timeline'); +jest.mock('../../containers/use_post_comment'); export const useFormMock = useForm as jest.Mock; diff --git a/x-pack/plugins/siem/public/pages/case/components/add_comment/index.tsx b/x-pack/plugins/siem/public/cases/components/add_comment/index.tsx similarity index 83% rename from x-pack/plugins/siem/public/pages/case/components/add_comment/index.tsx rename to x-pack/plugins/siem/public/cases/components/add_comment/index.tsx index aa987b277da06a..277352c39df65e 100644 --- a/x-pack/plugins/siem/public/pages/case/components/add_comment/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/add_comment/index.tsx @@ -8,15 +8,15 @@ import { EuiButton, EuiLoadingSpinner } from '@elastic/eui'; import React, { useCallback, useEffect } from 'react'; import styled from 'styled-components'; -import { CommentRequest } from '../../../../../../case/common/api'; -import { usePostComment } from '../../../../containers/case/use_post_comment'; -import { Case } from '../../../../containers/case/types'; -import { MarkdownEditorForm } from '../../../../components/markdown_editor/form'; -import { InsertTimelinePopover } from '../../../../components/timeline/insert_timeline_popover'; -import { useInsertTimeline } from '../../../../components/timeline/insert_timeline_popover/use_insert_timeline'; -import { Form, useForm, UseField } from '../../../../shared_imports'; +import { CommentRequest } from '../../../../../case/common/api'; +import { usePostComment } from '../../containers/use_post_comment'; +import { Case } from '../../containers/types'; +import { MarkdownEditorForm } from '../../../common/components/markdown_editor/form'; +import { InsertTimelinePopover } from '../../../timelines/components/timeline/insert_timeline_popover'; +import { useInsertTimeline } from '../../../timelines/components/timeline/insert_timeline_popover/use_insert_timeline'; +import { Form, useForm, UseField } from '../../../shared_imports'; -import * as i18n from '../../translations'; +import * as i18n from './translations'; import { schema } from './schema'; const MySpinner = styled(EuiLoadingSpinner)` diff --git a/x-pack/plugins/siem/public/pages/case/components/add_comment/schema.tsx b/x-pack/plugins/siem/public/cases/components/add_comment/schema.tsx similarity index 80% rename from x-pack/plugins/siem/public/pages/case/components/add_comment/schema.tsx rename to x-pack/plugins/siem/public/cases/components/add_comment/schema.tsx index ad73fd71b8e115..eb11357cd7ce94 100644 --- a/x-pack/plugins/siem/public/pages/case/components/add_comment/schema.tsx +++ b/x-pack/plugins/siem/public/cases/components/add_comment/schema.tsx @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { CommentRequest } from '../../../../../../case/common/api'; -import { FIELD_TYPES, fieldValidators, FormSchema } from '../../../../shared_imports'; -import * as i18n from '../../translations'; +import { CommentRequest } from '../../../../../case/common/api'; +import { FIELD_TYPES, fieldValidators, FormSchema } from '../../../shared_imports'; +import * as i18n from './translations'; const { emptyField } = fieldValidators; diff --git a/x-pack/plugins/siem/public/components/page/hosts/index.tsx b/x-pack/plugins/siem/public/cases/components/add_comment/translations.ts similarity index 62% rename from x-pack/plugins/siem/public/components/page/hosts/index.tsx rename to x-pack/plugins/siem/public/cases/components/add_comment/translations.ts index 9b3f36faa065d2..704b8db48c1d3b 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/add_comment/translations.ts @@ -4,7 +4,4 @@ * you may not use this file except in compliance with the Elastic License. */ -export * from './authentications_table'; -export * from './hosts_table'; -export * from './uncommon_process_table'; -export * from './kpi_hosts'; +export * from '../../translations'; diff --git a/x-pack/plugins/siem/public/pages/case/components/all_cases/actions.tsx b/x-pack/plugins/siem/public/cases/components/all_cases/actions.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/case/components/all_cases/actions.tsx rename to x-pack/plugins/siem/public/cases/components/all_cases/actions.tsx index 01b501bf6cf078..9f7e2e73c5bbcf 100644 --- a/x-pack/plugins/siem/public/pages/case/components/all_cases/actions.tsx +++ b/x-pack/plugins/siem/public/cases/components/all_cases/actions.tsx @@ -5,10 +5,10 @@ */ import { DefaultItemIconButtonAction } from '@elastic/eui/src/components/basic_table/action_types'; import { Dispatch } from 'react'; -import { Case } from '../../../../containers/case/types'; +import { Case } from '../../containers/types'; import * as i18n from './translations'; -import { UpdateCase } from '../../../../containers/case/use_get_cases'; +import { UpdateCase } from '../../containers/use_get_cases'; interface GetActions { caseStatus: string; diff --git a/x-pack/plugins/siem/public/pages/case/components/all_cases/columns.test.tsx b/x-pack/plugins/siem/public/cases/components/all_cases/columns.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/case/components/all_cases/columns.test.tsx rename to x-pack/plugins/siem/public/cases/components/all_cases/columns.test.tsx index 2a06fa6eb51acb..8316823591f3f9 100644 --- a/x-pack/plugins/siem/public/pages/case/components/all_cases/columns.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/all_cases/columns.test.tsx @@ -9,7 +9,7 @@ import { mount } from 'enzyme'; import { ExternalServiceColumn } from './columns'; -import { useGetCasesMockState } from '../../../../containers/case/mock'; +import { useGetCasesMockState } from '../../containers/mock'; describe('ExternalServiceColumn ', () => { it('Not pushed render', () => { diff --git a/x-pack/plugins/siem/public/pages/case/components/all_cases/columns.tsx b/x-pack/plugins/siem/public/cases/components/all_cases/columns.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/case/components/all_cases/columns.tsx rename to x-pack/plugins/siem/public/cases/components/all_cases/columns.tsx index 9a0460009ffacc..ddd860a8720c57 100644 --- a/x-pack/plugins/siem/public/pages/case/components/all_cases/columns.tsx +++ b/x-pack/plugins/siem/public/cases/components/all_cases/columns.tsx @@ -14,11 +14,11 @@ import { } from '@elastic/eui'; import styled from 'styled-components'; import { DefaultItemIconButtonAction } from '@elastic/eui/src/components/basic_table/action_types'; -import { getEmptyTagValue } from '../../../../components/empty_value'; -import { Case } from '../../../../containers/case/types'; -import { FormattedRelativePreferenceDate } from '../../../../components/formatted_date'; -import { CaseDetailsLink } from '../../../../components/links'; -import { TruncatableText } from '../../../../components/truncatable_text'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { Case } from '../../containers/types'; +import { FormattedRelativePreferenceDate } from '../../../common/components/formatted_date'; +import { CaseDetailsLink } from '../../../common/components/links'; +import { TruncatableText } from '../../../common/components/truncatable_text'; import * as i18n from './translations'; export type CasesColumns = diff --git a/x-pack/plugins/siem/public/pages/case/components/all_cases/index.test.tsx b/x-pack/plugins/siem/public/cases/components/all_cases/index.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/case/components/all_cases/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/all_cases/index.test.tsx index eb5bca6cc57fff..1dbd008277b347 100644 --- a/x-pack/plugins/siem/public/pages/case/components/all_cases/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/all_cases/index.test.tsx @@ -7,21 +7,23 @@ import React from 'react'; import { mount } from 'enzyme'; import moment from 'moment-timezone'; -import { AllCases } from './'; -import { TestProviders } from '../../../../mock'; -import { useGetCasesMockState } from '../../../../containers/case/mock'; +import { AllCases } from '.'; +import { TestProviders } from '../../../common/mock'; +import { useGetCasesMockState } from '../../containers/mock'; import * as i18n from './translations'; -import { getEmptyTagValue } from '../../../../components/empty_value'; -import { useDeleteCases } from '../../../../containers/case/use_delete_cases'; -import { useGetCases } from '../../../../containers/case/use_get_cases'; -import { useGetCasesStatus } from '../../../../containers/case/use_get_cases_status'; -import { useUpdateCases } from '../../../../containers/case/use_bulk_update_case'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { useDeleteCases } from '../../containers/use_delete_cases'; +import { useGetCases } from '../../containers/use_get_cases'; +import { useGetCasesStatus } from '../../containers/use_get_cases_status'; +import { useUpdateCases } from '../../containers/use_bulk_update_case'; import { getCasesColumns } from './columns'; -jest.mock('../../../../containers/case/use_bulk_update_case'); -jest.mock('../../../../containers/case/use_delete_cases'); -jest.mock('../../../../containers/case/use_get_cases'); -jest.mock('../../../../containers/case/use_get_cases_status'); + +jest.mock('../../containers/use_bulk_update_case'); +jest.mock('../../containers/use_delete_cases'); +jest.mock('../../containers/use_get_cases'); +jest.mock('../../containers/use_get_cases_status'); + const useDeleteCasesMock = useDeleteCases as jest.Mock; const useGetCasesMock = useGetCases as jest.Mock; const useGetCasesStatusMock = useGetCasesStatus as jest.Mock; diff --git a/x-pack/plugins/siem/public/pages/case/components/all_cases/index.tsx b/x-pack/plugins/siem/public/cases/components/all_cases/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/case/components/all_cases/index.tsx rename to x-pack/plugins/siem/public/cases/components/all_cases/index.tsx index 9dd90074a2e7b9..e86953c84336c8 100644 --- a/x-pack/plugins/siem/public/pages/case/components/all_cases/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/all_cases/index.tsx @@ -22,31 +22,31 @@ import styled, { css } from 'styled-components'; import * as i18n from './translations'; import { getCasesColumns } from './columns'; -import { Case, DeleteCase, FilterOptions, SortFieldCase } from '../../../../containers/case/types'; -import { useGetCases, UpdateCase } from '../../../../containers/case/use_get_cases'; -import { useGetCasesStatus } from '../../../../containers/case/use_get_cases_status'; -import { useDeleteCases } from '../../../../containers/case/use_delete_cases'; -import { EuiBasicTableOnChange } from '../../../detection_engine/rules/types'; -import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search'; -import { Panel } from '../../../../components/panel'; +import { Case, DeleteCase, FilterOptions, SortFieldCase } from '../../containers/types'; +import { useGetCases, UpdateCase } from '../../containers/use_get_cases'; +import { useGetCasesStatus } from '../../containers/use_get_cases_status'; +import { useDeleteCases } from '../../containers/use_delete_cases'; +import { EuiBasicTableOnChange } from '../../../alerts/pages/detection_engine/rules/types'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { Panel } from '../../../common/components/panel'; import { UtilityBar, UtilityBarAction, UtilityBarGroup, UtilityBarSection, UtilityBarText, -} from '../../../../components/utility_bar'; -import { getCreateCaseUrl } from '../../../../components/link_to'; +} from '../../../common/components/utility_bar'; +import { getCreateCaseUrl } from '../../../common/components/link_to'; import { getBulkItems } from '../bulk_actions'; import { CaseHeaderPage } from '../case_header_page'; import { ConfirmDeleteCaseModal } from '../confirm_delete_case'; import { OpenClosedStats } from '../open_closed_stats'; -import { navTabs } from '../../../home/home_navigations'; +import { navTabs } from '../../../app/home/home_navigations'; import { getActions } from './actions'; import { CasesTableFilters } from './table_filters'; -import { useUpdateCases } from '../../../../containers/case/use_bulk_update_case'; -import { useGetActionLicense } from '../../../../containers/case/use_get_action_license'; +import { useUpdateCases } from '../../containers/use_bulk_update_case'; +import { useGetActionLicense } from '../../containers/use_get_action_license'; import { getActionLicenseError } from '../use_push_to_service/helpers'; import { CaseCallOut } from '../callout'; import { ConfigureCaseButton } from '../configure_cases/button'; diff --git a/x-pack/plugins/siem/public/pages/case/components/all_cases/table_filters.test.tsx b/x-pack/plugins/siem/public/cases/components/all_cases/table_filters.test.tsx similarity index 90% rename from x-pack/plugins/siem/public/pages/case/components/all_cases/table_filters.test.tsx rename to x-pack/plugins/siem/public/cases/components/all_cases/table_filters.test.tsx index 21dcc9732440d3..05702e931fc253 100644 --- a/x-pack/plugins/siem/public/pages/case/components/all_cases/table_filters.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/all_cases/table_filters.test.tsx @@ -8,14 +8,14 @@ import React from 'react'; import { mount } from 'enzyme'; import { CasesTableFilters } from './table_filters'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; -import { useGetTags } from '../../../../containers/case/use_get_tags'; -import { useGetReporters } from '../../../../containers/case/use_get_reporters'; -import { DEFAULT_FILTER_OPTIONS } from '../../../../containers/case/use_get_cases'; -jest.mock('../../../../components/timeline/insert_timeline_popover/use_insert_timeline'); -jest.mock('../../../../containers/case/use_get_reporters'); -jest.mock('../../../../containers/case/use_get_tags'); +import { useGetTags } from '../../containers/use_get_tags'; +import { useGetReporters } from '../../containers/use_get_reporters'; +import { DEFAULT_FILTER_OPTIONS } from '../../containers/use_get_cases'; +jest.mock('../../../timelines/components/timeline/insert_timeline_popover/use_insert_timeline'); +jest.mock('../../containers/use_get_reporters'); +jest.mock('../../containers/use_get_tags'); const onFilterChanged = jest.fn(); const fetchReporters = jest.fn(); diff --git a/x-pack/plugins/siem/public/pages/case/components/all_cases/table_filters.tsx b/x-pack/plugins/siem/public/cases/components/all_cases/table_filters.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/case/components/all_cases/table_filters.tsx rename to x-pack/plugins/siem/public/cases/components/all_cases/table_filters.tsx index 901fb133753e82..55713c201743a1 100644 --- a/x-pack/plugins/siem/public/pages/case/components/all_cases/table_filters.tsx +++ b/x-pack/plugins/siem/public/cases/components/all_cases/table_filters.tsx @@ -15,10 +15,10 @@ import { } from '@elastic/eui'; import * as i18n from './translations'; -import { FilterOptions } from '../../../../containers/case/types'; -import { useGetTags } from '../../../../containers/case/use_get_tags'; -import { useGetReporters } from '../../../../containers/case/use_get_reporters'; -import { FilterPopover } from '../../../../components/filter_popover'; +import { FilterOptions } from '../../containers/types'; +import { useGetTags } from '../../containers/use_get_tags'; +import { useGetReporters } from '../../containers/use_get_reporters'; +import { FilterPopover } from '../filter_popover'; interface CasesTableFiltersProps { countClosedCases: number | null; diff --git a/x-pack/plugins/siem/public/pages/case/components/all_cases/translations.ts b/x-pack/plugins/siem/public/cases/components/all_cases/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/all_cases/translations.ts rename to x-pack/plugins/siem/public/cases/components/all_cases/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/bulk_actions/index.tsx b/x-pack/plugins/siem/public/cases/components/bulk_actions/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/bulk_actions/index.tsx rename to x-pack/plugins/siem/public/cases/components/bulk_actions/index.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/bulk_actions/translations.ts b/x-pack/plugins/siem/public/cases/components/bulk_actions/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/bulk_actions/translations.ts rename to x-pack/plugins/siem/public/cases/components/bulk_actions/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/callout/helpers.tsx b/x-pack/plugins/siem/public/cases/components/callout/helpers.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/callout/helpers.tsx rename to x-pack/plugins/siem/public/cases/components/callout/helpers.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/callout/index.test.tsx b/x-pack/plugins/siem/public/cases/components/callout/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/pages/case/components/callout/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/callout/index.test.tsx index 126ea13e96af63..0ab90d8a731264 100644 --- a/x-pack/plugins/siem/public/pages/case/components/callout/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/callout/index.test.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { mount } from 'enzyme'; -import { CaseCallOut } from './'; +import { CaseCallOut } from '.'; const defaultProps = { title: 'hey title', diff --git a/x-pack/plugins/siem/public/pages/case/components/callout/index.tsx b/x-pack/plugins/siem/public/cases/components/callout/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/callout/index.tsx rename to x-pack/plugins/siem/public/cases/components/callout/index.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/callout/translations.ts b/x-pack/plugins/siem/public/cases/components/callout/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/callout/translations.ts rename to x-pack/plugins/siem/public/cases/components/callout/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/case_header_page/index.tsx b/x-pack/plugins/siem/public/cases/components/case_header_page/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/pages/case/components/case_header_page/index.tsx rename to x-pack/plugins/siem/public/cases/components/case_header_page/index.tsx index ae2664ca6e839d..4c7cfabe757cf0 100644 --- a/x-pack/plugins/siem/public/pages/case/components/case_header_page/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/case_header_page/index.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { HeaderPage, HeaderPageProps } from '../../../../components/header_page'; +import { HeaderPage, HeaderPageProps } from '../../../common/components/header_page'; import * as i18n from './translations'; const CaseHeaderPageComponent: React.FC = props => ; diff --git a/x-pack/plugins/siem/public/pages/case/components/case_header_page/translations.ts b/x-pack/plugins/siem/public/cases/components/case_header_page/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/case_header_page/translations.ts rename to x-pack/plugins/siem/public/cases/components/case_header_page/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/case_status/index.tsx b/x-pack/plugins/siem/public/cases/components/case_status/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/case/components/case_status/index.tsx rename to x-pack/plugins/siem/public/cases/components/case_status/index.tsx index f48d9a68ffaf0a..a37c9052c2ff38 100644 --- a/x-pack/plugins/siem/public/pages/case/components/case_status/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/case_status/index.tsx @@ -17,10 +17,10 @@ import { EuiFlexItem, } from '@elastic/eui'; import * as i18n from '../case_view/translations'; -import { FormattedRelativePreferenceDate } from '../../../../components/formatted_date'; +import { FormattedRelativePreferenceDate } from '../../../common/components/formatted_date'; import { CaseViewActions } from '../case_view/actions'; -import { Case } from '../../../../containers/case/types'; -import { CaseService } from '../../../../containers/case/use_get_case_user_actions'; +import { Case } from '../../containers/types'; +import { CaseService } from '../../containers/use_get_case_user_actions'; const MyDescriptionList = styled(EuiDescriptionList)` ${({ theme }) => css` diff --git a/x-pack/plugins/siem/public/pages/case/components/case_view/actions.test.tsx b/x-pack/plugins/siem/public/cases/components/case_view/actions.test.tsx similarity index 91% rename from x-pack/plugins/siem/public/pages/case/components/case_view/actions.test.tsx rename to x-pack/plugins/siem/public/cases/components/case_view/actions.test.tsx index 24fbd59b3282b2..1f8d3230f42a84 100644 --- a/x-pack/plugins/siem/public/pages/case/components/case_view/actions.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/case_view/actions.test.tsx @@ -7,12 +7,12 @@ import React from 'react'; import { mount } from 'enzyme'; -import { useDeleteCases } from '../../../../containers/case/use_delete_cases'; -import { TestProviders } from '../../../../mock'; -import { basicCase, basicPush } from '../../../../containers/case/mock'; +import { useDeleteCases } from '../../containers/use_delete_cases'; +import { TestProviders } from '../../../common/mock'; +import { basicCase, basicPush } from '../../containers/mock'; import { CaseViewActions } from './actions'; import * as i18n from './translations'; -jest.mock('../../../../containers/case/use_delete_cases'); +jest.mock('../../containers/use_delete_cases'); const useDeleteCasesMock = useDeleteCases as jest.Mock; describe('CaseView actions', () => { diff --git a/x-pack/plugins/siem/public/pages/case/components/case_view/actions.tsx b/x-pack/plugins/siem/public/cases/components/case_view/actions.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/case/components/case_view/actions.tsx rename to x-pack/plugins/siem/public/cases/components/case_view/actions.tsx index 4acdaef6ca51f8..cd9318a355e3c7 100644 --- a/x-pack/plugins/siem/public/pages/case/components/case_view/actions.tsx +++ b/x-pack/plugins/siem/public/cases/components/case_view/actions.tsx @@ -8,12 +8,12 @@ import { isEmpty } from 'lodash/fp'; import React, { useMemo } from 'react'; import { Redirect } from 'react-router-dom'; import * as i18n from './translations'; -import { useDeleteCases } from '../../../../containers/case/use_delete_cases'; +import { useDeleteCases } from '../../containers/use_delete_cases'; import { ConfirmDeleteCaseModal } from '../confirm_delete_case'; -import { SiemPageName } from '../../../home/types'; +import { SiemPageName } from '../../../app/types'; import { PropertyActions } from '../property_actions'; -import { Case } from '../../../../containers/case/types'; -import { CaseService } from '../../../../containers/case/use_get_case_user_actions'; +import { Case } from '../../containers/types'; +import { CaseService } from '../../containers/use_get_case_user_actions'; interface CaseViewActions { caseData: Case; diff --git a/x-pack/plugins/siem/public/pages/case/components/case_view/index.test.tsx b/x-pack/plugins/siem/public/cases/components/case_view/index.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/case/components/case_view/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/case_view/index.test.tsx index a6e6b19a071ce5..70d2dc97f3f455 100644 --- a/x-pack/plugins/siem/public/pages/case/components/case_view/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/case_view/index.test.tsx @@ -8,17 +8,17 @@ import React from 'react'; import { mount } from 'enzyme'; import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router'; -import { CaseComponent, CaseProps, CaseView } from './'; -import { basicCase, basicCaseClosed, caseUserActions } from '../../../../containers/case/mock'; -import { TestProviders } from '../../../../mock'; -import { useUpdateCase } from '../../../../containers/case/use_update_case'; -import { useGetCase } from '../../../../containers/case/use_get_case'; -import { useGetCaseUserActions } from '../../../../containers/case/use_get_case_user_actions'; -import { wait } from '../../../../lib/helpers'; +import { CaseComponent, CaseProps, CaseView } from '.'; +import { basicCase, basicCaseClosed, caseUserActions } from '../../containers/mock'; +import { TestProviders } from '../../../common/mock'; +import { useUpdateCase } from '../../containers/use_update_case'; +import { useGetCase } from '../../containers/use_get_case'; +import { useGetCaseUserActions } from '../../containers/use_get_case_user_actions'; +import { wait } from '../../../common/lib/helpers'; import { usePushToService } from '../use_push_to_service'; -jest.mock('../../../../containers/case/use_update_case'); -jest.mock('../../../../containers/case/use_get_case_user_actions'); -jest.mock('../../../../containers/case/use_get_case'); +jest.mock('../../containers/use_update_case'); +jest.mock('../../containers/use_get_case_user_actions'); +jest.mock('../../containers/use_get_case'); jest.mock('../use_push_to_service'); const useUpdateCaseMock = useUpdateCase as jest.Mock; const useGetCaseUserActionsMock = useGetCaseUserActions as jest.Mock; diff --git a/x-pack/plugins/siem/public/pages/case/components/case_view/index.tsx b/x-pack/plugins/siem/public/cases/components/case_view/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/case/components/case_view/index.tsx rename to x-pack/plugins/siem/public/cases/components/case_view/index.tsx index fed8ec8edbe8b5..d02119580a75ab 100644 --- a/x-pack/plugins/siem/public/pages/case/components/case_view/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/case_view/index.tsx @@ -16,27 +16,27 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import styled from 'styled-components'; import * as i18n from './translations'; -import { Case } from '../../../../containers/case/types'; -import { getCaseUrl } from '../../../../components/link_to'; -import { HeaderPage } from '../../../../components/header_page'; -import { EditableTitle } from '../../../../components/header_page/editable_title'; +import { Case } from '../../containers/types'; +import { getCaseUrl } from '../../../common/components/link_to'; +import { HeaderPage } from '../../../common/components/header_page'; +import { EditableTitle } from '../../../common/components/header_page/editable_title'; import { TagList } from '../tag_list'; -import { useGetCase } from '../../../../containers/case/use_get_case'; +import { useGetCase } from '../../containers/use_get_case'; import { UserActionTree } from '../user_action_tree'; import { UserList } from '../user_list'; -import { useUpdateCase } from '../../../../containers/case/use_update_case'; -import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search'; -import { WrapperPage } from '../../../../components/wrapper_page'; -import { getTypedPayload } from '../../../../containers/case/utils'; +import { useUpdateCase } from '../../containers/use_update_case'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { WrapperPage } from '../../../common/components/wrapper_page'; +import { getTypedPayload } from '../../containers/utils'; import { WhitePageWrapper } from '../wrappers'; -import { useBasePath } from '../../../../lib/kibana'; +import { useBasePath } from '../../../common/lib/kibana'; import { CaseStatus } from '../case_status'; -import { navTabs } from '../../../home/home_navigations'; -import { SpyRoute } from '../../../../utils/route/spy_routes'; -import { useGetCaseUserActions } from '../../../../containers/case/use_get_case_user_actions'; +import { navTabs } from '../../../app/home/home_navigations'; +import { SpyRoute } from '../../../common/utils/route/spy_routes'; +import { useGetCaseUserActions } from '../../containers/use_get_case_user_actions'; import { usePushToService } from '../use_push_to_service'; import { EditConnector } from '../edit_connector'; -import { useConnectors } from '../../../../containers/case/configure/use_connectors'; +import { useConnectors } from '../../containers/configure/use_connectors'; interface Props { caseId: string; diff --git a/x-pack/plugins/siem/public/pages/case/components/case_view/translations.ts b/x-pack/plugins/siem/public/cases/components/case_view/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/case_view/translations.ts rename to x-pack/plugins/siem/public/cases/components/case_view/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/__mock__/index.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/__mock__/index.tsx similarity index 70% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/__mock__/index.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/__mock__/index.tsx index 0eccd8980ccd23..23c76953a6a0f9 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/__mock__/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/__mock__/index.tsx @@ -4,17 +4,18 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Connector } from '../../../../../containers/case/configure/types'; -import { ReturnConnectors } from '../../../../../containers/case/configure/use_connectors'; -import { connectorsMock } from '../../../../../containers/case/configure/mock'; -import { ReturnUseCaseConfigure } from '../../../../../containers/case/configure/use_configure'; -import { createUseKibanaMock } from '../../../../../mock/kibana_react'; -export { mapping } from '../../../../../containers/case/configure/mock'; +import { Connector } from '../../../containers/configure/types'; +import { ReturnConnectors } from '../../../containers/configure/use_connectors'; +import { connectorsMock } from '../../../containers/configure/mock'; +import { ReturnUseCaseConfigure } from '../../../containers/configure/use_configure'; +import { createUseKibanaMock } from '../../../../common/mock/kibana_react'; +export { mapping } from '../../../containers/configure/mock'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { actionTypeRegistryMock } from '../../../../../../../triggers_actions_ui/public/application/action_type_registry.mock'; +import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock'; export const connectors: Connector[] = connectorsMock; +// x - pack / plugins / triggers_actions_ui; export const searchURL = '?timerange=(global:(linkTo:!(),timerange:(from:1585487656371,fromStr:now-24h,kind:relative,to:1585574056371,toStr:now)),timeline:(linkTo:!(),timerange:(from:1585227005527,kind:absolute,to:1585313405527)))'; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/button.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/button.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/button.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/button.test.tsx index cf52fef94ed17e..550b9bd9896a3b 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/button.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/button.test.tsx @@ -9,7 +9,7 @@ import { ReactWrapper, mount } from 'enzyme'; import { EuiText } from '@elastic/eui'; import { ConfigureCaseButton, ConfigureCaseButtonProps } from './button'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; import { searchURL } from './__mock__'; describe('Configuration button', () => { diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/button.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/button.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/button.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/button.tsx index 844ffea28415f6..a6d78d4a2a6202 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/button.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/button.tsx @@ -6,7 +6,7 @@ import { EuiButton, EuiToolTip } from '@elastic/eui'; import React, { memo, useMemo } from 'react'; -import { getConfigureCasesUrl } from '../../../../components/link_to'; +import { getConfigureCasesUrl } from '../../../common/components/link_to'; export interface ConfigureCaseButtonProps { label: string; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/closure_options.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/closure_options.test.tsx index eaef524b13da86..6192fd0ee9fff2 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/closure_options.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { mount, ReactWrapper } from 'enzyme'; import { ClosureOptions, ClosureOptionsProps } from './closure_options'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; import { ClosureOptionsRadio } from './closure_options_radio'; describe('ClosureOptions', () => { diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/closure_options.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/closure_options.tsx index 6fa97818dd0ce3..b845b423449ea2 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/closure_options.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { EuiDescribedFormGroup, EuiFormRow } from '@elastic/eui'; -import { ClosureType } from '../../../../containers/case/configure/types'; +import { ClosureType } from '../../containers/configure/types'; import { ClosureOptionsRadio } from './closure_options_radio'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options_radio.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/closure_options_radio.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options_radio.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/closure_options_radio.test.tsx index f2ef2c2d55c288..dae2204bc46653 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options_radio.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/closure_options_radio.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { ReactWrapper, mount } from 'enzyme'; import { ClosureOptionsRadio, ClosureOptionsRadioComponentProps } from './closure_options_radio'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; describe('ClosureOptionsRadio', () => { let wrapper: ReactWrapper; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options_radio.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/closure_options_radio.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options_radio.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/closure_options_radio.tsx index d2cdb7ecda7ba4..673c8fbcc70d0f 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/closure_options_radio.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/closure_options_radio.tsx @@ -7,7 +7,7 @@ import React, { ReactNode, useCallback } from 'react'; import { EuiRadioGroup } from '@elastic/eui'; -import { ClosureType } from '../../../../containers/case/configure/types'; +import { ClosureType } from '../../containers/configure/types'; import * as i18n from './translations'; interface ClosureRadios { diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/connectors.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/connectors.test.tsx index b0271f6849ac58..41cd3e549415d5 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/connectors.test.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { mount, ReactWrapper } from 'enzyme'; import { Connectors, Props } from './connectors'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; import { ConnectorsDropdown } from './connectors_dropdown'; import { connectors } from './__mock__'; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/connectors.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/connectors.tsx index 1b1439d3bac438..3916ce297a0a47 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/connectors.tsx @@ -19,7 +19,7 @@ import styled from 'styled-components'; import { ConnectorsDropdown } from './connectors_dropdown'; import * as i18n from './translations'; -import { Connector } from '../../../../containers/case/configure/types'; +import { Connector } from '../../containers/configure/types'; const EuiFormRowExtended = styled(EuiFormRow)` .euiFormRow__labelWrapper { diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors_dropdown.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/connectors_dropdown.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors_dropdown.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/connectors_dropdown.test.tsx index 6abe4f1ac00adb..da20078dde0d01 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors_dropdown.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/connectors_dropdown.test.tsx @@ -9,7 +9,7 @@ import { mount, ReactWrapper } from 'enzyme'; import { EuiSuperSelect } from '@elastic/eui'; import { ConnectorsDropdown, Props } from './connectors_dropdown'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; import { connectors } from './__mock__'; describe('ConnectorsDropdown', () => { diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors_dropdown.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/connectors_dropdown.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors_dropdown.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/connectors_dropdown.tsx index 2f73c8c5dba058..b2b2edb04bd296 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/connectors_dropdown.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/connectors_dropdown.tsx @@ -8,8 +8,8 @@ import React, { useMemo } from 'react'; import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiSuperSelect } from '@elastic/eui'; import styled from 'styled-components'; -import { Connector } from '../../../../containers/case/configure/types'; -import { connectorsConfiguration } from '../../../../lib/connectors/config'; +import { Connector } from '../../containers/configure/types'; +import { connectorsConfiguration } from '../../../common/lib/connectors/config'; import * as i18n from './translations'; export interface Props { diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping.test.tsx index 498757a34b78d2..7f9ad877066939 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping.test.tsx @@ -7,13 +7,13 @@ import React from 'react'; import { mount, ReactWrapper } from 'enzyme'; -import { connectorsConfiguration } from '../../../../lib/connectors/config'; -import { createDefaultMapping } from '../../../../lib/connectors/utils'; +import { connectorsConfiguration } from '../../../common/lib/connectors/config'; +import { createDefaultMapping } from '../../../common/lib/connectors/utils'; import { FieldMapping, FieldMappingProps } from './field_mapping'; import { mapping } from './__mock__'; import { FieldMappingRow } from './field_mapping_row'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; describe('FieldMappingRow', () => { let wrapper: ReactWrapper; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping.tsx index 41a6fbca3c0072..0eab690915f40a 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping.tsx @@ -13,17 +13,17 @@ import { CaseField, ActionType, ThirdPartyField, -} from '../../../../containers/case/configure/types'; +} from '../../containers/configure/types'; import { FieldMappingRow } from './field_mapping_row'; import * as i18n from './translations'; -import { connectorsConfiguration } from '../../../../lib/connectors/config'; +import { connectorsConfiguration } from '../../../common/lib/connectors/config'; import { setActionTypeToMapping, setThirdPartyToMapping } from './utils'; import { ThirdPartyField as ConnectorConfigurationThirdPartyField, AllThirdPartyFields, -} from '../../../../lib/connectors/types'; -import { createDefaultMapping } from '../../../../lib/connectors/utils'; +} from '../../../common/lib/connectors/types'; +import { createDefaultMapping } from '../../../common/lib/connectors/utils'; const FieldRowWrapper = styled.div` margin-top: 8px; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping_row.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping_row.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping_row.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping_row.test.tsx index e30096cc7eb62a..4d0401fdf1bfd7 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping_row.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping_row.test.tsx @@ -9,8 +9,8 @@ import { mount, ReactWrapper } from 'enzyme'; import { EuiSuperSelectOption, EuiSuperSelect } from '@elastic/eui'; import { FieldMappingRow, RowProps } from './field_mapping_row'; -import { TestProviders } from '../../../../mock'; -import { ThirdPartyField, ActionType } from '../../../../containers/case/configure/types'; +import { TestProviders } from '../../../common/mock'; +import { ThirdPartyField, ActionType } from '../../containers/configure/types'; const thirdPartyOptions: Array> = [ { diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping_row.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping_row.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping_row.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping_row.tsx index 687b0517326eb0..922ea7222efce3 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/field_mapping_row.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/field_mapping_row.tsx @@ -14,13 +14,8 @@ import { } from '@elastic/eui'; import { capitalize } from 'lodash/fp'; - -import { - CaseField, - ActionType, - ThirdPartyField, -} from '../../../../containers/case/configure/types'; -import { AllThirdPartyFields } from '../../../../lib/connectors/types'; +import { CaseField, ActionType, ThirdPartyField } from '../../containers/configure/types'; +import { AllThirdPartyFields } from '../../../common/lib/connectors/types'; export interface RowProps { id: string; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/index.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/index.test.tsx index 08975703241c74..fcacb6dedff7d1 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/index.test.tsx @@ -7,20 +7,20 @@ import React from 'react'; import { ReactWrapper, mount } from 'enzyme'; -import { ConfigureCases } from './'; -import { TestProviders } from '../../../../mock'; +import { ConfigureCases } from '.'; +import { TestProviders } from '../../../common/mock'; import { Connectors } from './connectors'; import { ClosureOptions } from './closure_options'; import { ActionsConnectorsContextProvider, ConnectorAddFlyout, ConnectorEditFlyout, -} from '../../../../../../triggers_actions_ui/public'; +} from '../../../../../triggers_actions_ui/public'; -import { useKibana } from '../../../../lib/kibana'; -import { useConnectors } from '../../../../containers/case/configure/use_connectors'; -import { useCaseConfigure } from '../../../../containers/case/configure/use_configure'; -import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search'; +import { useKibana } from '../../../common/lib/kibana'; +import { useConnectors } from '../../containers/configure/use_connectors'; +import { useCaseConfigure } from '../../containers/configure/use_configure'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; import { connectors, @@ -30,10 +30,10 @@ import { kibanaMockImplementationArgs, } from './__mock__'; -jest.mock('../../../../lib/kibana'); -jest.mock('../../../../containers/case/configure/use_connectors'); -jest.mock('../../../../containers/case/configure/use_configure'); -jest.mock('../../../../components/navigation/use_get_url_search'); +jest.mock('../../../common/lib/kibana'); +jest.mock('../../containers/configure/use_connectors'); +jest.mock('../../containers/configure/use_configure'); +jest.mock('../../../common/components/navigation/use_get_url_search'); const useKibanaMock = useKibana as jest.Mock; const useConnectorsMock = useConnectors as jest.Mock; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/index.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/index.tsx similarity index 91% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/index.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/index.tsx index 739083a5009ecd..d5c6cc671433bf 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/index.tsx @@ -16,28 +16,27 @@ import { EuiButtonEmpty, EuiText, } from '@elastic/eui'; - import { difference } from 'lodash/fp'; -import { useKibana } from '../../../../lib/kibana'; -import { useConnectors } from '../../../../containers/case/configure/use_connectors'; -import { useCaseConfigure } from '../../../../containers/case/configure/use_configure'; +import { useKibana } from '../../../common/lib/kibana'; +import { useConnectors } from '../../containers/configure/use_connectors'; +import { useCaseConfigure } from '../../containers/configure/use_configure'; import { ActionsConnectorsContextProvider, ActionType, ConnectorAddFlyout, ConnectorEditFlyout, -} from '../../../../../../triggers_actions_ui/public'; +} from '../../../../../triggers_actions_ui/public'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { ActionConnectorTableItem } from '../../../../../../triggers_actions_ui/public/types'; -import { getCaseUrl } from '../../../../components/link_to'; -import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search'; -import { connectorsConfiguration } from '../../../../lib/connectors/config'; +import { ActionConnectorTableItem } from '../../../../../triggers_actions_ui/public/types'; +import { getCaseUrl } from '../../../common/components/link_to'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { connectorsConfiguration } from '../../../common/lib/connectors/config'; -import { Connectors } from '../configure_cases/connectors'; -import { ClosureOptions } from '../configure_cases/closure_options'; +import { Connectors } from './connectors'; +import { ClosureOptions } from './closure_options'; import { SectionWrapper } from '../wrappers'; -import { navTabs } from '../../../../pages/home/home_navigations'; +import { navTabs } from '../../../app/home/home_navigations'; import * as i18n from './translations'; const FormWrapper = styled.div` diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/mapping.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/mapping.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/mapping.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/mapping.test.tsx index 083904d303490f..68a35987ecaf60 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/mapping.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/mapping.test.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { mount, ReactWrapper } from 'enzyme'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; import { Mapping, MappingProps } from './mapping'; import { mapping } from './__mock__'; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/mapping.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/mapping.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/mapping.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/mapping.tsx index acbcdac68a1340..2c3172a30f159f 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/mapping.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/mapping.tsx @@ -18,7 +18,7 @@ import { import * as i18n from './translations'; import { FieldMapping } from './field_mapping'; -import { CasesConfigurationMapping } from '../../../../containers/case/configure/types'; +import { CasesConfigurationMapping } from '../../containers/configure/types'; export interface MappingProps { disabled: boolean; diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/translations.ts b/x-pack/plugins/siem/public/cases/components/configure_cases/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/translations.ts rename to x-pack/plugins/siem/public/cases/components/configure_cases/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/utils.test.tsx b/x-pack/plugins/siem/public/cases/components/configure_cases/utils.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/utils.test.tsx rename to x-pack/plugins/siem/public/cases/components/configure_cases/utils.test.tsx index 1c6fc9b2d405f9..d6755f687100f7 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/utils.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/utils.test.tsx @@ -6,7 +6,7 @@ import { mapping } from './__mock__'; import { setActionTypeToMapping, setThirdPartyToMapping } from './utils'; -import { CasesConfigurationMapping } from '../../../../containers/case/configure/types'; +import { CasesConfigurationMapping } from '../../containers/configure/types'; describe('FieldMappingRow', () => { test('it should change the action type', () => { diff --git a/x-pack/plugins/siem/public/pages/case/components/configure_cases/utils.ts b/x-pack/plugins/siem/public/cases/components/configure_cases/utils.ts similarity index 95% rename from x-pack/plugins/siem/public/pages/case/components/configure_cases/utils.ts rename to x-pack/plugins/siem/public/cases/components/configure_cases/utils.ts index a44378c22e8929..95851ec294e0bc 100644 --- a/x-pack/plugins/siem/public/pages/case/components/configure_cases/utils.ts +++ b/x-pack/plugins/siem/public/cases/components/configure_cases/utils.ts @@ -8,7 +8,7 @@ import { ActionType, CasesConfigurationMapping, ThirdPartyField, -} from '../../../../containers/case/configure/types'; +} from '../../containers/configure/types'; export const setActionTypeToMapping = ( caseField: CaseField, diff --git a/x-pack/plugins/siem/public/pages/case/components/confirm_delete_case/index.tsx b/x-pack/plugins/siem/public/cases/components/confirm_delete_case/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/confirm_delete_case/index.tsx rename to x-pack/plugins/siem/public/cases/components/confirm_delete_case/index.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/confirm_delete_case/translations.ts b/x-pack/plugins/siem/public/cases/components/confirm_delete_case/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/confirm_delete_case/translations.ts rename to x-pack/plugins/siem/public/cases/components/confirm_delete_case/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/connector_selector/form.tsx b/x-pack/plugins/siem/public/cases/components/connector_selector/form.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/case/components/connector_selector/form.tsx rename to x-pack/plugins/siem/public/cases/components/connector_selector/form.tsx index 5f0e498bb40562..9e058ee5cf09e1 100644 --- a/x-pack/plugins/siem/public/pages/case/components/connector_selector/form.tsx +++ b/x-pack/plugins/siem/public/cases/components/connector_selector/form.tsx @@ -7,9 +7,9 @@ import { EuiFormRow } from '@elastic/eui'; import React, { useCallback, useEffect } from 'react'; -import { FieldHook, getFieldValidityAndErrorMessage } from '../../../../shared_imports'; +import { FieldHook, getFieldValidityAndErrorMessage } from '../../../shared_imports'; import { ConnectorsDropdown } from '../configure_cases/connectors_dropdown'; -import { Connector } from '../../../../../../case/common/api/cases'; +import { Connector } from '../../../../../case/common/api/cases'; interface ConnectorSelectorProps { connectors: Connector[]; diff --git a/x-pack/plugins/siem/public/pages/case/components/create/index.test.tsx b/x-pack/plugins/siem/public/cases/components/create/index.test.tsx similarity index 81% rename from x-pack/plugins/siem/public/pages/case/components/create/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/create/index.test.tsx index 4c2e15ddfa98a9..647a0d32472591 100644 --- a/x-pack/plugins/siem/public/pages/case/components/create/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/create/index.test.tsx @@ -7,26 +7,26 @@ import React from 'react'; import { mount } from 'enzyme'; -import { Create } from './'; -import { TestProviders } from '../../../../mock'; +import { Create } from '.'; +import { TestProviders } from '../../../common/mock'; import { getFormMock } from '../__mock__/form'; import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router'; -import { useInsertTimeline } from '../../../../components/timeline/insert_timeline_popover/use_insert_timeline'; -import { usePostCase } from '../../../../containers/case/use_post_case'; -import { useGetTags } from '../../../../containers/case/use_get_tags'; +import { useInsertTimeline } from '../../../timelines/components/timeline/insert_timeline_popover/use_insert_timeline'; +import { usePostCase } from '../../containers/use_post_case'; +import { useGetTags } from '../../containers/use_get_tags'; -jest.mock('../../../../components/timeline/insert_timeline_popover/use_insert_timeline'); -jest.mock('../../../../containers/case/use_post_case'); -import { useForm } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks'; -import { wait } from '../../../../lib/helpers'; -import { SiemPageName } from '../../../home/types'; +jest.mock('../../../timelines/components/timeline/insert_timeline_popover/use_insert_timeline'); +jest.mock('../../containers/use_post_case'); +import { useForm } from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form'; +import { wait } from '../../../common/lib/helpers'; +import { SiemPageName } from '../../../app/types'; jest.mock( - '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' + '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' ); -jest.mock('../../../../containers/case/use_get_tags'); +jest.mock('../../containers/use_get_tags'); jest.mock( - '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider', + '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider', () => ({ FormDataProvider: ({ children }: { children: ({ tags }: { tags: string[] }) => void }) => children({ tags: ['rad', 'dude'] }), diff --git a/x-pack/plugins/siem/public/pages/case/components/create/index.tsx b/x-pack/plugins/siem/public/cases/components/create/index.tsx similarity index 90% rename from x-pack/plugins/siem/public/pages/case/components/create/index.tsx rename to x-pack/plugins/siem/public/cases/components/create/index.tsx index 6731b88572cdd3..655536faa171db 100644 --- a/x-pack/plugins/siem/public/pages/case/components/create/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/create/index.tsx @@ -16,7 +16,7 @@ import styled, { css } from 'styled-components'; import { Redirect } from 'react-router-dom'; import { isEqual } from 'lodash/fp'; -import { CasePostRequest } from '../../../../../../case/common/api'; +import { CasePostRequest } from '../../../../../case/common/api'; import { Field, Form, @@ -24,15 +24,15 @@ import { useForm, UseField, FormDataProvider, -} from '../../../../shared_imports'; -import { usePostCase } from '../../../../containers/case/use_post_case'; +} from '../../../shared_imports'; +import { usePostCase } from '../../containers/use_post_case'; import { schema } from './schema'; -import { InsertTimelinePopover } from '../../../../components/timeline/insert_timeline_popover'; -import { useInsertTimeline } from '../../../../components/timeline/insert_timeline_popover/use_insert_timeline'; +import { InsertTimelinePopover } from '../../../timelines/components/timeline/insert_timeline_popover'; +import { useInsertTimeline } from '../../../timelines/components/timeline/insert_timeline_popover/use_insert_timeline'; import * as i18n from '../../translations'; -import { SiemPageName } from '../../../home/types'; -import { MarkdownEditorForm } from '../../../../components/markdown_editor/form'; -import { useGetTags } from '../../../../containers/case/use_get_tags'; +import { SiemPageName } from '../../../app/types'; +import { MarkdownEditorForm } from '../../../common/components//markdown_editor/form'; +import { useGetTags } from '../../containers/use_get_tags'; export const CommonUseField = getUseField({ component: Field }); diff --git a/x-pack/plugins/siem/public/pages/case/components/create/optional_field_label/index.tsx b/x-pack/plugins/siem/public/cases/components/create/optional_field_label/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/create/optional_field_label/index.tsx rename to x-pack/plugins/siem/public/cases/components/create/optional_field_label/index.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/create/schema.tsx b/x-pack/plugins/siem/public/cases/components/create/schema.tsx similarity index 91% rename from x-pack/plugins/siem/public/pages/case/components/create/schema.tsx rename to x-pack/plugins/siem/public/cases/components/create/schema.tsx index a4e0bb69165317..ce38033271d043 100644 --- a/x-pack/plugins/siem/public/pages/case/components/create/schema.tsx +++ b/x-pack/plugins/siem/public/cases/components/create/schema.tsx @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { CasePostRequest } from '../../../../../../case/common/api'; -import { FIELD_TYPES, fieldValidators, FormSchema } from '../../../../shared_imports'; +import { CasePostRequest } from '../../../../../case/common/api'; +import { FIELD_TYPES, fieldValidators, FormSchema } from '../../../shared_imports'; import * as i18n from '../../translations'; import { OptionalFieldLabel } from './optional_field_label'; diff --git a/x-pack/plugins/siem/public/pages/case/components/edit_connector/index.test.tsx b/x-pack/plugins/siem/public/cases/components/edit_connector/index.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/case/components/edit_connector/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/edit_connector/index.test.tsx index 29776360b72da1..5dfed80baa8edb 100644 --- a/x-pack/plugins/siem/public/pages/case/components/edit_connector/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/edit_connector/index.test.tsx @@ -9,12 +9,12 @@ import { mount } from 'enzyme'; import { EditConnector } from './index'; import { getFormMock, useFormMock } from '../__mock__/form'; -import { TestProviders } from '../../../../mock'; -import { connectorsMock } from '../../../../containers/case/configure/mock'; -import { wait } from '../../../../lib/helpers'; +import { TestProviders } from '../../../common/mock'; +import { connectorsMock } from '../../containers/configure/mock'; +import { wait } from '../../../common/lib/helpers'; import { act } from 'react-dom/test-utils'; jest.mock( - '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' + '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' ); const onSubmit = jest.fn(); const defaultProps = { diff --git a/x-pack/plugins/siem/public/pages/case/components/edit_connector/index.tsx b/x-pack/plugins/siem/public/cases/components/edit_connector/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/edit_connector/index.tsx rename to x-pack/plugins/siem/public/cases/components/edit_connector/index.tsx index 83be8b5ad7e5a4..29f06532a4ab4a 100644 --- a/x-pack/plugins/siem/public/pages/case/components/edit_connector/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/edit_connector/index.tsx @@ -17,10 +17,10 @@ import { } from '@elastic/eui'; import styled, { css } from 'styled-components'; import * as i18n from '../../translations'; -import { Form, UseField, useForm } from '../../../../shared_imports'; +import { Form, UseField, useForm } from '../../../shared_imports'; import { schema } from './schema'; import { ConnectorSelector } from '../connector_selector/form'; -import { Connector } from '../../../../../../case/common/api/cases'; +import { Connector } from '../../../../../case/common/api/cases'; interface EditConnectorProps { connectors: Connector[]; diff --git a/x-pack/plugins/siem/public/pages/case/components/edit_connector/schema.tsx b/x-pack/plugins/siem/public/cases/components/edit_connector/schema.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/case/components/edit_connector/schema.tsx rename to x-pack/plugins/siem/public/cases/components/edit_connector/schema.tsx index 4b9008839e695c..cdc50c7d28e4f1 100644 --- a/x-pack/plugins/siem/public/pages/case/components/edit_connector/schema.tsx +++ b/x-pack/plugins/siem/public/cases/components/edit_connector/schema.tsx @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { FormSchema } from '../../../../shared_imports'; +import { FormSchema } from '../../../shared_imports'; export const schema: FormSchema = { connector: { diff --git a/x-pack/plugins/siem/public/components/filter_popover/index.tsx b/x-pack/plugins/siem/public/cases/components/filter_popover/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/filter_popover/index.tsx rename to x-pack/plugins/siem/public/cases/components/filter_popover/index.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/open_closed_stats/index.tsx b/x-pack/plugins/siem/public/cases/components/open_closed_stats/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/open_closed_stats/index.tsx rename to x-pack/plugins/siem/public/cases/components/open_closed_stats/index.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/property_actions/constants.ts b/x-pack/plugins/siem/public/cases/components/property_actions/constants.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/property_actions/constants.ts rename to x-pack/plugins/siem/public/cases/components/property_actions/constants.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/property_actions/index.tsx b/x-pack/plugins/siem/public/cases/components/property_actions/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/property_actions/index.tsx rename to x-pack/plugins/siem/public/cases/components/property_actions/index.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/property_actions/translations.ts b/x-pack/plugins/siem/public/cases/components/property_actions/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/property_actions/translations.ts rename to x-pack/plugins/siem/public/cases/components/property_actions/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/tag_list/index.test.tsx b/x-pack/plugins/siem/public/cases/components/tag_list/index.test.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/case/components/tag_list/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/tag_list/index.test.tsx index 9ddb96a4ed295a..0b7b4211f6a3b5 100644 --- a/x-pack/plugins/siem/public/pages/case/components/tag_list/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/tag_list/index.test.tsx @@ -8,19 +8,19 @@ import React from 'react'; import { mount } from 'enzyme'; import { act } from 'react-dom/test-utils'; -import { TagList } from './'; +import { TagList } from '.'; import { getFormMock } from '../__mock__/form'; -import { TestProviders } from '../../../../mock'; -import { wait } from '../../../../lib/helpers'; -import { useForm } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks'; -import { useGetTags } from '../../../../containers/case/use_get_tags'; +import { TestProviders } from '../../../common/mock'; +import { wait } from '../../../common/lib/helpers'; +import { useForm } from '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form'; +import { useGetTags } from '../../containers/use_get_tags'; jest.mock( - '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' + '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form' ); -jest.mock('../../../../containers/case/use_get_tags'); +jest.mock('../../containers/use_get_tags'); jest.mock( - '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider', + '../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider', () => ({ FormDataProvider: ({ children }: { children: ({ tags }: { tags: string[] }) => void }) => children({ tags: ['rad', 'dude'] }), diff --git a/x-pack/plugins/siem/public/pages/case/components/tag_list/index.tsx b/x-pack/plugins/siem/public/cases/components/tag_list/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/tag_list/index.tsx rename to x-pack/plugins/siem/public/cases/components/tag_list/index.tsx index c61feab0bab989..259028d9c6363a 100644 --- a/x-pack/plugins/siem/public/pages/case/components/tag_list/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/tag_list/index.tsx @@ -19,10 +19,10 @@ import { import styled, { css } from 'styled-components'; import { isEqual } from 'lodash/fp'; import * as i18n from './translations'; -import { Form, FormDataProvider, useForm } from '../../../../shared_imports'; +import { Form, FormDataProvider, useForm } from '../../../shared_imports'; import { schema } from './schema'; import { CommonUseField } from '../create'; -import { useGetTags } from '../../../../containers/case/use_get_tags'; +import { useGetTags } from '../../containers/use_get_tags'; interface TagListProps { disabled?: boolean; diff --git a/x-pack/plugins/siem/public/pages/case/components/tag_list/schema.tsx b/x-pack/plugins/siem/public/cases/components/tag_list/schema.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/case/components/tag_list/schema.tsx rename to x-pack/plugins/siem/public/cases/components/tag_list/schema.tsx index 50ba114de528e0..335a0785ecb046 100644 --- a/x-pack/plugins/siem/public/pages/case/components/tag_list/schema.tsx +++ b/x-pack/plugins/siem/public/cases/components/tag_list/schema.tsx @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { FormSchema } from '../../../../shared_imports'; +import { FormSchema } from '../../../shared_imports'; import { schemaTags } from '../create/schema'; export const schema: FormSchema = { diff --git a/x-pack/plugins/siem/public/pages/case/components/tag_list/translations.ts b/x-pack/plugins/siem/public/cases/components/tag_list/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/tag_list/translations.ts rename to x-pack/plugins/siem/public/cases/components/tag_list/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/use_push_to_service/helpers.tsx b/x-pack/plugins/siem/public/cases/components/use_push_to_service/helpers.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/case/components/use_push_to_service/helpers.tsx rename to x-pack/plugins/siem/public/cases/components/use_push_to_service/helpers.tsx index 0613c40d1181d6..f0ded815fce434 100644 --- a/x-pack/plugins/siem/public/pages/case/components/use_push_to_service/helpers.tsx +++ b/x-pack/plugins/siem/public/cases/components/use_push_to_service/helpers.tsx @@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React from 'react'; import * as i18n from './translations'; -import { ActionLicense } from '../../../../containers/case/types'; +import { ActionLicense } from '../../containers/types'; export const getLicenseError = () => ({ title: i18n.PUSH_DISABLE_BY_LICENSE_TITLE, diff --git a/x-pack/plugins/siem/public/pages/case/components/use_push_to_service/index.test.tsx b/x-pack/plugins/siem/public/cases/components/use_push_to_service/index.test.tsx similarity index 89% rename from x-pack/plugins/siem/public/pages/case/components/use_push_to_service/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/use_push_to_service/index.test.tsx index b19c2dbf5273a5..cb002019423127 100644 --- a/x-pack/plugins/siem/public/pages/case/components/use_push_to_service/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/use_push_to_service/index.test.tsx @@ -6,17 +6,17 @@ /* eslint-disable react/display-name */ import React from 'react'; import { renderHook, act } from '@testing-library/react-hooks'; -import { usePushToService, ReturnUsePushToService, UsePushToService } from './'; -import { TestProviders } from '../../../../mock'; -import { usePostPushToService } from '../../../../containers/case/use_post_push_to_service'; -import { basicPush, actionLicenses } from '../../../../containers/case/mock'; +import { usePushToService, ReturnUsePushToService, UsePushToService } from '.'; +import { TestProviders } from '../../../common/mock'; +import { usePostPushToService } from '../../containers/use_post_push_to_service'; +import { basicPush, actionLicenses } from '../../containers/mock'; import * as i18n from './translations'; -import { useGetActionLicense } from '../../../../containers/case/use_get_action_license'; +import { useGetActionLicense } from '../../containers/use_get_action_license'; import { getKibanaConfigError, getLicenseError } from './helpers'; -import { connectorsMock } from '../../../../containers/case/configure/mock'; -jest.mock('../../../../containers/case/use_get_action_license'); -jest.mock('../../../../containers/case/use_post_push_to_service'); -jest.mock('../../../../containers/case/configure/api'); +import { connectorsMock } from '../../containers/configure/mock'; +jest.mock('../../containers/use_get_action_license'); +jest.mock('../../containers/use_post_push_to_service'); +jest.mock('../../containers/configure/api'); describe('usePushToService', () => { const caseId = '12345'; diff --git a/x-pack/plugins/siem/public/pages/case/components/use_push_to_service/index.tsx b/x-pack/plugins/siem/public/cases/components/use_push_to_service/index.tsx similarity index 89% rename from x-pack/plugins/siem/public/pages/case/components/use_push_to_service/index.tsx rename to x-pack/plugins/siem/public/cases/components/use_push_to_service/index.tsx index 7f3a951339ef1c..157639f011fef8 100644 --- a/x-pack/plugins/siem/public/pages/case/components/use_push_to_service/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/use_push_to_service/index.tsx @@ -8,17 +8,17 @@ import { EuiButton, EuiLink, EuiToolTip } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { useCallback, useMemo } from 'react'; -import { Case } from '../../../../containers/case/types'; -import { useGetActionLicense } from '../../../../containers/case/use_get_action_license'; -import { usePostPushToService } from '../../../../containers/case/use_post_push_to_service'; -import { getConfigureCasesUrl } from '../../../../components/link_to'; -import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search'; -import { navTabs } from '../../../home/home_navigations'; +import { Case } from '../../containers/types'; +import { useGetActionLicense } from '../../containers/use_get_action_license'; +import { usePostPushToService } from '../../containers/use_post_push_to_service'; +import { getConfigureCasesUrl } from '../../../common/components/link_to'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../app/home/home_navigations'; import { CaseCallOut } from '../callout'; import { getLicenseError, getKibanaConfigError } from './helpers'; import * as i18n from './translations'; -import { Connector } from '../../../../../../case/common/api/cases'; -import { CaseServices } from '../../../../containers/case/use_get_case_user_actions'; +import { Connector } from '../../../../../case/common/api/cases'; +import { CaseServices } from '../../containers/use_get_case_user_actions'; export interface UsePushToService { caseId: string; diff --git a/x-pack/plugins/siem/public/pages/case/components/use_push_to_service/translations.ts b/x-pack/plugins/siem/public/cases/components/use_push_to_service/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/use_push_to_service/translations.ts rename to x-pack/plugins/siem/public/cases/components/use_push_to_service/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/helpers.test.tsx b/x-pack/plugins/siem/public/cases/components/user_action_tree/helpers.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/helpers.test.tsx rename to x-pack/plugins/siem/public/cases/components/user_action_tree/helpers.test.tsx index 6e7c2979f80bb4..678bd54975144b 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/helpers.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/user_action_tree/helpers.test.tsx @@ -5,11 +5,11 @@ */ import React from 'react'; -import { basicPush, getUserAction } from '../../../../containers/case/mock'; +import { basicPush, getUserAction } from '../../containers/mock'; import { getLabelTitle } from './helpers'; import * as i18n from '../case_view/translations'; import { mount } from 'enzyme'; -import { connectorsMock } from '../../../../containers/case/configure/mock'; +import { connectorsMock } from '../../containers/configure/mock'; describe('User action tree helpers', () => { const connectors = connectorsMock; diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx b/x-pack/plugins/siem/public/cases/components/user_action_tree/helpers.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx rename to x-pack/plugins/siem/public/cases/components/user_action_tree/helpers.tsx index 285fa3c58c18a7..58c176ed96b5d2 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/helpers.tsx +++ b/x-pack/plugins/siem/public/cases/components/user_action_tree/helpers.tsx @@ -7,8 +7,8 @@ import { EuiFlexGroup, EuiFlexItem, EuiBadge, EuiLink } from '@elastic/eui'; import React from 'react'; -import { CaseFullExternalService, Connector } from '../../../../../../case/common/api'; -import { CaseUserActions } from '../../../../containers/case/types'; +import { CaseFullExternalService, Connector } from '../../../../../case/common/api'; +import { CaseUserActions } from '../../containers/types'; import * as i18n from '../case_view/translations'; interface LabelTitle { diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/index.test.tsx b/x-pack/plugins/siem/public/cases/components/user_action_tree/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/user_action_tree/index.test.tsx index b9a94f83fded1a..d3e8ea6563b2c5 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/user_action_tree/index.test.tsx @@ -9,11 +9,11 @@ import { mount } from 'enzyme'; import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router'; import { getFormMock, useFormMock } from '../__mock__/form'; -import { useUpdateComment } from '../../../../containers/case/use_update_comment'; -import { basicCase, basicPush, getUserAction } from '../../../../containers/case/mock'; -import { UserActionTree } from './'; -import { TestProviders } from '../../../../mock'; -import { wait } from '../../../../lib/helpers'; +import { useUpdateComment } from '../../containers/use_update_comment'; +import { basicCase, basicPush, getUserAction } from '../../containers/mock'; +import { UserActionTree } from '.'; +import { TestProviders } from '../../../common/mock'; +import { wait } from '../../../common/lib/helpers'; import { act } from 'react-dom/test-utils'; const fetchUserActions = jest.fn(); @@ -32,7 +32,7 @@ const defaultProps = { userCanCrud: true, }; const useUpdateCommentMock = useUpdateComment as jest.Mock; -jest.mock('../../../../containers/case/use_update_comment'); +jest.mock('../../containers/use_update_comment'); const patchComment = jest.fn(); describe('UserActionTree ', () => { diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/index.tsx b/x-pack/plugins/siem/public/cases/components/user_action_tree/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/index.tsx rename to x-pack/plugins/siem/public/cases/components/user_action_tree/index.tsx index 80d2c20631432f..3a909636bc0484 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/user_action_tree/index.tsx @@ -11,16 +11,16 @@ import styled from 'styled-components'; import * as i18n from '../case_view/translations'; -import { Case, CaseUserActions } from '../../../../containers/case/types'; -import { useUpdateComment } from '../../../../containers/case/use_update_comment'; -import { useCurrentUser } from '../../../../lib/kibana'; +import { Case, CaseUserActions } from '../../containers/types'; +import { useUpdateComment } from '../../containers/use_update_comment'; +import { useCurrentUser } from '../../../common/lib/kibana'; import { AddComment } from '../add_comment'; import { getLabelTitle } from './helpers'; import { UserActionItem } from './user_action_item'; import { UserActionMarkdown } from './user_action_markdown'; -import { Connector } from '../../../../../../case/common/api/cases'; -import { CaseServices } from '../../../../containers/case/use_get_case_user_actions'; -import { parseString } from '../../../../containers/case/utils'; +import { Connector } from '../../../../../case/common/api/cases'; +import { CaseServices } from '../../containers/use_get_case_user_actions'; +import { parseString } from '../../containers/utils'; export interface UserActionTreeProps { caseServices: CaseServices; diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/schema.ts b/x-pack/plugins/siem/public/cases/components/user_action_tree/schema.ts similarity index 96% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/schema.ts rename to x-pack/plugins/siem/public/cases/components/user_action_tree/schema.ts index a9e6bf84a1a1e0..7a2777037023ad 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/schema.ts +++ b/x-pack/plugins/siem/public/cases/components/user_action_tree/schema.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { FIELD_TYPES, fieldValidators, FormSchema } from '../../../../shared_imports'; +import { FIELD_TYPES, fieldValidators, FormSchema } from '../../../shared_imports'; import * as i18n from '../../translations'; const { emptyField } = fieldValidators; diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/translations.ts b/x-pack/plugins/siem/public/cases/components/user_action_tree/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/translations.ts rename to x-pack/plugins/siem/public/cases/components/user_action_tree/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_avatar.tsx b/x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_avatar.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_avatar.tsx rename to x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_avatar.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx b/x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_item.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_item.tsx rename to x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_item.tsx diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_markdown.tsx b/x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_markdown.tsx similarity index 87% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_markdown.tsx rename to x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_markdown.tsx index 827fe2df120abd..23d8d8f1a7e680 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_markdown.tsx +++ b/x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_markdown.tsx @@ -9,12 +9,12 @@ import React, { useCallback } from 'react'; import styled, { css } from 'styled-components'; import * as i18n from '../case_view/translations'; -import { Markdown } from '../../../../components/markdown'; -import { Form, useForm, UseField } from '../../../../shared_imports'; +import { Markdown } from '../../../common/components/markdown'; +import { Form, useForm, UseField } from '../../../shared_imports'; import { schema, Content } from './schema'; -import { InsertTimelinePopover } from '../../../../components/timeline/insert_timeline_popover'; -import { useInsertTimeline } from '../../../../components/timeline/insert_timeline_popover/use_insert_timeline'; -import { MarkdownEditorForm } from '../../../../components/markdown_editor/form'; +import { InsertTimelinePopover } from '../../../timelines/components/timeline/insert_timeline_popover'; +import { useInsertTimeline } from '../../../timelines/components/timeline/insert_timeline_popover/use_insert_timeline'; +import { MarkdownEditorForm } from '../../../common/components//markdown_editor/form'; const ContentWrapper = styled.div` ${({ theme }) => css` diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.test.tsx b/x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_title.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.test.tsx rename to x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_title.test.tsx index 8a1e8a80f664de..cf29fa061e4192 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_title.test.tsx @@ -8,9 +8,9 @@ import React from 'react'; import { mount } from 'enzyme'; import copy from 'copy-to-clipboard'; import { Router, routeData, mockHistory } from '../__mock__/router'; -import { caseUserActions as basicUserActions } from '../../../../containers/case/mock'; +import { caseUserActions as basicUserActions } from '../../containers/mock'; import { UserActionTitle } from './user_action_title'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; const outlineComment = jest.fn(); const onEdit = jest.fn(); diff --git a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx b/x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_title.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx rename to x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_title.tsx index fc2a74466dedc6..307790194421d3 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_action_tree/user_action_title.tsx +++ b/x-pack/plugins/siem/public/cases/components/user_action_tree/user_action_title.tsx @@ -19,11 +19,11 @@ import React, { useMemo, useCallback } from 'react'; import styled from 'styled-components'; import { useParams } from 'react-router-dom'; -import { LocalizedDateTooltip } from '../../../../components/localized_date_tooltip'; -import { useGetUrlSearch } from '../../../../components/navigation/use_get_url_search'; -import { navTabs } from '../../../home/home_navigations'; +import { LocalizedDateTooltip } from '../../../common/components/localized_date_tooltip'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../app/home/home_navigations'; import { PropertyActions } from '../property_actions'; -import { SiemPageName } from '../../../home/types'; +import { SiemPageName } from '../../../app/types'; import * as i18n from './translations'; const MySpinner = styled(EuiLoadingSpinner)` diff --git a/x-pack/plugins/siem/public/pages/case/components/user_list/index.test.tsx b/x-pack/plugins/siem/public/cases/components/user_list/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/user_list/index.test.tsx rename to x-pack/plugins/siem/public/cases/components/user_list/index.test.tsx index 51acb3b810d92e..7916a72d591ad3 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_list/index.test.tsx +++ b/x-pack/plugins/siem/public/cases/components/user_list/index.test.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import { UserList } from './'; +import { UserList } from '.'; import * as i18n from '../case_view/translations'; describe('UserList ', () => { diff --git a/x-pack/plugins/siem/public/pages/case/components/user_list/index.tsx b/x-pack/plugins/siem/public/cases/components/user_list/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/pages/case/components/user_list/index.tsx rename to x-pack/plugins/siem/public/cases/components/user_list/index.tsx index 579e8e48fa147a..0606da371d16ab 100644 --- a/x-pack/plugins/siem/public/pages/case/components/user_list/index.tsx +++ b/x-pack/plugins/siem/public/cases/components/user_list/index.tsx @@ -20,7 +20,7 @@ import { import styled, { css } from 'styled-components'; -import { ElasticUser } from '../../../../containers/case/types'; +import { ElasticUser } from '../../containers/types'; import * as i18n from './translations'; interface UserListProps { diff --git a/x-pack/plugins/siem/public/pages/case/components/user_list/translations.ts b/x-pack/plugins/siem/public/cases/components/user_list/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/user_list/translations.ts rename to x-pack/plugins/siem/public/cases/components/user_list/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/components/wrappers/index.tsx b/x-pack/plugins/siem/public/cases/components/wrappers/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/case/components/wrappers/index.tsx rename to x-pack/plugins/siem/public/cases/components/wrappers/index.tsx diff --git a/x-pack/plugins/siem/public/containers/case/__mocks__/api.ts b/x-pack/plugins/siem/public/cases/containers/__mocks__/api.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/case/__mocks__/api.ts rename to x-pack/plugins/siem/public/cases/containers/__mocks__/api.ts diff --git a/x-pack/plugins/siem/public/containers/case/api.test.tsx b/x-pack/plugins/siem/public/cases/containers/api.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/containers/case/api.test.tsx rename to x-pack/plugins/siem/public/cases/containers/api.test.tsx index 174738098fa107..b4f0c2198b4588 100644 --- a/x-pack/plugins/siem/public/containers/case/api.test.tsx +++ b/x-pack/plugins/siem/public/cases/containers/api.test.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaServices } from '../../lib/kibana'; +import { KibanaServices } from '../../common/lib/kibana'; import { CASES_URL } from '../../../../case/common/constants'; @@ -54,7 +54,7 @@ import * as i18n from './translations'; const abortCtrl = new AbortController(); const mockKibanaServices = KibanaServices.get as jest.Mock; -jest.mock('../../lib/kibana'); +jest.mock('../../common/lib/kibana'); const fetchMock = jest.fn(); mockKibanaServices.mockReturnValue({ http: { fetch: fetchMock } }); diff --git a/x-pack/plugins/siem/public/containers/case/api.ts b/x-pack/plugins/siem/public/cases/containers/api.ts similarity index 99% rename from x-pack/plugins/siem/public/containers/case/api.ts rename to x-pack/plugins/siem/public/cases/containers/api.ts index 438eae9d88a448..678286c0634d4c 100644 --- a/x-pack/plugins/siem/public/containers/case/api.ts +++ b/x-pack/plugins/siem/public/cases/containers/api.ts @@ -35,7 +35,7 @@ import { getCaseCommentsUrl, } from '../../../../case/common/api/helpers'; -import { KibanaServices } from '../../lib/kibana'; +import { KibanaServices } from '../../common/lib/kibana'; import { ActionLicense, diff --git a/x-pack/plugins/siem/public/containers/case/configure/__mocks__/api.ts b/x-pack/plugins/siem/public/cases/containers/configure/__mocks__/api.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/case/configure/__mocks__/api.ts rename to x-pack/plugins/siem/public/cases/containers/configure/__mocks__/api.ts diff --git a/x-pack/plugins/siem/public/containers/case/configure/api.test.ts b/x-pack/plugins/siem/public/cases/containers/configure/api.test.ts similarity index 97% rename from x-pack/plugins/siem/public/containers/case/configure/api.test.ts rename to x-pack/plugins/siem/public/cases/containers/configure/api.test.ts index ef0e51fb1c24db..11a293ef437fae 100644 --- a/x-pack/plugins/siem/public/containers/case/configure/api.test.ts +++ b/x-pack/plugins/siem/public/cases/containers/configure/api.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KibanaServices } from '../../../lib/kibana'; +import { KibanaServices } from '../../../common/lib/kibana'; import { fetchConnectors, getCaseConfigure, postCaseConfigure, patchCaseConfigure } from './api'; import { connectorsMock, @@ -15,7 +15,7 @@ import { const abortCtrl = new AbortController(); const mockKibanaServices = KibanaServices.get as jest.Mock; -jest.mock('../../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); const fetchMock = jest.fn(); mockKibanaServices.mockReturnValue({ http: { fetch: fetchMock } }); diff --git a/x-pack/plugins/siem/public/containers/case/configure/api.ts b/x-pack/plugins/siem/public/cases/containers/configure/api.ts similarity index 97% rename from x-pack/plugins/siem/public/containers/case/configure/api.ts rename to x-pack/plugins/siem/public/cases/containers/configure/api.ts index 4f516764e46f3d..4b4b81460ebc2a 100644 --- a/x-pack/plugins/siem/public/containers/case/configure/api.ts +++ b/x-pack/plugins/siem/public/cases/containers/configure/api.ts @@ -11,7 +11,7 @@ import { CasesConfigureResponse, CasesConfigureRequest, } from '../../../../../case/common/api'; -import { KibanaServices } from '../../../lib/kibana'; +import { KibanaServices } from '../../../common/lib/kibana'; import { CASE_CONFIGURE_CONNECTORS_URL, diff --git a/x-pack/plugins/siem/public/containers/case/configure/mock.ts b/x-pack/plugins/siem/public/cases/containers/configure/mock.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/case/configure/mock.ts rename to x-pack/plugins/siem/public/cases/containers/configure/mock.ts diff --git a/x-pack/plugins/siem/public/containers/case/configure/translations.ts b/x-pack/plugins/siem/public/cases/containers/configure/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/case/configure/translations.ts rename to x-pack/plugins/siem/public/cases/containers/configure/translations.ts diff --git a/x-pack/plugins/siem/public/containers/case/configure/types.ts b/x-pack/plugins/siem/public/cases/containers/configure/types.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/case/configure/types.ts rename to x-pack/plugins/siem/public/cases/containers/configure/types.ts diff --git a/x-pack/plugins/siem/public/containers/case/configure/use_configure.test.tsx b/x-pack/plugins/siem/public/cases/containers/configure/use_configure.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/configure/use_configure.test.tsx rename to x-pack/plugins/siem/public/cases/containers/configure/use_configure.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/configure/use_configure.tsx b/x-pack/plugins/siem/public/cases/containers/configure/use_configure.tsx similarity index 98% rename from x-pack/plugins/siem/public/containers/case/configure/use_configure.tsx rename to x-pack/plugins/siem/public/cases/containers/configure/use_configure.tsx index a185d435f71651..5a85a3a0633bc8 100644 --- a/x-pack/plugins/siem/public/containers/case/configure/use_configure.tsx +++ b/x-pack/plugins/siem/public/cases/containers/configure/use_configure.tsx @@ -7,7 +7,11 @@ import { useEffect, useCallback, useReducer } from 'react'; import { getCaseConfigure, patchCaseConfigure, postCaseConfigure } from './api'; -import { useStateToaster, errorToToaster, displaySuccessToast } from '../../../components/toasters'; +import { + useStateToaster, + errorToToaster, + displaySuccessToast, +} from '../../../common/components/toasters'; import * as i18n from './translations'; import { CasesConfigurationMapping, ClosureType } from './types'; diff --git a/x-pack/plugins/siem/public/containers/case/configure/use_connectors.test.tsx b/x-pack/plugins/siem/public/cases/containers/configure/use_connectors.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/configure/use_connectors.test.tsx rename to x-pack/plugins/siem/public/cases/containers/configure/use_connectors.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/configure/use_connectors.tsx b/x-pack/plugins/siem/public/cases/containers/configure/use_connectors.tsx similarity index 95% rename from x-pack/plugins/siem/public/containers/case/configure/use_connectors.tsx rename to x-pack/plugins/siem/public/cases/containers/configure/use_connectors.tsx index 30108ecf33874a..9cd755864d37b2 100644 --- a/x-pack/plugins/siem/public/containers/case/configure/use_connectors.tsx +++ b/x-pack/plugins/siem/public/cases/containers/configure/use_connectors.tsx @@ -6,7 +6,7 @@ import { useState, useEffect, useCallback } from 'react'; -import { useStateToaster, errorToToaster } from '../../../components/toasters'; +import { useStateToaster, errorToToaster } from '../../../common/components/toasters'; import * as i18n from '../translations'; import { fetchConnectors } from './api'; import { Connector } from './types'; diff --git a/x-pack/plugins/siem/public/containers/case/constants.ts b/x-pack/plugins/siem/public/cases/containers/constants.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/case/constants.ts rename to x-pack/plugins/siem/public/cases/containers/constants.ts diff --git a/x-pack/plugins/siem/public/containers/case/mock.ts b/x-pack/plugins/siem/public/cases/containers/mock.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/case/mock.ts rename to x-pack/plugins/siem/public/cases/containers/mock.ts diff --git a/x-pack/plugins/siem/public/containers/case/translations.ts b/x-pack/plugins/siem/public/cases/containers/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/case/translations.ts rename to x-pack/plugins/siem/public/cases/containers/translations.ts diff --git a/x-pack/plugins/siem/public/containers/case/types.ts b/x-pack/plugins/siem/public/cases/containers/types.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/case/types.ts rename to x-pack/plugins/siem/public/cases/containers/types.ts diff --git a/x-pack/plugins/siem/public/containers/case/use_bulk_update_case.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_bulk_update_case.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_bulk_update_case.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_bulk_update_case.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_bulk_update_case.tsx b/x-pack/plugins/siem/public/cases/containers/use_bulk_update_case.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/case/use_bulk_update_case.tsx rename to x-pack/plugins/siem/public/cases/containers/use_bulk_update_case.tsx index d0cc4d99f8f9f5..b9b64aa77493af 100644 --- a/x-pack/plugins/siem/public/containers/case/use_bulk_update_case.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_bulk_update_case.tsx @@ -5,7 +5,11 @@ */ import { useCallback, useReducer } from 'react'; -import { displaySuccessToast, errorToToaster, useStateToaster } from '../../components/toasters'; +import { + displaySuccessToast, + errorToToaster, + useStateToaster, +} from '../../common/components/toasters'; import * as i18n from './translations'; import { patchCasesStatus } from './api'; import { BulkUpdateStatus, Case } from './types'; diff --git a/x-pack/plugins/siem/public/containers/case/use_delete_cases.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_delete_cases.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_delete_cases.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_delete_cases.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_delete_cases.tsx b/x-pack/plugins/siem/public/cases/containers/use_delete_cases.tsx similarity index 97% rename from x-pack/plugins/siem/public/containers/case/use_delete_cases.tsx rename to x-pack/plugins/siem/public/cases/containers/use_delete_cases.tsx index 3c49be551c0640..31a73351de8f55 100644 --- a/x-pack/plugins/siem/public/containers/case/use_delete_cases.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_delete_cases.tsx @@ -5,7 +5,11 @@ */ import { useCallback, useReducer } from 'react'; -import { displaySuccessToast, errorToToaster, useStateToaster } from '../../components/toasters'; +import { + displaySuccessToast, + errorToToaster, + useStateToaster, +} from '../../common/components/toasters'; import * as i18n from './translations'; import { deleteCases } from './api'; import { DeleteCase } from './types'; diff --git a/x-pack/plugins/siem/public/containers/case/use_get_action_license.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_action_license.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_get_action_license.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_action_license.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_get_action_license.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_action_license.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/case/use_get_action_license.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_action_license.tsx index 0d28a1b20c61f0..c09cc8dedd3799 100644 --- a/x-pack/plugins/siem/public/containers/case/use_get_action_license.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_get_action_license.tsx @@ -6,7 +6,7 @@ import { useCallback, useEffect, useState } from 'react'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import { getActionLicense } from './api'; import * as i18n from './translations'; import { ActionLicense } from './types'; diff --git a/x-pack/plugins/siem/public/containers/case/use_get_case.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_case.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_get_case.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_case.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_get_case.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_case.tsx similarity index 97% rename from x-pack/plugins/siem/public/containers/case/use_get_case.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_case.tsx index 06d4c38ddda49a..01ada00ba9b72d 100644 --- a/x-pack/plugins/siem/public/containers/case/use_get_case.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_get_case.tsx @@ -8,7 +8,7 @@ import { useEffect, useReducer, useCallback } from 'react'; import { Case } from './types'; import * as i18n from './translations'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import { getCase } from './api'; interface CaseState { diff --git a/x-pack/plugins/siem/public/containers/case/use_get_case_user_actions.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_case_user_actions.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_get_case_user_actions.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_case_user_actions.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_get_case_user_actions.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_case_user_actions.tsx similarity index 98% rename from x-pack/plugins/siem/public/containers/case/use_get_case_user_actions.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_case_user_actions.tsx index 5afe06a9828e5f..2848d56378cd23 100644 --- a/x-pack/plugins/siem/public/containers/case/use_get_case_user_actions.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_get_case_user_actions.tsx @@ -7,7 +7,7 @@ import { isEmpty, uniqBy } from 'lodash/fp'; import { useCallback, useEffect, useState } from 'react'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import { getCaseUserActions } from './api'; import * as i18n from './translations'; import { CaseExternalService, CaseUserActions, ElasticUser } from './types'; diff --git a/x-pack/plugins/siem/public/containers/case/use_get_cases.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_cases.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_get_cases.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_cases.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_get_cases.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_cases.tsx similarity index 98% rename from x-pack/plugins/siem/public/containers/case/use_get_cases.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_cases.tsx index 465b50dbdc1bc6..b0701c71b857e2 100644 --- a/x-pack/plugins/siem/public/containers/case/use_get_cases.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_get_cases.tsx @@ -7,7 +7,7 @@ import { useCallback, useEffect, useReducer } from 'react'; import { DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from './constants'; import { AllCases, SortFieldCase, FilterOptions, QueryParams, Case } from './types'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import * as i18n from './translations'; import { UpdateByKey } from './use_update_case'; import { getCases, patchCase } from './api'; diff --git a/x-pack/plugins/siem/public/containers/case/use_get_cases_status.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_cases_status.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_get_cases_status.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_cases_status.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_get_cases_status.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_cases_status.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/case/use_get_cases_status.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_cases_status.tsx index 07884646023570..476462b7e4c28f 100644 --- a/x-pack/plugins/siem/public/containers/case/use_get_cases_status.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_get_cases_status.tsx @@ -6,7 +6,7 @@ import { useCallback, useEffect, useState } from 'react'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import { getCasesStatus } from './api'; import * as i18n from './translations'; import { CasesStatus } from './types'; diff --git a/x-pack/plugins/siem/public/containers/case/use_get_reporters.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_reporters.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_get_reporters.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_reporters.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_get_reporters.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_reporters.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/case/use_get_reporters.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_reporters.tsx index 01679ae4ccd82d..5bfc8c84d1ecc3 100644 --- a/x-pack/plugins/siem/public/containers/case/use_get_reporters.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_get_reporters.tsx @@ -8,7 +8,7 @@ import { useCallback, useEffect, useState } from 'react'; import { isEmpty } from 'lodash/fp'; import { User } from '../../../../case/common/api'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import { getReporters } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/case/use_get_tags.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_tags.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_get_tags.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_tags.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_get_tags.tsx b/x-pack/plugins/siem/public/cases/containers/use_get_tags.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/case/use_get_tags.tsx rename to x-pack/plugins/siem/public/cases/containers/use_get_tags.tsx index 99bb65fa160f7c..14f5e35bc4976e 100644 --- a/x-pack/plugins/siem/public/containers/case/use_get_tags.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_get_tags.tsx @@ -6,7 +6,7 @@ import { useEffect, useReducer } from 'react'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import { getTags } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/case/use_post_case.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_post_case.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_post_case.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_post_case.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_post_case.tsx b/x-pack/plugins/siem/public/cases/containers/use_post_case.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/case/use_post_case.tsx rename to x-pack/plugins/siem/public/cases/containers/use_post_case.tsx index b33269f26e97dd..13cfc2738620fc 100644 --- a/x-pack/plugins/siem/public/containers/case/use_post_case.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_post_case.tsx @@ -7,7 +7,7 @@ import { useReducer, useCallback } from 'react'; import { CasePostRequest } from '../../../../case/common/api'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import { postCase } from './api'; import * as i18n from './translations'; import { Case } from './types'; diff --git a/x-pack/plugins/siem/public/containers/case/use_post_comment.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_post_comment.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_post_comment.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_post_comment.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_post_comment.tsx b/x-pack/plugins/siem/public/cases/containers/use_post_comment.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/case/use_post_comment.tsx rename to x-pack/plugins/siem/public/cases/containers/use_post_comment.tsx index c7d3b4125aada8..9a52eaaf0db6b3 100644 --- a/x-pack/plugins/siem/public/containers/case/use_post_comment.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_post_comment.tsx @@ -7,7 +7,7 @@ import { useReducer, useCallback } from 'react'; import { CommentRequest } from '../../../../case/common/api'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import { postComment } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/case/use_post_push_to_service.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_post_push_to_service.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_post_push_to_service.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_post_push_to_service.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_post_push_to_service.tsx b/x-pack/plugins/siem/public/cases/containers/use_post_push_to_service.tsx similarity index 98% rename from x-pack/plugins/siem/public/containers/case/use_post_push_to_service.tsx rename to x-pack/plugins/siem/public/cases/containers/use_post_push_to_service.tsx index 7f4c4a42761721..def324dcf442e3 100644 --- a/x-pack/plugins/siem/public/containers/case/use_post_push_to_service.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_post_push_to_service.tsx @@ -10,7 +10,11 @@ import { ServiceConnectorCaseResponse, ServiceConnectorCaseParams, } from '../../../../case/common/api'; -import { errorToToaster, useStateToaster, displaySuccessToast } from '../../components/toasters'; +import { + errorToToaster, + useStateToaster, + displaySuccessToast, +} from '../../common/components/toasters'; import { getCase, pushToService, pushCase } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/case/use_update_case.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_update_case.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_update_case.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_update_case.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_update_case.tsx b/x-pack/plugins/siem/public/cases/containers/use_update_case.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/case/use_update_case.tsx rename to x-pack/plugins/siem/public/cases/containers/use_update_case.tsx index af824674999b9a..77cf53165d9147 100644 --- a/x-pack/plugins/siem/public/containers/case/use_update_case.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_update_case.tsx @@ -5,7 +5,11 @@ */ import { useReducer, useCallback } from 'react'; -import { displaySuccessToast, errorToToaster, useStateToaster } from '../../components/toasters'; +import { + displaySuccessToast, + errorToToaster, + useStateToaster, +} from '../../common/components/toasters'; import { CasePatchRequest } from '../../../../case/common/api'; import { patchCase } from './api'; diff --git a/x-pack/plugins/siem/public/containers/case/use_update_comment.test.tsx b/x-pack/plugins/siem/public/cases/containers/use_update_comment.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/case/use_update_comment.test.tsx rename to x-pack/plugins/siem/public/cases/containers/use_update_comment.test.tsx diff --git a/x-pack/plugins/siem/public/containers/case/use_update_comment.tsx b/x-pack/plugins/siem/public/cases/containers/use_update_comment.tsx similarity index 97% rename from x-pack/plugins/siem/public/containers/case/use_update_comment.tsx rename to x-pack/plugins/siem/public/cases/containers/use_update_comment.tsx index ffc5cffee7a554..66064faea27d71 100644 --- a/x-pack/plugins/siem/public/containers/case/use_update_comment.tsx +++ b/x-pack/plugins/siem/public/cases/containers/use_update_comment.tsx @@ -6,7 +6,7 @@ import { useReducer, useCallback } from 'react'; -import { errorToToaster, useStateToaster } from '../../components/toasters'; +import { errorToToaster, useStateToaster } from '../../common/components/toasters'; import { patchComment } from './api'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/containers/case/utils.ts b/x-pack/plugins/siem/public/cases/containers/utils.ts similarity index 98% rename from x-pack/plugins/siem/public/containers/case/utils.ts rename to x-pack/plugins/siem/public/cases/containers/utils.ts index 15e514d6ea8b30..ebaba0fe42f788 100644 --- a/x-pack/plugins/siem/public/containers/case/utils.ts +++ b/x-pack/plugins/siem/public/cases/containers/utils.ts @@ -26,7 +26,7 @@ import { ServiceConnectorCaseResponseRt, ServiceConnectorCaseResponse, } from '../../../../case/common/api'; -import { ToasterError } from '../../components/toasters'; +import { ToasterError } from '../../common/components/toasters'; import { AllCases, Case } from './types'; export const getTypedPayload = (a: unknown): T => a as T; diff --git a/x-pack/plugins/siem/public/cases/index.ts b/x-pack/plugins/siem/public/cases/index.ts new file mode 100644 index 00000000000000..1eb8c82532e217 --- /dev/null +++ b/x-pack/plugins/siem/public/cases/index.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SecuritySubPlugin } from '../app/types'; +import { getCasesRoutes } from './routes'; + +export class Cases { + public setup() {} + + public start(): SecuritySubPlugin { + return { + routes: getCasesRoutes(), + }; + } +} diff --git a/x-pack/plugins/siem/public/pages/case/case.tsx b/x-pack/plugins/siem/public/cases/pages/case.tsx similarity index 74% rename from x-pack/plugins/siem/public/pages/case/case.tsx rename to x-pack/plugins/siem/public/cases/pages/case.tsx index 2b613f6692df12..03ebec34c2cdd6 100644 --- a/x-pack/plugins/siem/public/pages/case/case.tsx +++ b/x-pack/plugins/siem/public/cases/pages/case.tsx @@ -6,12 +6,12 @@ import React from 'react'; -import { WrapperPage } from '../../components/wrapper_page'; -import { useGetUserSavedObjectPermissions } from '../../lib/kibana'; -import { SpyRoute } from '../../utils/route/spy_routes'; -import { AllCases } from './components/all_cases'; +import { WrapperPage } from '../../common/components/wrapper_page'; +import { useGetUserSavedObjectPermissions } from '../../common/lib/kibana'; +import { SpyRoute } from '../../common/utils/route/spy_routes'; +import { AllCases } from '../components/all_cases'; -import { savedObjectReadOnly, CaseCallOut } from './components/callout'; +import { savedObjectReadOnly, CaseCallOut } from '../components/callout'; import { CaseSavedObjectNoPermissions } from './saved_object_no_permissions'; export const CasesPage = React.memo(() => { diff --git a/x-pack/plugins/siem/public/pages/case/case_details.tsx b/x-pack/plugins/siem/public/cases/pages/case_details.tsx similarity index 68% rename from x-pack/plugins/siem/public/pages/case/case_details.tsx rename to x-pack/plugins/siem/public/cases/pages/case_details.tsx index 4bb8afa7f8d42a..5ea5e52951592a 100644 --- a/x-pack/plugins/siem/public/pages/case/case_details.tsx +++ b/x-pack/plugins/siem/public/cases/pages/case_details.tsx @@ -7,13 +7,13 @@ import React from 'react'; import { useParams, Redirect } from 'react-router-dom'; -import { useGetUrlSearch } from '../../components/navigation/use_get_url_search'; -import { useGetUserSavedObjectPermissions } from '../../lib/kibana'; -import { SpyRoute } from '../../utils/route/spy_routes'; -import { getCaseUrl } from '../../components/link_to'; -import { navTabs } from '../home/home_navigations'; -import { CaseView } from './components/case_view'; -import { savedObjectReadOnly, CaseCallOut } from './components/callout'; +import { useGetUrlSearch } from '../../common/components/navigation/use_get_url_search'; +import { useGetUserSavedObjectPermissions } from '../../common/lib/kibana'; +import { SpyRoute } from '../../common/utils/route/spy_routes'; +import { getCaseUrl } from '../../common/components/link_to'; +import { navTabs } from '../../app/home/home_navigations'; +import { CaseView } from '../components/case_view'; +import { savedObjectReadOnly, CaseCallOut } from '../components/callout'; export const CaseDetailsPage = React.memo(() => { const userPermissions = useGetUserSavedObjectPermissions(); diff --git a/x-pack/plugins/siem/public/pages/case/configure_cases.tsx b/x-pack/plugins/siem/public/cases/pages/configure_cases.tsx similarity index 68% rename from x-pack/plugins/siem/public/pages/case/configure_cases.tsx rename to x-pack/plugins/siem/public/cases/pages/configure_cases.tsx index 7515efa0e1b7ae..bea3a9fb110ab0 100644 --- a/x-pack/plugins/siem/public/pages/case/configure_cases.tsx +++ b/x-pack/plugins/siem/public/cases/pages/configure_cases.tsx @@ -7,15 +7,15 @@ import React, { useMemo } from 'react'; import { Redirect } from 'react-router-dom'; -import { getCaseUrl } from '../../components/link_to'; -import { useGetUrlSearch } from '../../components/navigation/use_get_url_search'; -import { WrapperPage } from '../../components/wrapper_page'; -import { useGetUserSavedObjectPermissions } from '../../lib/kibana'; -import { SpyRoute } from '../../utils/route/spy_routes'; -import { navTabs } from '../home/home_navigations'; -import { CaseHeaderPage } from './components/case_header_page'; -import { ConfigureCases } from './components/configure_cases'; -import { WhitePageWrapper, SectionWrapper } from './components/wrappers'; +import { getCaseUrl } from '../../common/components/link_to'; +import { useGetUrlSearch } from '../../common/components/navigation/use_get_url_search'; +import { WrapperPage } from '../../common/components/wrapper_page'; +import { useGetUserSavedObjectPermissions } from '../../common/lib/kibana'; +import { SpyRoute } from '../../common/utils/route/spy_routes'; +import { navTabs } from '../../app/home/home_navigations'; +import { CaseHeaderPage } from '../components/case_header_page'; +import { ConfigureCases } from '../components/configure_cases'; +import { WhitePageWrapper, SectionWrapper } from '../components/wrappers'; import * as i18n from './translations'; const wrapperPageStyle: Record = { diff --git a/x-pack/plugins/siem/public/pages/case/create_case.tsx b/x-pack/plugins/siem/public/cases/pages/create_case.tsx similarity index 65% rename from x-pack/plugins/siem/public/pages/case/create_case.tsx rename to x-pack/plugins/siem/public/cases/pages/create_case.tsx index 06cb7fadfb8d30..c586a90e5ef9c3 100644 --- a/x-pack/plugins/siem/public/pages/case/create_case.tsx +++ b/x-pack/plugins/siem/public/cases/pages/create_case.tsx @@ -7,14 +7,14 @@ import React, { useMemo } from 'react'; import { Redirect } from 'react-router-dom'; -import { getCaseUrl } from '../../components/link_to'; -import { useGetUrlSearch } from '../../components/navigation/use_get_url_search'; -import { WrapperPage } from '../../components/wrapper_page'; -import { useGetUserSavedObjectPermissions } from '../../lib/kibana'; -import { SpyRoute } from '../../utils/route/spy_routes'; -import { navTabs } from '../home/home_navigations'; -import { CaseHeaderPage } from './components/case_header_page'; -import { Create } from './components/create'; +import { getCaseUrl } from '../../common/components/link_to'; +import { useGetUrlSearch } from '../../common/components/navigation/use_get_url_search'; +import { WrapperPage } from '../../common/components/wrapper_page'; +import { useGetUserSavedObjectPermissions } from '../../common/lib/kibana'; +import { SpyRoute } from '../../common/utils/route/spy_routes'; +import { navTabs } from '../../app/home/home_navigations'; +import { CaseHeaderPage } from '../components/case_header_page'; +import { Create } from '../components/create'; import * as i18n from './translations'; export const CreateCasePage = React.memo(() => { diff --git a/x-pack/plugins/siem/public/pages/case/index.tsx b/x-pack/plugins/siem/public/cases/pages/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/case/index.tsx rename to x-pack/plugins/siem/public/cases/pages/index.tsx index 124cefa726a8b1..32f64d2690cba0 100644 --- a/x-pack/plugins/siem/public/pages/case/index.tsx +++ b/x-pack/plugins/siem/public/cases/pages/index.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { Route, Switch } from 'react-router-dom'; -import { SiemPageName } from '../home/types'; +import { SiemPageName } from '../../app/types'; import { CaseDetailsPage } from './case_details'; import { CasesPage } from './case'; import { CreateCasePage } from './create_case'; diff --git a/x-pack/plugins/siem/public/pages/case/saved_object_no_permissions.tsx b/x-pack/plugins/siem/public/cases/pages/saved_object_no_permissions.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/case/saved_object_no_permissions.tsx rename to x-pack/plugins/siem/public/cases/pages/saved_object_no_permissions.tsx index 689c290c910191..a560f697de415c 100644 --- a/x-pack/plugins/siem/public/pages/case/saved_object_no_permissions.tsx +++ b/x-pack/plugins/siem/public/cases/pages/saved_object_no_permissions.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import { EmptyPage } from '../../components/empty_page'; +import { EmptyPage } from '../../common/components/empty_page'; import * as i18n from './translations'; -import { useKibana } from '../../lib/kibana'; +import { useKibana } from '../../common/lib/kibana'; export const CaseSavedObjectNoPermissions = React.memo(() => { const docLinks = useKibana().services.docLinks; diff --git a/x-pack/plugins/siem/public/pages/case/translations.ts b/x-pack/plugins/siem/public/cases/pages/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/case/translations.ts rename to x-pack/plugins/siem/public/cases/pages/translations.ts diff --git a/x-pack/plugins/siem/public/pages/case/utils.ts b/x-pack/plugins/siem/public/cases/pages/utils.ts similarity index 92% rename from x-pack/plugins/siem/public/pages/case/utils.ts rename to x-pack/plugins/siem/public/cases/pages/utils.ts index f1aea747485e41..0b60d66756d0c8 100644 --- a/x-pack/plugins/siem/public/pages/case/utils.ts +++ b/x-pack/plugins/siem/public/cases/pages/utils.ts @@ -8,8 +8,8 @@ import { isEmpty } from 'lodash/fp'; import { ChromeBreadcrumb } from 'src/core/public'; -import { getCaseDetailsUrl, getCaseUrl, getCreateCaseUrl } from '../../components/link_to'; -import { RouteSpyState } from '../../utils/route/types'; +import { getCaseDetailsUrl, getCaseUrl, getCreateCaseUrl } from '../../common/components/link_to'; +import { RouteSpyState } from '../../common/utils/route/types'; import * as i18n from './translations'; export const getBreadcrumbs = (params: RouteSpyState, search: string[]): ChromeBreadcrumb[] => { diff --git a/x-pack/plugins/siem/public/cases/routes.tsx b/x-pack/plugins/siem/public/cases/routes.tsx new file mode 100644 index 00000000000000..698350e49bc3eb --- /dev/null +++ b/x-pack/plugins/siem/public/cases/routes.tsx @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Route } from 'react-router-dom'; + +import { Case } from './pages'; +import { SiemPageName } from '../app/types'; + +export const getCasesRoutes = () => [ + + + , +]; diff --git a/x-pack/plugins/siem/public/cases/translations.ts b/x-pack/plugins/siem/public/cases/translations.ts new file mode 100644 index 00000000000000..782ba9d9f32dbc --- /dev/null +++ b/x-pack/plugins/siem/public/cases/translations.ts @@ -0,0 +1,205 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { i18n } from '@kbn/i18n'; + +export const SAVED_OBJECT_NO_PERMISSIONS_TITLE = i18n.translate( + 'xpack.siem.case.caseSavedObjectNoPermissionsTitle', + { + defaultMessage: 'Kibana feature privileges required', + } +); + +export const SAVED_OBJECT_NO_PERMISSIONS_MSG = i18n.translate( + 'xpack.siem.case.caseSavedObjectNoPermissionsMessage', + { + defaultMessage: + 'To view cases, you must have privileges for the Saved Object Management feature in the Kibana space. For more information, contact your Kibana administrator.', + } +); + +export const BACK_TO_ALL = i18n.translate('xpack.siem.case.caseView.backLabel', { + defaultMessage: 'Back to cases', +}); + +export const CANCEL = i18n.translate('xpack.siem.case.caseView.cancel', { + defaultMessage: 'Cancel', +}); + +export const DELETE_CASE = i18n.translate('xpack.siem.case.confirmDeleteCase.deleteCase', { + defaultMessage: 'Delete case', +}); + +export const DELETE_CASES = i18n.translate('xpack.siem.case.confirmDeleteCase.deleteCases', { + defaultMessage: 'Delete cases', +}); + +export const NAME = i18n.translate('xpack.siem.case.caseView.name', { + defaultMessage: 'Name', +}); + +export const OPENED_ON = i18n.translate('xpack.siem.case.caseView.openedOn', { + defaultMessage: 'Opened on', +}); + +export const CLOSED_ON = i18n.translate('xpack.siem.case.caseView.closedOn', { + defaultMessage: 'Closed on', +}); + +export const REPORTER = i18n.translate('xpack.siem.case.caseView.reporterLabel', { + defaultMessage: 'Reporter', +}); + +export const PARTICIPANTS = i18n.translate('xpack.siem.case.caseView.particpantsLabel', { + defaultMessage: 'Participants', +}); + +export const CREATE_BC_TITLE = i18n.translate('xpack.siem.case.caseView.breadcrumb', { + defaultMessage: 'Create', +}); + +export const CREATE_TITLE = i18n.translate('xpack.siem.case.caseView.create', { + defaultMessage: 'Create new case', +}); + +export const DESCRIPTION = i18n.translate('xpack.siem.case.caseView.description', { + defaultMessage: 'Description', +}); + +export const DESCRIPTION_REQUIRED = i18n.translate( + 'xpack.siem.case.createCase.descriptionFieldRequiredError', + { + defaultMessage: 'A description is required.', + } +); + +export const COMMENT_REQUIRED = i18n.translate( + 'xpack.siem.case.caseView.commentFieldRequiredError', + { + defaultMessage: 'A comment is required.', + } +); + +export const REQUIRED_FIELD = i18n.translate('xpack.siem.case.caseView.fieldRequiredError', { + defaultMessage: 'Required field', +}); + +export const EDIT = i18n.translate('xpack.siem.case.caseView.edit', { + defaultMessage: 'Edit', +}); + +export const OPTIONAL = i18n.translate('xpack.siem.case.caseView.optional', { + defaultMessage: 'Optional', +}); + +export const PAGE_TITLE = i18n.translate('xpack.siem.case.pageTitle', { + defaultMessage: 'Cases', +}); + +export const CREATE_CASE = i18n.translate('xpack.siem.case.caseView.createCase', { + defaultMessage: 'Create case', +}); + +export const CLOSED_CASE = i18n.translate('xpack.siem.case.caseView.closedCase', { + defaultMessage: 'Closed case', +}); + +export const CLOSE_CASE = i18n.translate('xpack.siem.case.caseView.closeCase', { + defaultMessage: 'Close case', +}); + +export const REOPEN_CASE = i18n.translate('xpack.siem.case.caseView.reopenCase', { + defaultMessage: 'Reopen case', +}); + +export const REOPENED_CASE = i18n.translate('xpack.siem.case.caseView.reopenedCase', { + defaultMessage: 'Reopened case', +}); + +export const CASE_NAME = i18n.translate('xpack.siem.case.caseView.caseName', { + defaultMessage: 'Case name', +}); + +export const TO = i18n.translate('xpack.siem.case.caseView.to', { + defaultMessage: 'to', +}); + +export const TAGS = i18n.translate('xpack.siem.case.caseView.tags', { + defaultMessage: 'Tags', +}); + +export const ACTIONS = i18n.translate('xpack.siem.case.allCases.actions', { + defaultMessage: 'Actions', +}); + +export const NO_TAGS_AVAILABLE = i18n.translate('xpack.siem.case.allCases.noTagsAvailable', { + defaultMessage: 'No tags available', +}); + +export const NO_REPORTERS_AVAILABLE = i18n.translate( + 'xpack.siem.case.caseView.noReportersAvailable', + { + defaultMessage: 'No reporters available.', + } +); + +export const COMMENTS = i18n.translate('xpack.siem.case.allCases.comments', { + defaultMessage: 'Comments', +}); + +export const TAGS_HELP = i18n.translate('xpack.siem.case.createCase.fieldTagsHelpText', { + defaultMessage: + 'Type one or more custom identifying tags for this case. Press enter after each tag to begin a new one.', +}); + +export const NO_TAGS = i18n.translate('xpack.siem.case.caseView.noTags', { + defaultMessage: 'No tags are currently assigned to this case.', +}); + +export const TITLE_REQUIRED = i18n.translate('xpack.siem.case.createCase.titleFieldRequiredError', { + defaultMessage: 'A title is required.', +}); + +export const CONFIGURE_CASES_PAGE_TITLE = i18n.translate( + 'xpack.siem.case.configureCases.headerTitle', + { + defaultMessage: 'Configure cases', + } +); + +export const CONFIGURE_CASES_BUTTON = i18n.translate('xpack.siem.case.configureCasesButton', { + defaultMessage: 'Edit external connection', +}); + +export const ADD_COMMENT = i18n.translate('xpack.siem.case.caseView.comment.addComment', { + defaultMessage: 'Add comment', +}); + +export const ADD_COMMENT_HELP_TEXT = i18n.translate( + 'xpack.siem.case.caseView.comment.addCommentHelpText', + { + defaultMessage: 'Add a new comment...', + } +); + +export const SAVE = i18n.translate('xpack.siem.case.caseView.description.save', { + defaultMessage: 'Save', +}); + +export const GO_TO_DOCUMENTATION = i18n.translate( + 'xpack.siem.case.caseView.goToDocumentationButton', + { + defaultMessage: 'View documentation', + } +); + +export const CONNECTORS = i18n.translate('xpack.siem.case.caseView.connectors', { + defaultMessage: 'External incident management system', +}); + +export const EDIT_CONNECTOR = i18n.translate('xpack.siem.case.caseView.editConnector', { + defaultMessage: 'Change external incident management system', +}); diff --git a/x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.test.tsx b/x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.test.tsx rename to x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.ts b/x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/helpers.ts rename to x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/helpers.ts diff --git a/x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx b/x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/index.test.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx rename to x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/index.test.tsx index 677fc5e102614a..18c0032f58c3c3 100644 --- a/x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/index.test.tsx @@ -7,12 +7,17 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../mock'; -import { createStore, State } from '../../../store'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../mock'; +import { createStore, State } from '../../store'; import { AddFilterToGlobalSearchBar } from '.'; const mockAddFilters = jest.fn(); -jest.mock('../../../lib/kibana', () => ({ +jest.mock('../../lib/kibana', () => ({ useKibana: () => ({ services: { data: { @@ -28,10 +33,10 @@ jest.mock('../../../lib/kibana', () => ({ describe('AddFilterToGlobalSearchBar Component', () => { const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); mockAddFilters.mockClear(); }); diff --git a/x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx b/x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx rename to x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/index.tsx index 7aed36422bd2f5..8a294ec1b71fdd 100644 --- a/x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/index.tsx +++ b/x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/index.tsx @@ -8,8 +8,8 @@ import { EuiButtonIcon, EuiToolTip } from '@elastic/eui'; import React, { useCallback } from 'react'; import { Filter } from '../../../../../../../src/plugins/data/public'; -import { WithHoverActions } from '../../with_hover_actions'; -import { useKibana } from '../../../lib/kibana'; +import { WithHoverActions } from '../with_hover_actions'; +import { useKibana } from '../../lib/kibana'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/translations.ts b/x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/add_filter_to_global_search_bar/translations.ts rename to x-pack/plugins/siem/public/common/components/add_filter_to_global_search_bar/translations.ts diff --git a/x-pack/plugins/siem/public/components/alerts_viewer/alerts_table.tsx b/x-pack/plugins/siem/public/common/components/alerts_viewer/alerts_table.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/alerts_viewer/alerts_table.tsx rename to x-pack/plugins/siem/public/common/components/alerts_viewer/alerts_table.tsx index d545a071c3ea68..dd608babef48fc 100644 --- a/x-pack/plugins/siem/public/components/alerts_viewer/alerts_table.tsx +++ b/x-pack/plugins/siem/public/common/components/alerts_viewer/alerts_table.tsx @@ -6,7 +6,7 @@ import React, { useMemo } from 'react'; -import { Filter } from '../../../../../../src/plugins/data/public'; +import { Filter } from '../../../../../../../src/plugins/data/public'; import { StatefulEventsViewer } from '../events_viewer'; import * as i18n from './translations'; import { alertsDefaultModel } from './default_headers'; diff --git a/x-pack/plugins/siem/public/components/alerts_viewer/default_headers.ts b/x-pack/plugins/siem/public/common/components/alerts_viewer/default_headers.ts similarity index 85% rename from x-pack/plugins/siem/public/components/alerts_viewer/default_headers.ts rename to x-pack/plugins/siem/public/common/components/alerts_viewer/default_headers.ts index b12bd1b6c2a516..cf5b565b99f673 100644 --- a/x-pack/plugins/siem/public/components/alerts_viewer/default_headers.ts +++ b/x-pack/plugins/siem/public/common/components/alerts_viewer/default_headers.ts @@ -4,13 +4,13 @@ * you may not use this file except in compliance with the Elastic License. */ -import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers'; +import { defaultColumnHeaderType } from '../../../timelines/components/timeline/body/column_headers/default_headers'; import { DEFAULT_COLUMN_MIN_WIDTH, DEFAULT_DATE_COLUMN_MIN_WIDTH, -} from '../timeline/body/constants'; -import { ColumnHeaderOptions, SubsetTimelineModel } from '../../store/timeline/model'; -import { timelineDefaults } from '../../store/timeline/defaults'; +} from '../../../timelines/components/timeline/body/constants'; +import { ColumnHeaderOptions, SubsetTimelineModel } from '../../../timelines/store/timeline/model'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; export const alertsHeaders: ColumnHeaderOptions[] = [ { diff --git a/x-pack/plugins/siem/public/components/alerts_viewer/histogram_configs.ts b/x-pack/plugins/siem/public/common/components/alerts_viewer/histogram_configs.ts similarity index 94% rename from x-pack/plugins/siem/public/components/alerts_viewer/histogram_configs.ts rename to x-pack/plugins/siem/public/common/components/alerts_viewer/histogram_configs.ts index fbcf4c6ed039b6..5a00079bb056b1 100644 --- a/x-pack/plugins/siem/public/components/alerts_viewer/histogram_configs.ts +++ b/x-pack/plugins/siem/public/common/components/alerts_viewer/histogram_configs.ts @@ -3,9 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ + import * as i18n from './translations'; import { MatrixHistogramOption, MatrixHisrogramConfigs } from '../matrix_histogram/types'; -import { HistogramType } from '../../graphql/types'; +import { HistogramType } from '../../../graphql/types'; export const alertsStackByOptions: MatrixHistogramOption[] = [ { diff --git a/x-pack/plugins/siem/public/components/alerts_viewer/index.tsx b/x-pack/plugins/siem/public/common/components/alerts_viewer/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/alerts_viewer/index.tsx rename to x-pack/plugins/siem/public/common/components/alerts_viewer/index.tsx index 957feb6244792a..29f4bdff92ad60 100644 --- a/x-pack/plugins/siem/public/components/alerts_viewer/index.tsx +++ b/x-pack/plugins/siem/public/common/components/alerts_viewer/index.tsx @@ -6,7 +6,7 @@ import React, { useEffect, useCallback, useMemo } from 'react'; import numeral from '@elastic/numeral'; -import { DEFAULT_NUMBER_FORMAT } from '../../../common/constants'; +import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants'; import { AlertsComponentsQueryProps } from './types'; import { AlertsTable } from './alerts_table'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/alerts_viewer/translations.ts b/x-pack/plugins/siem/public/common/components/alerts_viewer/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/alerts_viewer/translations.ts rename to x-pack/plugins/siem/public/common/components/alerts_viewer/translations.ts diff --git a/x-pack/plugins/siem/public/components/alerts_viewer/types.ts b/x-pack/plugins/siem/public/common/components/alerts_viewer/types.ts similarity index 76% rename from x-pack/plugins/siem/public/components/alerts_viewer/types.ts rename to x-pack/plugins/siem/public/common/components/alerts_viewer/types.ts index 321f7214c8fef9..2bc33aaf1bae77 100644 --- a/x-pack/plugins/siem/public/components/alerts_viewer/types.ts +++ b/x-pack/plugins/siem/public/common/components/alerts_viewer/types.ts @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Filter } from '../../../../../../src/plugins/data/public'; -import { HostsComponentsQueryProps } from '../../pages/hosts/navigation/types'; -import { NetworkComponentQueryProps } from '../../pages/network/navigation/types'; +import { Filter } from '../../../../../../../src/plugins/data/public'; +import { HostsComponentsQueryProps } from '../../../hosts/pages/navigation/types'; +import { NetworkComponentQueryProps } from '../../../network/pages/navigation/types'; import { MatrixHistogramOption } from '../matrix_histogram/types'; type CommonQueryProps = HostsComponentsQueryProps | NetworkComponentQueryProps; diff --git a/x-pack/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx b/x-pack/plugins/siem/public/common/components/autocomplete_field/__examples__/index.stories.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx rename to x-pack/plugins/siem/public/common/components/autocomplete_field/__examples__/index.stories.tsx index dccc156ff6e447..8f261da629f949 100644 --- a/x-pack/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx +++ b/x-pack/plugins/siem/public/common/components/autocomplete_field/__examples__/index.stories.tsx @@ -11,7 +11,7 @@ import euiLightVars from '@elastic/eui/dist/eui_theme_light.json'; import { QuerySuggestion, QuerySuggestionTypes, -} from '../../../../../../../src/plugins/data/public'; +} from '../../../../../../../../src/plugins/data/public'; import { SuggestionItem } from '../suggestion_item'; const suggestion: QuerySuggestion = { diff --git a/x-pack/plugins/siem/public/components/autocomplete_field/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/autocomplete_field/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/autocomplete_field/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/autocomplete_field/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/autocomplete_field/index.test.tsx b/x-pack/plugins/siem/public/common/components/autocomplete_field/index.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/autocomplete_field/index.test.tsx rename to x-pack/plugins/siem/public/common/components/autocomplete_field/index.test.tsx index 72236d799f995c..55e114818ffea1 100644 --- a/x-pack/plugins/siem/public/components/autocomplete_field/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/autocomplete_field/index.test.tsx @@ -10,7 +10,10 @@ import { mount, shallow } from 'enzyme'; import { noop } from 'lodash/fp'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { QuerySuggestion, QuerySuggestionTypes } from '../../../../../../src/plugins/data/public'; +import { + QuerySuggestion, + QuerySuggestionTypes, +} from '../../../../../../../src/plugins/data/public'; import { TestProviders } from '../../mock'; diff --git a/x-pack/plugins/siem/public/components/autocomplete_field/index.tsx b/x-pack/plugins/siem/public/common/components/autocomplete_field/index.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/autocomplete_field/index.tsx rename to x-pack/plugins/siem/public/common/components/autocomplete_field/index.tsx index 9821bb6048b513..0140a652ba1837 100644 --- a/x-pack/plugins/siem/public/components/autocomplete_field/index.tsx +++ b/x-pack/plugins/siem/public/common/components/autocomplete_field/index.tsx @@ -11,9 +11,9 @@ import { EuiPanel, } from '@elastic/eui'; import React from 'react'; -import { QuerySuggestion } from '../../../../../../src/plugins/data/public'; +import { QuerySuggestion } from '../../../../../../../src/plugins/data/public'; -import euiStyled from '../../../../../legacy/common/eui_styled_components'; +import euiStyled from '../../../../../../legacy/common/eui_styled_components'; import { SuggestionItem } from './suggestion_item'; diff --git a/x-pack/plugins/siem/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/plugins/siem/public/common/components/autocomplete_field/suggestion_item.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/autocomplete_field/suggestion_item.tsx rename to x-pack/plugins/siem/public/common/components/autocomplete_field/suggestion_item.tsx index be9a9817265b0a..b305663dd48be9 100644 --- a/x-pack/plugins/siem/public/components/autocomplete_field/suggestion_item.tsx +++ b/x-pack/plugins/siem/public/common/components/autocomplete_field/suggestion_item.tsx @@ -8,8 +8,8 @@ import { EuiIcon } from '@elastic/eui'; import { transparentize } from 'polished'; import React from 'react'; import styled from 'styled-components'; -import euiStyled from '../../../../../legacy/common/eui_styled_components'; -import { QuerySuggestion } from '../../../../../../src/plugins/data/public'; +import euiStyled from '../../../../../../legacy/common/eui_styled_components'; +import { QuerySuggestion } from '../../../../../../../src/plugins/data/public'; interface SuggestionItemProps { isSelected?: boolean; diff --git a/x-pack/plugins/siem/public/components/charts/__snapshots__/areachart.test.tsx.snap b/x-pack/plugins/siem/public/common/components/charts/__snapshots__/areachart.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/charts/__snapshots__/areachart.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/charts/__snapshots__/areachart.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/charts/__snapshots__/barchart.test.tsx.snap b/x-pack/plugins/siem/public/common/components/charts/__snapshots__/barchart.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/charts/__snapshots__/barchart.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/charts/__snapshots__/barchart.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/charts/areachart.test.tsx b/x-pack/plugins/siem/public/common/components/charts/areachart.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/areachart.test.tsx rename to x-pack/plugins/siem/public/common/components/charts/areachart.test.tsx diff --git a/x-pack/plugins/siem/public/components/charts/areachart.tsx b/x-pack/plugins/siem/public/common/components/charts/areachart.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/areachart.tsx rename to x-pack/plugins/siem/public/common/components/charts/areachart.tsx diff --git a/x-pack/plugins/siem/public/components/charts/barchart.test.tsx b/x-pack/plugins/siem/public/common/components/charts/barchart.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/barchart.test.tsx rename to x-pack/plugins/siem/public/common/components/charts/barchart.test.tsx diff --git a/x-pack/plugins/siem/public/components/charts/barchart.tsx b/x-pack/plugins/siem/public/common/components/charts/barchart.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/barchart.tsx rename to x-pack/plugins/siem/public/common/components/charts/barchart.tsx diff --git a/x-pack/plugins/siem/public/components/charts/chart_place_holder.test.tsx b/x-pack/plugins/siem/public/common/components/charts/chart_place_holder.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/chart_place_holder.test.tsx rename to x-pack/plugins/siem/public/common/components/charts/chart_place_holder.test.tsx diff --git a/x-pack/plugins/siem/public/components/charts/chart_place_holder.tsx b/x-pack/plugins/siem/public/common/components/charts/chart_place_holder.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/chart_place_holder.tsx rename to x-pack/plugins/siem/public/common/components/charts/chart_place_holder.tsx diff --git a/x-pack/plugins/siem/public/components/charts/common.test.tsx b/x-pack/plugins/siem/public/common/components/charts/common.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/common.test.tsx rename to x-pack/plugins/siem/public/common/components/charts/common.test.tsx diff --git a/x-pack/plugins/siem/public/components/charts/common.tsx b/x-pack/plugins/siem/public/common/components/charts/common.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/charts/common.tsx rename to x-pack/plugins/siem/public/common/components/charts/common.tsx index 7e4b3079160421..1078040e9efd02 100644 --- a/x-pack/plugins/siem/public/components/charts/common.tsx +++ b/x-pack/plugins/siem/public/common/components/charts/common.tsx @@ -20,7 +20,7 @@ import { import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { DEFAULT_DARK_MODE } from '../../../common/constants'; +import { DEFAULT_DARK_MODE } from '../../../../common/constants'; import { useUiSetting } from '../../lib/kibana'; export const defaultChartHeight = '100%'; diff --git a/x-pack/plugins/siem/public/components/charts/draggable_legend.test.tsx b/x-pack/plugins/siem/public/common/components/charts/draggable_legend.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/draggable_legend.test.tsx rename to x-pack/plugins/siem/public/common/components/charts/draggable_legend.test.tsx diff --git a/x-pack/plugins/siem/public/components/charts/draggable_legend.tsx b/x-pack/plugins/siem/public/common/components/charts/draggable_legend.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/draggable_legend.tsx rename to x-pack/plugins/siem/public/common/components/charts/draggable_legend.tsx diff --git a/x-pack/plugins/siem/public/components/charts/draggable_legend_item.test.tsx b/x-pack/plugins/siem/public/common/components/charts/draggable_legend_item.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/draggable_legend_item.test.tsx rename to x-pack/plugins/siem/public/common/components/charts/draggable_legend_item.test.tsx diff --git a/x-pack/plugins/siem/public/components/charts/draggable_legend_item.tsx b/x-pack/plugins/siem/public/common/components/charts/draggable_legend_item.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/charts/draggable_legend_item.tsx rename to x-pack/plugins/siem/public/common/components/charts/draggable_legend_item.tsx diff --git a/x-pack/plugins/siem/public/components/charts/translation.ts b/x-pack/plugins/siem/public/common/components/charts/translation.ts similarity index 100% rename from x-pack/plugins/siem/public/components/charts/translation.ts rename to x-pack/plugins/siem/public/common/components/charts/translation.ts diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap b/x-pack/plugins/siem/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/__snapshots__/draggable_wrapper.test.tsx.snap b/x-pack/plugins/siem/public/common/components/drag_and_drop/__snapshots__/draggable_wrapper.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/drag_and_drop/__snapshots__/draggable_wrapper.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/drag_and_drop/__snapshots__/draggable_wrapper.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/__snapshots__/droppable_wrapper.test.tsx.snap b/x-pack/plugins/siem/public/common/components/drag_and_drop/__snapshots__/droppable_wrapper.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/drag_and_drop/__snapshots__/droppable_wrapper.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/drag_and_drop/__snapshots__/droppable_wrapper.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/drag_drop_context.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/drag_drop_context.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/drag_and_drop/drag_drop_context.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/drag_drop_context.tsx diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/drag_drop_context_wrapper.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.test.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/drag_drop_context_wrapper.test.tsx diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx index 8e6743ad8f92e6..3bd2a3da1c88b3 100644 --- a/x-pack/plugins/siem/public/components/drag_and_drop/drag_drop_context_wrapper.tsx +++ b/x-pack/plugins/siem/public/common/components/drag_and_drop/drag_drop_context_wrapper.tsx @@ -12,11 +12,12 @@ import { Dispatch } from 'redux'; import { BeforeCapture } from './drag_drop_context'; import { BrowserFields } from '../../containers/source'; -import { dragAndDropModel, dragAndDropSelectors, timelineSelectors } from '../../store'; +import { dragAndDropModel, dragAndDropSelectors } from '../../store'; +import { timelineSelectors } from '../../../timelines/store/timeline'; import { IdToDataProvider } from '../../store/drag_and_drop/model'; import { State } from '../../store/reducer'; -import { DataProvider } from '../timeline/data_providers/data_provider'; -import { reArrangeProviders } from '../timeline/data_providers/helpers'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { reArrangeProviders } from '../../../timelines/components/timeline/data_providers/helpers'; import { ACTIVE_TIMELINE_REDUX_ID } from '../top_n'; import { ADDED_TO_TIMELINE_MESSAGE } from '../../hooks/translations'; import { useAddToTimelineSensor } from '../../hooks/use_add_to_timeline'; diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper.test.tsx index cd9e1dc95ff01a..d1b3b671307d1c 100644 --- a/x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper.test.tsx +++ b/x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper.test.tsx @@ -11,7 +11,7 @@ import { DraggableStateSnapshot, DraggingStyle } from 'react-beautiful-dnd'; import { mockBrowserFields, mocksSource } from '../../containers/source/mock'; import { TestProviders } from '../../mock'; -import { mockDataProviders } from '../timeline/data_providers/mock/mock_data_providers'; +import { mockDataProviders } from '../../../timelines/components/timeline/data_providers/mock/mock_data_providers'; import { DragDropContextWrapper } from './drag_drop_context_wrapper'; import { ConditionalPortal, DraggableWrapper, getStyle } from './draggable_wrapper'; import { useMountAppended } from '../../utils/use_mount_appended'; diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper.tsx index 5676c8fe5c30bd..f90a5c1410c344 100644 --- a/x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper.tsx +++ b/x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper.tsx @@ -18,7 +18,7 @@ import styled from 'styled-components'; import deepEqual from 'fast-deep-equal'; import { dragAndDropActions } from '../../store/drag_and_drop'; -import { DataProvider } from '../timeline/data_providers/data_provider'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; import { TruncatableText } from '../truncatable_text'; import { WithHoverActions } from '../with_hover_actions'; diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx index 1d9508fc28f3d9..a5fcdd9a943d89 100644 --- a/x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx +++ b/x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx @@ -13,8 +13,8 @@ import { wait } from '../../lib/helpers'; import { useKibana } from '../../lib/kibana'; import { TestProviders } from '../../mock'; import { createKibanaCoreStartMock } from '../../mock/kibana_core'; -import { FilterManager } from '../../../../../../src/plugins/data/public'; -import { TimelineContext } from '../timeline/timeline_context'; +import { FilterManager } from '../../../../../../../src/plugins/data/public'; +import { TimelineContext } from '../../../timelines/components/timeline/timeline_context'; import { DraggableWrapperHoverContent } from './draggable_wrapper_hover_content'; diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper_hover_content.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper_hover_content.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper_hover_content.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper_hover_content.tsx index 6976714cbe324e..a0546dc64113cd 100644 --- a/x-pack/plugins/siem/public/components/drag_and_drop/draggable_wrapper_hover_content.tsx +++ b/x-pack/plugins/siem/public/common/components/drag_and_drop/draggable_wrapper_hover_content.tsx @@ -12,8 +12,8 @@ import { getAllFieldsByName, WithSource } from '../../containers/source'; import { useAddToTimeline } from '../../hooks/use_add_to_timeline'; import { WithCopyToClipboard } from '../../lib/clipboard/with_copy_to_clipboard'; import { useKibana } from '../../lib/kibana'; -import { createFilter } from '../page/add_filter_to_global_search_bar'; -import { useTimelineContext } from '../timeline/timeline_context'; +import { createFilter } from '../add_filter_to_global_search_bar'; +import { useTimelineContext } from '../../../timelines/components/timeline/timeline_context'; import { StatefulTopN } from '../top_n'; import { allowTopN } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/droppable_wrapper.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/drag_and_drop/droppable_wrapper.test.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/droppable_wrapper.test.tsx diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/droppable_wrapper.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/drag_and_drop/droppable_wrapper.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/droppable_wrapper.tsx diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/helpers.test.ts b/x-pack/plugins/siem/public/common/components/drag_and_drop/helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/drag_and_drop/helpers.test.ts rename to x-pack/plugins/siem/public/common/components/drag_and_drop/helpers.test.ts diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/helpers.ts b/x-pack/plugins/siem/public/common/components/drag_and_drop/helpers.ts similarity index 95% rename from x-pack/plugins/siem/public/components/drag_and_drop/helpers.ts rename to x-pack/plugins/siem/public/common/components/drag_and_drop/helpers.ts index 9b37387ce076be..ad370f647738f3 100644 --- a/x-pack/plugins/siem/public/components/drag_and_drop/helpers.ts +++ b/x-pack/plugins/siem/public/common/components/drag_and_drop/helpers.ts @@ -10,12 +10,13 @@ import { Dispatch } from 'redux'; import { ActionCreator } from 'typescript-fsa'; import { BrowserField, BrowserFields, getAllFieldsByName } from '../../containers/source'; -import { dragAndDropActions, timelineActions } from '../../store/actions'; +import { dragAndDropActions } from '../../store/actions'; import { IdToDataProvider } from '../../store/drag_and_drop/model'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; -import { DEFAULT_COLUMN_MIN_WIDTH } from '../timeline/body/constants'; -import { DataProvider } from '../timeline/data_providers/data_provider'; -import { addContentToTimeline } from '../timeline/data_providers/helpers'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; +import { timelineActions } from '../../../timelines/store/timeline'; +import { DEFAULT_COLUMN_MIN_WIDTH } from '../../../timelines/components/timeline/body/constants'; +import { addContentToTimeline } from '../../../timelines/components/timeline/data_providers/helpers'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; export const draggableIdPrefix = 'draggableId'; diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/provider_container.tsx b/x-pack/plugins/siem/public/common/components/drag_and_drop/provider_container.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/drag_and_drop/provider_container.tsx rename to x-pack/plugins/siem/public/common/components/drag_and_drop/provider_container.tsx index c1f029086aa350..06cb8ee2e1a467 100644 --- a/x-pack/plugins/siem/public/components/drag_and_drop/provider_container.tsx +++ b/x-pack/plugins/siem/public/common/components/drag_and_drop/provider_container.tsx @@ -6,7 +6,7 @@ import React from 'react'; import styled, { css } from 'styled-components'; -import { STATEFUL_EVENT_CSS_CLASS_NAME } from '../timeline/helpers'; +import { STATEFUL_EVENT_CSS_CLASS_NAME } from '../../../timelines/components/timeline/helpers'; interface ProviderContainerProps { isDragging: boolean; diff --git a/x-pack/plugins/siem/public/components/drag_and_drop/translations.ts b/x-pack/plugins/siem/public/common/components/drag_and_drop/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/drag_and_drop/translations.ts rename to x-pack/plugins/siem/public/common/components/drag_and_drop/translations.ts diff --git a/x-pack/plugins/siem/public/components/draggables/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/draggables/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/draggables/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/draggables/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/draggables/field_badge/index.tsx b/x-pack/plugins/siem/public/common/components/draggables/field_badge/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/draggables/field_badge/index.tsx rename to x-pack/plugins/siem/public/common/components/draggables/field_badge/index.tsx diff --git a/x-pack/plugins/siem/public/components/draggables/field_badge/translations.ts b/x-pack/plugins/siem/public/common/components/draggables/field_badge/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/draggables/field_badge/translations.ts rename to x-pack/plugins/siem/public/common/components/draggables/field_badge/translations.ts diff --git a/x-pack/plugins/siem/public/components/draggables/index.test.tsx b/x-pack/plugins/siem/public/common/components/draggables/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/draggables/index.test.tsx rename to x-pack/plugins/siem/public/common/components/draggables/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/draggables/index.tsx b/x-pack/plugins/siem/public/common/components/draggables/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/draggables/index.tsx rename to x-pack/plugins/siem/public/common/components/draggables/index.tsx index cea900f7bccf96..fcf007a4cf1bab 100644 --- a/x-pack/plugins/siem/public/components/draggables/index.tsx +++ b/x-pack/plugins/siem/public/common/components/draggables/index.tsx @@ -11,8 +11,8 @@ import styled from 'styled-components'; import { DragEffects, DraggableWrapper } from '../drag_and_drop/draggable_wrapper'; import { escapeDataProviderId } from '../drag_and_drop/helpers'; import { getEmptyStringTag } from '../empty_value'; -import { IS_OPERATOR } from '../timeline/data_providers/data_provider'; -import { Provider } from '../timeline/data_providers/provider'; +import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Provider } from '../../../timelines/components/timeline/data_providers/provider'; export interface DefaultDraggableType { id: string; diff --git a/x-pack/plugins/siem/public/components/empty_page/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/empty_page/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/empty_page/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/empty_page/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/empty_page/index.test.tsx b/x-pack/plugins/siem/public/common/components/empty_page/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/empty_page/index.test.tsx rename to x-pack/plugins/siem/public/common/components/empty_page/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/empty_page/index.tsx b/x-pack/plugins/siem/public/common/components/empty_page/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/empty_page/index.tsx rename to x-pack/plugins/siem/public/common/components/empty_page/index.tsx diff --git a/x-pack/plugins/siem/public/components/empty_value/__snapshots__/empty_value.test.tsx.snap b/x-pack/plugins/siem/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/empty_value/__snapshots__/empty_value.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/empty_value/__snapshots__/empty_value.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/empty_value/empty_value.test.tsx b/x-pack/plugins/siem/public/common/components/empty_value/empty_value.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/empty_value/empty_value.test.tsx rename to x-pack/plugins/siem/public/common/components/empty_value/empty_value.test.tsx diff --git a/x-pack/plugins/siem/public/components/empty_value/index.tsx b/x-pack/plugins/siem/public/common/components/empty_value/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/empty_value/index.tsx rename to x-pack/plugins/siem/public/common/components/empty_value/index.tsx diff --git a/x-pack/plugins/siem/public/components/empty_value/translations.ts b/x-pack/plugins/siem/public/common/components/empty_value/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/empty_value/translations.ts rename to x-pack/plugins/siem/public/common/components/empty_value/translations.ts diff --git a/x-pack/plugins/siem/public/components/error_toast_dispatcher/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/error_toast_dispatcher/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/error_toast_dispatcher/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/error_toast_dispatcher/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx b/x-pack/plugins/siem/public/common/components/error_toast_dispatcher/index.test.tsx similarity index 78% rename from x-pack/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx rename to x-pack/plugins/siem/public/common/components/error_toast_dispatcher/index.test.tsx index 6b90d9ccd08c48..50b20099b17d07 100644 --- a/x-pack/plugins/siem/public/components/error_toast_dispatcher/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/error_toast_dispatcher/index.test.tsx @@ -8,7 +8,7 @@ import { shallow } from 'enzyme'; import React from 'react'; import { Provider } from 'react-redux'; -import { apolloClientObservable, mockGlobalState } from '../../mock'; +import { apolloClientObservable, mockGlobalState, SUB_PLUGINS_REDUCER } from '../../mock'; import { createStore } from '../../store/store'; import { ErrorToastDispatcher } from '.'; @@ -16,10 +16,10 @@ import { State } from '../../store/reducer'; describe('Error Toast Dispatcher', () => { const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/error_toast_dispatcher/index.tsx b/x-pack/plugins/siem/public/common/components/error_toast_dispatcher/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/error_toast_dispatcher/index.tsx rename to x-pack/plugins/siem/public/common/components/error_toast_dispatcher/index.tsx diff --git a/x-pack/plugins/siem/public/components/event_details/__snapshots__/event_details.test.tsx.snap b/x-pack/plugins/siem/public/common/components/event_details/__snapshots__/event_details.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/event_details/__snapshots__/event_details.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/event_details/__snapshots__/event_details.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/event_details/__snapshots__/json_view.test.tsx.snap b/x-pack/plugins/siem/public/common/components/event_details/__snapshots__/json_view.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/event_details/__snapshots__/json_view.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/event_details/__snapshots__/json_view.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/event_details/columns.tsx b/x-pack/plugins/siem/public/common/components/event_details/columns.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/event_details/columns.tsx rename to x-pack/plugins/siem/public/common/components/event_details/columns.tsx index 131a3a63bae309..4b5ce3b98e5e11 100644 --- a/x-pack/plugins/siem/public/components/event_details/columns.tsx +++ b/x-pack/plugins/siem/public/common/components/event_details/columns.tsx @@ -20,20 +20,20 @@ import { Draggable } from 'react-beautiful-dnd'; import styled from 'styled-components'; import { BrowserFields } from '../../containers/source'; -import { ToStringArray } from '../../graphql/types'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { ToStringArray } from '../../../graphql/types'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { DragEffects } from '../drag_and_drop/draggable_wrapper'; import { DroppableWrapper } from '../drag_and_drop/droppable_wrapper'; import { getDroppableId, getDraggableFieldId, DRAG_TYPE_FIELD } from '../drag_and_drop/helpers'; import { DraggableFieldBadge } from '../draggables/field_badge'; -import { FieldName } from '../fields_browser/field_name'; +import { FieldName } from '../../../timelines/components/fields_browser/field_name'; import { SelectableText } from '../selectable_text'; import { OverflowField } from '../tables/helpers'; -import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers'; -import { DEFAULT_COLUMN_MIN_WIDTH } from '../timeline/body/constants'; -import { MESSAGE_FIELD_NAME } from '../timeline/body/renderers/constants'; -import { FormattedFieldValue } from '../timeline/body/renderers/formatted_field'; -import { OnUpdateColumns } from '../timeline/events'; +import { defaultColumnHeaderType } from '../../../timelines/components/timeline/body/column_headers/default_headers'; +import { DEFAULT_COLUMN_MIN_WIDTH } from '../../../timelines/components/timeline/body/constants'; +import { MESSAGE_FIELD_NAME } from '../../../timelines/components/timeline/body/renderers/constants'; +import { FormattedFieldValue } from '../../../timelines/components/timeline/body/renderers/formatted_field'; +import { OnUpdateColumns } from '../../../timelines/components/timeline/events'; import { getIconFromType, getExampleText, getColumnsWithTimestamp } from './helpers'; import * as i18n from './translations'; import { EventFieldsData } from './types'; diff --git a/x-pack/plugins/siem/public/components/event_details/event_details.test.tsx b/x-pack/plugins/siem/public/common/components/event_details/event_details.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/event_details/event_details.test.tsx rename to x-pack/plugins/siem/public/common/components/event_details/event_details.test.tsx diff --git a/x-pack/plugins/siem/public/components/event_details/event_details.tsx b/x-pack/plugins/siem/public/common/components/event_details/event_details.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/event_details/event_details.tsx rename to x-pack/plugins/siem/public/common/components/event_details/event_details.tsx index 9234fe44320f06..c6a7a05bb26989 100644 --- a/x-pack/plugins/siem/public/components/event_details/event_details.tsx +++ b/x-pack/plugins/siem/public/common/components/event_details/event_details.tsx @@ -9,9 +9,9 @@ import React from 'react'; import styled from 'styled-components'; import { BrowserFields } from '../../containers/source'; -import { DetailItem } from '../../graphql/types'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; -import { OnUpdateColumns } from '../timeline/events'; +import { DetailItem } from '../../../graphql/types'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; +import { OnUpdateColumns } from '../../../timelines/components/timeline/events'; import { EventFieldsBrowser } from './event_fields_browser'; import { JsonView } from './json_view'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/event_details/event_fields_browser.test.tsx b/x-pack/plugins/siem/public/common/components/event_details/event_fields_browser.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/event_details/event_fields_browser.test.tsx rename to x-pack/plugins/siem/public/common/components/event_details/event_fields_browser.test.tsx diff --git a/x-pack/plugins/siem/public/components/event_details/event_fields_browser.tsx b/x-pack/plugins/siem/public/common/components/event_details/event_fields_browser.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/event_details/event_fields_browser.tsx rename to x-pack/plugins/siem/public/common/components/event_details/event_fields_browser.tsx index 9a842339cb62ef..0428f3ec8a197b 100644 --- a/x-pack/plugins/siem/public/components/event_details/event_fields_browser.tsx +++ b/x-pack/plugins/siem/public/common/components/event_details/event_fields_browser.tsx @@ -8,10 +8,10 @@ import { sortBy } from 'lodash'; import { EuiInMemoryTable } from '@elastic/eui'; import React, { useMemo } from 'react'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { BrowserFields, getAllFieldsByName } from '../../containers/source'; -import { DetailItem } from '../../graphql/types'; -import { OnUpdateColumns } from '../timeline/events'; +import { DetailItem } from '../../../graphql/types'; +import { OnUpdateColumns } from '../../../timelines/components/timeline/events'; import { getColumns } from './columns'; import { search } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/event_details/event_id.ts b/x-pack/plugins/siem/public/common/components/event_details/event_id.ts similarity index 100% rename from x-pack/plugins/siem/public/components/event_details/event_id.ts rename to x-pack/plugins/siem/public/common/components/event_details/event_id.ts diff --git a/x-pack/plugins/siem/public/components/event_details/helpers.test.tsx b/x-pack/plugins/siem/public/common/components/event_details/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/event_details/helpers.test.tsx rename to x-pack/plugins/siem/public/common/components/event_details/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/components/event_details/helpers.tsx b/x-pack/plugins/siem/public/common/components/event_details/helpers.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/event_details/helpers.tsx rename to x-pack/plugins/siem/public/common/components/event_details/helpers.tsx index 5d9c9d82490bbb..aae7ca901c3d21 100644 --- a/x-pack/plugins/siem/public/components/event_details/helpers.tsx +++ b/x-pack/plugins/siem/public/common/components/event_details/helpers.tsx @@ -7,12 +7,12 @@ import { get, getOr, isEmpty, uniqBy } from 'lodash/fp'; import { BrowserField, BrowserFields } from '../../containers/source'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { DEFAULT_DATE_COLUMN_MIN_WIDTH, DEFAULT_COLUMN_MIN_WIDTH, -} from '../timeline/body/constants'; -import { ToStringArray } from '../../graphql/types'; +} from '../../../timelines/components/timeline/body/constants'; +import { ToStringArray } from '../../../graphql/types'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/event_details/json_view.test.tsx b/x-pack/plugins/siem/public/common/components/event_details/json_view.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/event_details/json_view.test.tsx rename to x-pack/plugins/siem/public/common/components/event_details/json_view.test.tsx diff --git a/x-pack/plugins/siem/public/components/event_details/json_view.tsx b/x-pack/plugins/siem/public/common/components/event_details/json_view.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/event_details/json_view.tsx rename to x-pack/plugins/siem/public/common/components/event_details/json_view.tsx index 9897e319e0487b..788ca95e2022ea 100644 --- a/x-pack/plugins/siem/public/components/event_details/json_view.tsx +++ b/x-pack/plugins/siem/public/common/components/event_details/json_view.tsx @@ -9,8 +9,8 @@ import { set } from 'lodash/fp'; import React from 'react'; import styled from 'styled-components'; -import { DetailItem } from '../../graphql/types'; -import { omitTypenameAndEmpty } from '../timeline/body/helpers'; +import { DetailItem } from '../../../graphql/types'; +import { omitTypenameAndEmpty } from '../../../timelines/components/timeline/body/helpers'; interface Props { data: DetailItem[]; diff --git a/x-pack/plugins/siem/public/components/event_details/stateful_event_details.tsx b/x-pack/plugins/siem/public/common/components/event_details/stateful_event_details.tsx similarity index 86% rename from x-pack/plugins/siem/public/components/event_details/stateful_event_details.tsx rename to x-pack/plugins/siem/public/common/components/event_details/stateful_event_details.tsx index c79f02740253a9..ec0e82c218a075 100644 --- a/x-pack/plugins/siem/public/components/event_details/stateful_event_details.tsx +++ b/x-pack/plugins/siem/public/common/components/event_details/stateful_event_details.tsx @@ -7,9 +7,9 @@ import React, { useCallback, useState } from 'react'; import { BrowserFields } from '../../containers/source'; -import { DetailItem } from '../../graphql/types'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; -import { OnUpdateColumns } from '../timeline/events'; +import { DetailItem } from '../../../graphql/types'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; +import { OnUpdateColumns } from '../../../timelines/components/timeline/events'; import { EventDetails, View } from './event_details'; diff --git a/x-pack/plugins/siem/public/components/event_details/translations.ts b/x-pack/plugins/siem/public/common/components/event_details/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/event_details/translations.ts rename to x-pack/plugins/siem/public/common/components/event_details/translations.ts diff --git a/x-pack/plugins/siem/public/components/event_details/types.ts b/x-pack/plugins/siem/public/common/components/event_details/types.ts similarity index 87% rename from x-pack/plugins/siem/public/components/event_details/types.ts rename to x-pack/plugins/siem/public/common/components/event_details/types.ts index 4e351fcdf98e4c..db53f411fa5183 100644 --- a/x-pack/plugins/siem/public/components/event_details/types.ts +++ b/x-pack/plugins/siem/public/common/components/event_details/types.ts @@ -5,6 +5,6 @@ */ import { BrowserField } from '../../containers/source'; -import { DetailItem } from '../../graphql/types'; +import { DetailItem } from '../../../graphql/types'; export type EventFieldsData = BrowserField & DetailItem; diff --git a/x-pack/plugins/siem/public/components/events_viewer/default_headers.tsx b/x-pack/plugins/siem/public/common/components/events_viewer/default_headers.tsx similarity index 84% rename from x-pack/plugins/siem/public/components/events_viewer/default_headers.tsx rename to x-pack/plugins/siem/public/common/components/events_viewer/default_headers.tsx index b97e0da5df078b..4660351e0d8f9a 100644 --- a/x-pack/plugins/siem/public/components/events_viewer/default_headers.tsx +++ b/x-pack/plugins/siem/public/common/components/events_viewer/default_headers.tsx @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import { ColumnHeaderOptions } from '../../store/timeline/model'; -import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; +import { defaultColumnHeaderType } from '../../../timelines/components/timeline/body/column_headers/default_headers'; import { DEFAULT_COLUMN_MIN_WIDTH, DEFAULT_DATE_COLUMN_MIN_WIDTH, -} from '../timeline/body/constants'; +} from '../../../timelines/components/timeline/body/constants'; export const defaultHeaders: ColumnHeaderOptions[] = [ { diff --git a/x-pack/plugins/siem/public/components/events_viewer/default_model.tsx b/x-pack/plugins/siem/public/common/components/events_viewer/default_model.tsx similarity index 71% rename from x-pack/plugins/siem/public/components/events_viewer/default_model.tsx rename to x-pack/plugins/siem/public/common/components/events_viewer/default_model.tsx index 59a9f6d061c8d4..ecb76eb7ff93f2 100644 --- a/x-pack/plugins/siem/public/components/events_viewer/default_model.tsx +++ b/x-pack/plugins/siem/public/common/components/events_viewer/default_model.tsx @@ -5,8 +5,8 @@ */ import { defaultHeaders } from './default_headers'; -import { SubsetTimelineModel } from '../../store/timeline/model'; -import { timelineDefaults } from '../../store/timeline/defaults'; +import { SubsetTimelineModel } from '../../../timelines/store/timeline/model'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; export const eventsDefaultModel: SubsetTimelineModel = { ...timelineDefaults, diff --git a/x-pack/plugins/siem/public/components/events_viewer/event_details_width_context.tsx b/x-pack/plugins/siem/public/common/components/events_viewer/event_details_width_context.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/events_viewer/event_details_width_context.tsx rename to x-pack/plugins/siem/public/common/components/events_viewer/event_details_width_context.tsx diff --git a/x-pack/plugins/siem/public/components/events_viewer/events_viewer.test.tsx b/x-pack/plugins/siem/public/common/components/events_viewer/events_viewer.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/events_viewer/events_viewer.test.tsx rename to x-pack/plugins/siem/public/common/components/events_viewer/events_viewer.test.tsx index d3cdf9886e4693..d2f0d47380dd27 100644 --- a/x-pack/plugins/siem/public/components/events_viewer/events_viewer.test.tsx +++ b/x-pack/plugins/siem/public/common/components/events_viewer/events_viewer.test.tsx @@ -14,13 +14,13 @@ import { wait } from '../../lib/helpers'; import { mockEventViewerResponse } from './mock'; import { StatefulEventsViewer } from '.'; import { defaultHeaders } from './default_headers'; -import { useFetchIndexPatterns } from '../../containers/detection_engine/rules/fetch_index_patterns'; +import { useFetchIndexPatterns } from '../../../alerts/containers/detection_engine/rules/fetch_index_patterns'; import { mockBrowserFields } from '../../containers/source/mock'; import { eventsDefaultModel } from './default_model'; import { useMountAppended } from '../../utils/use_mount_appended'; const mockUseFetchIndexPatterns: jest.Mock = useFetchIndexPatterns as jest.Mock; -jest.mock('../../containers/detection_engine/rules/fetch_index_patterns'); +jest.mock('../../../alerts/containers/detection_engine/rules/fetch_index_patterns'); mockUseFetchIndexPatterns.mockImplementation(() => [ { browserFields: mockBrowserFields, diff --git a/x-pack/plugins/siem/public/components/events_viewer/events_viewer.tsx b/x-pack/plugins/siem/public/common/components/events_viewer/events_viewer.tsx similarity index 86% rename from x-pack/plugins/siem/public/components/events_viewer/events_viewer.tsx rename to x-pack/plugins/siem/public/common/components/events_viewer/events_viewer.tsx index aff66396af39d3..bec8c30ecdd384 100644 --- a/x-pack/plugins/siem/public/components/events_viewer/events_viewer.tsx +++ b/x-pack/plugins/siem/public/common/components/events_viewer/events_viewer.tsx @@ -11,23 +11,31 @@ import styled from 'styled-components'; import deepEqual from 'fast-deep-equal'; import { BrowserFields } from '../../containers/source'; -import { TimelineQuery } from '../../containers/timeline'; -import { Direction } from '../../graphql/types'; +import { TimelineQuery } from '../../../timelines/containers'; +import { Direction } from '../../../graphql/types'; import { useKibana } from '../../lib/kibana'; -import { ColumnHeaderOptions, KqlMode } from '../../store/timeline/model'; +import { ColumnHeaderOptions, KqlMode } from '../../../timelines/store/timeline/model'; import { HeaderSection } from '../header_section'; -import { defaultHeaders } from '../timeline/body/column_headers/default_headers'; -import { Sort } from '../timeline/body/sort'; -import { StatefulBody } from '../timeline/body/stateful_body'; -import { DataProvider } from '../timeline/data_providers/data_provider'; -import { OnChangeItemsPerPage } from '../timeline/events'; -import { Footer, footerHeight } from '../timeline/footer'; -import { combineQueries } from '../timeline/helpers'; -import { TimelineRefetch } from '../timeline/refetch_timeline'; -import { ManageTimelineContext, TimelineTypeContextProps } from '../timeline/timeline_context'; +import { defaultHeaders } from '../../../timelines/components/timeline/body/column_headers/default_headers'; +import { Sort } from '../../../timelines/components/timeline/body/sort'; +import { StatefulBody } from '../../../timelines/components/timeline/body/stateful_body'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { OnChangeItemsPerPage } from '../../../timelines/components/timeline/events'; +import { Footer, footerHeight } from '../../../timelines/components/timeline/footer'; +import { combineQueries } from '../../../timelines/components/timeline/helpers'; +import { TimelineRefetch } from '../../../timelines/components/timeline/refetch_timeline'; +import { + ManageTimelineContext, + TimelineTypeContextProps, +} from '../../../timelines/components/timeline/timeline_context'; import { EventDetailsWidthProvider } from './event_details_width_context'; import * as i18n from './translations'; -import { Filter, esQuery, IIndexPattern, Query } from '../../../../../../src/plugins/data/public'; +import { + Filter, + esQuery, + IIndexPattern, + Query, +} from '../../../../../../../src/plugins/data/public'; import { inputsModel } from '../../store'; const DEFAULT_EVENTS_VIEWER_HEIGHT = 500; diff --git a/x-pack/plugins/siem/public/components/events_viewer/index.test.tsx b/x-pack/plugins/siem/public/common/components/events_viewer/index.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/events_viewer/index.test.tsx rename to x-pack/plugins/siem/public/common/components/events_viewer/index.test.tsx index 6f614c1e32f651..bdc0338450507a 100644 --- a/x-pack/plugins/siem/public/components/events_viewer/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/events_viewer/index.test.tsx @@ -14,12 +14,12 @@ import { useMountAppended } from '../../utils/use_mount_appended'; import { mockEventViewerResponse } from './mock'; import { StatefulEventsViewer } from '.'; -import { useFetchIndexPatterns } from '../../containers/detection_engine/rules/fetch_index_patterns'; +import { useFetchIndexPatterns } from '../../../alerts/containers/detection_engine/rules/fetch_index_patterns'; import { mockBrowserFields } from '../../containers/source/mock'; import { eventsDefaultModel } from './default_model'; const mockUseFetchIndexPatterns: jest.Mock = useFetchIndexPatterns as jest.Mock; -jest.mock('../../containers/detection_engine/rules/fetch_index_patterns'); +jest.mock('../../../alerts/containers/detection_engine/rules/fetch_index_patterns'); mockUseFetchIndexPatterns.mockImplementation(() => [ { browserFields: mockBrowserFields, diff --git a/x-pack/plugins/siem/public/components/events_viewer/index.tsx b/x-pack/plugins/siem/public/common/components/events_viewer/index.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/events_viewer/index.tsx rename to x-pack/plugins/siem/public/common/components/events_viewer/index.tsx index bc6a1b3b77bfa9..e7af69096179af 100644 --- a/x-pack/plugins/siem/public/components/events_viewer/index.tsx +++ b/x-pack/plugins/siem/public/common/components/events_viewer/index.tsx @@ -8,20 +8,21 @@ import React, { useCallback, useMemo, useEffect } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import deepEqual from 'fast-deep-equal'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; -import { inputsModel, inputsSelectors, State, timelineSelectors } from '../../store'; -import { inputsActions, timelineActions } from '../../store/actions'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; +import { inputsModel, inputsSelectors, State } from '../../store'; +import { inputsActions } from '../../store/actions'; +import { timelineSelectors, timelineActions } from '../../../timelines/store/timeline'; import { ColumnHeaderOptions, SubsetTimelineModel, TimelineModel, -} from '../../store/timeline/model'; -import { OnChangeItemsPerPage } from '../timeline/events'; -import { Filter } from '../../../../../../src/plugins/data/public'; +} from '../../../timelines/store/timeline/model'; +import { OnChangeItemsPerPage } from '../../../timelines/components/timeline/events'; +import { Filter } from '../../../../../../../src/plugins/data/public'; import { useUiSetting } from '../../lib/kibana'; import { EventsViewer } from './events_viewer'; -import { useFetchIndexPatterns } from '../../containers/detection_engine/rules/fetch_index_patterns'; -import { TimelineTypeContextProps } from '../timeline/timeline_context'; +import { useFetchIndexPatterns } from '../../../alerts/containers/detection_engine/rules/fetch_index_patterns'; +import { TimelineTypeContextProps } from '../../../timelines/components/timeline/timeline_context'; import { InspectButtonContainer } from '../inspect'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/events_viewer/mock.ts b/x-pack/plugins/siem/public/common/components/events_viewer/mock.ts similarity index 95% rename from x-pack/plugins/siem/public/components/events_viewer/mock.ts rename to x-pack/plugins/siem/public/common/components/events_viewer/mock.ts index 352b0b95c6dd4d..bf95a58aec9818 100644 --- a/x-pack/plugins/siem/public/components/events_viewer/mock.ts +++ b/x-pack/plugins/siem/public/common/components/events_viewer/mock.ts @@ -5,7 +5,7 @@ */ import { noop } from 'lodash/fp'; -import { timelineQuery } from '../../containers/timeline/index.gql_query'; +import { timelineQuery } from '../../../timelines/containers/index.gql_query'; export const mockEventViewerResponse = [ { diff --git a/x-pack/plugins/siem/public/components/events_viewer/translations.ts b/x-pack/plugins/siem/public/common/components/events_viewer/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/events_viewer/translations.ts rename to x-pack/plugins/siem/public/common/components/events_viewer/translations.ts diff --git a/x-pack/plugins/siem/public/components/external_link_icon/index.test.tsx b/x-pack/plugins/siem/public/common/components/external_link_icon/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/external_link_icon/index.test.tsx rename to x-pack/plugins/siem/public/common/components/external_link_icon/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/external_link_icon/index.tsx b/x-pack/plugins/siem/public/common/components/external_link_icon/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/external_link_icon/index.tsx rename to x-pack/plugins/siem/public/common/components/external_link_icon/index.tsx diff --git a/x-pack/plugins/siem/public/components/filters_global/__snapshots__/filters_global.test.tsx.snap b/x-pack/plugins/siem/public/common/components/filters_global/__snapshots__/filters_global.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/filters_global/__snapshots__/filters_global.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/filters_global/__snapshots__/filters_global.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/filters_global/filters_global.test.tsx b/x-pack/plugins/siem/public/common/components/filters_global/filters_global.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/filters_global/filters_global.test.tsx rename to x-pack/plugins/siem/public/common/components/filters_global/filters_global.test.tsx diff --git a/x-pack/plugins/siem/public/components/filters_global/filters_global.tsx b/x-pack/plugins/siem/public/common/components/filters_global/filters_global.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/filters_global/filters_global.tsx rename to x-pack/plugins/siem/public/common/components/filters_global/filters_global.tsx diff --git a/x-pack/plugins/siem/public/components/filters_global/index.tsx b/x-pack/plugins/siem/public/common/components/filters_global/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/filters_global/index.tsx rename to x-pack/plugins/siem/public/common/components/filters_global/index.tsx diff --git a/x-pack/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/formatted_bytes/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_bytes/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/formatted_bytes/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/formatted_bytes/index.test.tsx b/x-pack/plugins/siem/public/common/components/formatted_bytes/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_bytes/index.test.tsx rename to x-pack/plugins/siem/public/common/components/formatted_bytes/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/formatted_bytes/index.tsx b/x-pack/plugins/siem/public/common/components/formatted_bytes/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/formatted_bytes/index.tsx rename to x-pack/plugins/siem/public/common/components/formatted_bytes/index.tsx index 98a1acf471629e..5664af2aa3f5b4 100644 --- a/x-pack/plugins/siem/public/components/formatted_bytes/index.tsx +++ b/x-pack/plugins/siem/public/common/components/formatted_bytes/index.tsx @@ -7,7 +7,7 @@ import React from 'react'; import numeral from '@elastic/numeral'; -import { DEFAULT_BYTES_FORMAT } from '../../../common/constants'; +import { DEFAULT_BYTES_FORMAT } from '../../../../common/constants'; import { useUiSetting$ } from '../../lib/kibana'; type Bytes = string | number; diff --git a/x-pack/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/formatted_date/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_date/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/formatted_date/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/formatted_date/index.test.tsx b/x-pack/plugins/siem/public/common/components/formatted_date/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_date/index.test.tsx rename to x-pack/plugins/siem/public/common/components/formatted_date/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/formatted_date/index.tsx b/x-pack/plugins/siem/public/common/components/formatted_date/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_date/index.tsx rename to x-pack/plugins/siem/public/common/components/formatted_date/index.tsx diff --git a/x-pack/plugins/siem/public/components/formatted_date/maybe_date.test.ts b/x-pack/plugins/siem/public/common/components/formatted_date/maybe_date.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_date/maybe_date.test.ts rename to x-pack/plugins/siem/public/common/components/formatted_date/maybe_date.test.ts diff --git a/x-pack/plugins/siem/public/components/formatted_date/maybe_date.ts b/x-pack/plugins/siem/public/common/components/formatted_date/maybe_date.ts similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_date/maybe_date.ts rename to x-pack/plugins/siem/public/common/components/formatted_date/maybe_date.ts diff --git a/x-pack/plugins/siem/public/components/generic_downloader/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/generic_downloader/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/generic_downloader/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/generic_downloader/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/generic_downloader/index.test.tsx b/x-pack/plugins/siem/public/common/components/generic_downloader/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/generic_downloader/index.test.tsx rename to x-pack/plugins/siem/public/common/components/generic_downloader/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/generic_downloader/index.tsx b/x-pack/plugins/siem/public/common/components/generic_downloader/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/generic_downloader/index.tsx rename to x-pack/plugins/siem/public/common/components/generic_downloader/index.tsx index 6f08f5c8c381cd..2f68da0c18727b 100644 --- a/x-pack/plugins/siem/public/components/generic_downloader/index.tsx +++ b/x-pack/plugins/siem/public/common/components/generic_downloader/index.tsx @@ -9,7 +9,7 @@ import styled from 'styled-components'; import { isFunction } from 'lodash/fp'; import * as i18n from './translations'; -import { ExportDocumentsProps } from '../../containers/detection_engine/rules'; +import { ExportDocumentsProps } from '../../../alerts/containers/detection_engine/rules'; import { useStateToaster, errorToToaster } from '../toasters'; const InvisibleAnchor = styled.a` diff --git a/x-pack/plugins/siem/public/components/generic_downloader/translations.ts b/x-pack/plugins/siem/public/common/components/generic_downloader/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/generic_downloader/translations.ts rename to x-pack/plugins/siem/public/common/components/generic_downloader/translations.ts diff --git a/x-pack/plugins/siem/public/components/header_global/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/header_global/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/header_global/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/header_global/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/header_global/index.test.tsx b/x-pack/plugins/siem/public/common/components/header_global/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/header_global/index.test.tsx rename to x-pack/plugins/siem/public/common/components/header_global/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/header_global/index.tsx b/x-pack/plugins/siem/public/common/components/header_global/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/header_global/index.tsx rename to x-pack/plugins/siem/public/common/components/header_global/index.tsx index adc2be4f9c3656..bc4bb80d8874de 100644 --- a/x-pack/plugins/siem/public/components/header_global/index.tsx +++ b/x-pack/plugins/siem/public/common/components/header_global/index.tsx @@ -11,8 +11,8 @@ import styled, { css } from 'styled-components'; import { useLocation } from 'react-router-dom'; import { gutterTimeline } from '../../lib/helpers'; -import { navTabs } from '../../pages/home/home_navigations'; -import { SiemPageName } from '../../pages/home/types'; +import { navTabs } from '../../../app/home/home_navigations'; +import { SiemPageName } from '../../../app/types'; import { getOverviewUrl } from '../link_to'; import { MlPopover } from '../ml_popover/ml_popover'; import { SiemNavigation } from '../navigation'; diff --git a/x-pack/plugins/siem/public/components/header_global/translations.ts b/x-pack/plugins/siem/public/common/components/header_global/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/header_global/translations.ts rename to x-pack/plugins/siem/public/common/components/header_global/translations.ts diff --git a/x-pack/plugins/siem/public/components/header_page/__snapshots__/editable_title.test.tsx.snap b/x-pack/plugins/siem/public/common/components/header_page/__snapshots__/editable_title.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/__snapshots__/editable_title.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/header_page/__snapshots__/editable_title.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/header_page/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/header_page/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/header_page/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/header_page/__snapshots__/title.test.tsx.snap b/x-pack/plugins/siem/public/common/components/header_page/__snapshots__/title.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/__snapshots__/title.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/header_page/__snapshots__/title.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/header_page/editable_title.test.tsx b/x-pack/plugins/siem/public/common/components/header_page/editable_title.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/editable_title.test.tsx rename to x-pack/plugins/siem/public/common/components/header_page/editable_title.test.tsx diff --git a/x-pack/plugins/siem/public/components/header_page/editable_title.tsx b/x-pack/plugins/siem/public/common/components/header_page/editable_title.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/editable_title.tsx rename to x-pack/plugins/siem/public/common/components/header_page/editable_title.tsx diff --git a/x-pack/plugins/siem/public/components/header_page/index.test.tsx b/x-pack/plugins/siem/public/common/components/header_page/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/index.test.tsx rename to x-pack/plugins/siem/public/common/components/header_page/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/header_page/index.tsx b/x-pack/plugins/siem/public/common/components/header_page/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/index.tsx rename to x-pack/plugins/siem/public/common/components/header_page/index.tsx diff --git a/x-pack/plugins/siem/public/components/header_page/title.test.tsx b/x-pack/plugins/siem/public/common/components/header_page/title.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/title.test.tsx rename to x-pack/plugins/siem/public/common/components/header_page/title.test.tsx diff --git a/x-pack/plugins/siem/public/components/header_page/title.tsx b/x-pack/plugins/siem/public/common/components/header_page/title.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/title.tsx rename to x-pack/plugins/siem/public/common/components/header_page/title.tsx diff --git a/x-pack/plugins/siem/public/components/header_page/translations.ts b/x-pack/plugins/siem/public/common/components/header_page/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/translations.ts rename to x-pack/plugins/siem/public/common/components/header_page/translations.ts diff --git a/x-pack/plugins/siem/public/components/header_page/types.ts b/x-pack/plugins/siem/public/common/components/header_page/types.ts similarity index 100% rename from x-pack/plugins/siem/public/components/header_page/types.ts rename to x-pack/plugins/siem/public/common/components/header_page/types.ts diff --git a/x-pack/plugins/siem/public/components/header_section/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/header_section/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/header_section/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/header_section/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/header_section/index.test.tsx b/x-pack/plugins/siem/public/common/components/header_section/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/header_section/index.test.tsx rename to x-pack/plugins/siem/public/common/components/header_section/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/header_section/index.tsx b/x-pack/plugins/siem/public/common/components/header_section/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/header_section/index.tsx rename to x-pack/plugins/siem/public/common/components/header_section/index.tsx diff --git a/x-pack/plugins/siem/public/components/help_menu/index.tsx b/x-pack/plugins/siem/public/common/components/help_menu/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/help_menu/index.tsx rename to x-pack/plugins/siem/public/common/components/help_menu/index.tsx diff --git a/x-pack/plugins/siem/public/components/import_data_modal/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/import_data_modal/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/import_data_modal/index.test.tsx b/x-pack/plugins/siem/public/common/components/import_data_modal/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/import_data_modal/index.test.tsx rename to x-pack/plugins/siem/public/common/components/import_data_modal/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/import_data_modal/index.tsx b/x-pack/plugins/siem/public/common/components/import_data_modal/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/import_data_modal/index.tsx rename to x-pack/plugins/siem/public/common/components/import_data_modal/index.tsx index c827411a41e2ea..45368d1fefc539 100644 --- a/x-pack/plugins/siem/public/components/import_data_modal/index.tsx +++ b/x-pack/plugins/siem/public/common/components/import_data_modal/index.tsx @@ -21,7 +21,10 @@ import { } from '@elastic/eui'; import React, { useCallback, useState } from 'react'; -import { ImportDataResponse, ImportDataProps } from '../../containers/detection_engine/rules'; +import { + ImportDataResponse, + ImportDataProps, +} from '../../../alerts/containers/detection_engine/rules'; import { displayErrorToast, displaySuccessToast, diff --git a/x-pack/plugins/siem/public/components/import_data_modal/translations.ts b/x-pack/plugins/siem/public/common/components/import_data_modal/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/import_data_modal/translations.ts rename to x-pack/plugins/siem/public/common/components/import_data_modal/translations.ts diff --git a/x-pack/plugins/siem/public/components/inspect/index.test.tsx b/x-pack/plugins/siem/public/common/components/inspect/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/inspect/index.test.tsx rename to x-pack/plugins/siem/public/common/components/inspect/index.test.tsx index 9492002717e2bf..a4ef6f8c795709 100644 --- a/x-pack/plugins/siem/public/components/inspect/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/inspect/index.test.tsx @@ -13,6 +13,7 @@ import { TestProviderWithoutDragAndDrop, mockGlobalState, apolloClientObservable, + SUB_PLUGINS_REDUCER, } from '../../mock'; import { createStore, State } from '../../store'; import { UpdateQueryParams, upsertQuery } from '../../store/inputs/helpers'; @@ -33,13 +34,13 @@ describe('Inspect Button', () => { state: state.inputs, }; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); describe('Render', () => { beforeEach(() => { const myState = cloneDeep(state); myState.inputs = upsertQuery(newQuery); - store = createStore(myState, apolloClientObservable); + store = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable); }); test('Eui Empty Button', () => { const wrapper = mount( @@ -155,7 +156,7 @@ describe('Inspect Button', () => { response: ['my response'], }; myState.inputs = upsertQuery(myQuery); - store = createStore(myState, apolloClientObservable); + store = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable); }); test('Open Inspect Modal', () => { const wrapper = mount( diff --git a/x-pack/plugins/siem/public/components/inspect/index.tsx b/x-pack/plugins/siem/public/common/components/inspect/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/inspect/index.tsx rename to x-pack/plugins/siem/public/common/components/inspect/index.tsx diff --git a/x-pack/plugins/siem/public/components/inspect/modal.test.tsx b/x-pack/plugins/siem/public/common/components/inspect/modal.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/inspect/modal.test.tsx rename to x-pack/plugins/siem/public/common/components/inspect/modal.test.tsx diff --git a/x-pack/plugins/siem/public/components/inspect/modal.tsx b/x-pack/plugins/siem/public/common/components/inspect/modal.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/inspect/modal.tsx rename to x-pack/plugins/siem/public/common/components/inspect/modal.tsx diff --git a/x-pack/plugins/siem/public/components/inspect/translations.ts b/x-pack/plugins/siem/public/common/components/inspect/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/inspect/translations.ts rename to x-pack/plugins/siem/public/common/components/inspect/translations.ts diff --git a/x-pack/plugins/siem/public/components/last_event_time/index.test.tsx b/x-pack/plugins/siem/public/common/components/last_event_time/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/last_event_time/index.test.tsx rename to x-pack/plugins/siem/public/common/components/last_event_time/index.test.tsx index 69a795d0c8db78..2f0060c91668bb 100644 --- a/x-pack/plugins/siem/public/components/last_event_time/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/last_event_time/index.test.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { getEmptyValue } from '../empty_value'; -import { LastEventIndexKey } from '../../graphql/types'; +import { LastEventIndexKey } from '../../../graphql/types'; import { mockLastEventTimeQuery } from '../../containers/events/last_event_time/mock'; import { useMountAppended } from '../../utils/use_mount_appended'; diff --git a/x-pack/plugins/siem/public/components/last_event_time/index.tsx b/x-pack/plugins/siem/public/common/components/last_event_time/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/last_event_time/index.tsx rename to x-pack/plugins/siem/public/common/components/last_event_time/index.tsx index 2493a1378e944a..1c988ed989e86a 100644 --- a/x-pack/plugins/siem/public/components/last_event_time/index.tsx +++ b/x-pack/plugins/siem/public/common/components/last_event_time/index.tsx @@ -8,7 +8,7 @@ import { EuiIcon, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { memo } from 'react'; -import { LastEventIndexKey } from '../../graphql/types'; +import { LastEventIndexKey } from '../../../graphql/types'; import { useLastEventTimeQuery } from '../../containers/events/last_event_time'; import { getEmptyTagValue } from '../empty_value'; import { FormattedRelativePreferenceDate } from '../formatted_date'; diff --git a/x-pack/plugins/siem/public/components/link_icon/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/link_icon/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/link_icon/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/link_icon/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/link_icon/index.test.tsx b/x-pack/plugins/siem/public/common/components/link_icon/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/link_icon/index.test.tsx rename to x-pack/plugins/siem/public/common/components/link_icon/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/link_icon/index.tsx b/x-pack/plugins/siem/public/common/components/link_icon/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/link_icon/index.tsx rename to x-pack/plugins/siem/public/common/components/link_icon/index.tsx diff --git a/x-pack/plugins/siem/public/components/link_to/helpers.test.ts b/x-pack/plugins/siem/public/common/components/link_to/helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/link_to/helpers.test.ts rename to x-pack/plugins/siem/public/common/components/link_to/helpers.test.ts diff --git a/x-pack/plugins/siem/public/components/link_to/helpers.ts b/x-pack/plugins/siem/public/common/components/link_to/helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/link_to/helpers.ts rename to x-pack/plugins/siem/public/common/components/link_to/helpers.ts diff --git a/x-pack/plugins/siem/public/components/link_to/index.ts b/x-pack/plugins/siem/public/common/components/link_to/index.ts similarity index 100% rename from x-pack/plugins/siem/public/components/link_to/index.ts rename to x-pack/plugins/siem/public/common/components/link_to/index.ts diff --git a/x-pack/plugins/siem/public/components/link_to/link_to.tsx b/x-pack/plugins/siem/public/common/components/link_to/link_to.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/link_to/link_to.tsx rename to x-pack/plugins/siem/public/common/components/link_to/link_to.tsx index d3bf2e34b435b7..77636af8bc4a49 100644 --- a/x-pack/plugins/siem/public/components/link_to/link_to.tsx +++ b/x-pack/plugins/siem/public/common/components/link_to/link_to.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { match as RouteMatch, Redirect, Route, Switch } from 'react-router-dom'; -import { SiemPageName } from '../../pages/home/types'; -import { HostsTableType } from '../../store/hosts/model'; +import { SiemPageName } from '../../../app/types'; +import { HostsTableType } from '../../../hosts/store/model'; import { RedirectToCreateRulePage, RedirectToDetectionEnginePage, @@ -25,8 +25,8 @@ import { RedirectToCreatePage, RedirectToConfigureCasesPage, } from './redirect_to_case'; -import { DetectionEngineTab } from '../../pages/detection_engine/types'; -import { TimelineType } from '../../../common/types/timeline'; +import { DetectionEngineTab } from '../../../alerts/pages/detection_engine/types'; +import { TimelineType } from '../../../../common/types/timeline'; interface LinkToPageProps { match: RouteMatch<{}>; diff --git a/x-pack/plugins/siem/public/components/link_to/redirect_to_case.tsx b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_case.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/link_to/redirect_to_case.tsx rename to x-pack/plugins/siem/public/common/components/link_to/redirect_to_case.tsx index 6ec15b55ba83dc..e0c03519c6cbea 100644 --- a/x-pack/plugins/siem/public/components/link_to/redirect_to_case.tsx +++ b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_case.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { RouteComponentProps } from 'react-router-dom'; import { appendSearch } from './helpers'; import { RedirectWrapper } from './redirect_wrapper'; -import { SiemPageName } from '../../pages/home/types'; +import { SiemPageName } from '../../../app/types'; export type CaseComponentProps = RouteComponentProps<{ detailName: string; diff --git a/x-pack/plugins/siem/public/components/link_to/redirect_to_detection_engine.tsx b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_detection_engine.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/link_to/redirect_to_detection_engine.tsx rename to x-pack/plugins/siem/public/common/components/link_to/redirect_to_detection_engine.tsx index 18111aa93a27a8..fc5aef966f228c 100644 --- a/x-pack/plugins/siem/public/components/link_to/redirect_to_detection_engine.tsx +++ b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_detection_engine.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { RouteComponentProps } from 'react-router-dom'; -import { DetectionEngineTab } from '../../pages/detection_engine/types'; +import { DetectionEngineTab } from '../../../alerts/pages/detection_engine/types'; import { appendSearch } from './helpers'; import { RedirectWrapper } from './redirect_wrapper'; diff --git a/x-pack/plugins/siem/public/components/link_to/redirect_to_hosts.tsx b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_hosts.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/link_to/redirect_to_hosts.tsx rename to x-pack/plugins/siem/public/common/components/link_to/redirect_to_hosts.tsx index 746a959cc996a1..0cfe8e655e255d 100644 --- a/x-pack/plugins/siem/public/components/link_to/redirect_to_hosts.tsx +++ b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_hosts.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { RouteComponentProps } from 'react-router-dom'; -import { HostsTableType } from '../../store/hosts/model'; -import { SiemPageName } from '../../pages/home/types'; +import { HostsTableType } from '../../../hosts/store/model'; +import { SiemPageName } from '../../../app/types'; import { appendSearch } from './helpers'; import { RedirectWrapper } from './redirect_wrapper'; diff --git a/x-pack/plugins/siem/public/components/link_to/redirect_to_network.tsx b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_network.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/link_to/redirect_to_network.tsx rename to x-pack/plugins/siem/public/common/components/link_to/redirect_to_network.tsx index 71925edd5c0864..d72bacf511faa9 100644 --- a/x-pack/plugins/siem/public/components/link_to/redirect_to_network.tsx +++ b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_network.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { RouteComponentProps } from 'react-router-dom'; -import { SiemPageName } from '../../pages/home/types'; -import { FlowTarget, FlowTargetSourceDest } from '../../graphql/types'; +import { SiemPageName } from '../../../app/types'; +import { FlowTarget, FlowTargetSourceDest } from '../../../graphql/types'; import { appendSearch } from './helpers'; import { RedirectWrapper } from './redirect_wrapper'; diff --git a/x-pack/plugins/siem/public/components/link_to/redirect_to_overview.tsx b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_overview.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/link_to/redirect_to_overview.tsx rename to x-pack/plugins/siem/public/common/components/link_to/redirect_to_overview.tsx index e0789ac9e2558b..2043b820e6966c 100644 --- a/x-pack/plugins/siem/public/components/link_to/redirect_to_overview.tsx +++ b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_overview.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { RouteComponentProps } from 'react-router-dom'; import { RedirectWrapper } from './redirect_wrapper'; -import { SiemPageName } from '../../pages/home/types'; +import { SiemPageName } from '../../../app/types'; export type OverviewComponentProps = RouteComponentProps<{ search: string; diff --git a/x-pack/plugins/siem/public/components/link_to/redirect_to_timelines.tsx b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_timelines.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/link_to/redirect_to_timelines.tsx rename to x-pack/plugins/siem/public/common/components/link_to/redirect_to_timelines.tsx index 9c704a7f70d293..3562153bea646e 100644 --- a/x-pack/plugins/siem/public/components/link_to/redirect_to_timelines.tsx +++ b/x-pack/plugins/siem/public/common/components/link_to/redirect_to_timelines.tsx @@ -7,11 +7,11 @@ import React from 'react'; import { RouteComponentProps } from 'react-router-dom'; -import { SiemPageName } from '../../pages/home/types'; +import { SiemPageName } from '../../../app/types'; import { appendSearch } from './helpers'; import { RedirectWrapper } from './redirect_wrapper'; -import { TimelineTypeLiteral, TimelineType } from '../../../common/types/timeline'; +import { TimelineTypeLiteral, TimelineType } from '../../../../common/types/timeline'; export type TimelineComponentProps = RouteComponentProps<{ tabName: TimelineTypeLiteral; diff --git a/x-pack/plugins/siem/public/components/link_to/redirect_wrapper.tsx b/x-pack/plugins/siem/public/common/components/link_to/redirect_wrapper.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/link_to/redirect_wrapper.tsx rename to x-pack/plugins/siem/public/common/components/link_to/redirect_wrapper.tsx diff --git a/x-pack/plugins/siem/public/components/links/index.test.tsx b/x-pack/plugins/siem/public/common/components/links/index.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/links/index.test.tsx rename to x-pack/plugins/siem/public/common/components/links/index.test.tsx index 214c0294f2cf42..9eff86bffb369a 100644 --- a/x-pack/plugins/siem/public/components/links/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/links/index.test.tsx @@ -24,7 +24,7 @@ import { ExternalLink, } from '.'; -jest.mock('../../pages/overview/events_by_dataset'); +jest.mock('../../../overview/components/events_by_dataset'); jest.mock('../../lib/kibana', () => { return { diff --git a/x-pack/plugins/siem/public/components/links/index.tsx b/x-pack/plugins/siem/public/common/components/links/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/links/index.tsx rename to x-pack/plugins/siem/public/common/components/links/index.tsx index 6d473f47217105..4d639ce2781b12 100644 --- a/x-pack/plugins/siem/public/components/links/index.tsx +++ b/x-pack/plugins/siem/public/common/components/links/index.tsx @@ -9,11 +9,11 @@ import React, { useMemo } from 'react'; import { isNil } from 'lodash/fp'; import styled from 'styled-components'; -import { IP_REPUTATION_LINKS_SETTING } from '../../../common/constants'; +import { IP_REPUTATION_LINKS_SETTING } from '../../../../common/constants'; import { DefaultFieldRendererOverflow, DEFAULT_MORE_MAX_HEIGHT, -} from '../field_renderers/field_renderers'; +} from '../../../timelines/components/field_renderers/field_renderers'; import { encodeIpv6 } from '../../lib/helpers'; import { getCaseDetailsUrl, @@ -21,11 +21,11 @@ import { getIPDetailsUrl, getCreateCaseUrl, } from '../link_to'; -import { FlowTarget, FlowTargetSourceDest } from '../../graphql/types'; +import { FlowTarget, FlowTargetSourceDest } from '../../../graphql/types'; import { useUiSetting$ } from '../../lib/kibana'; -import { isUrlInvalid } from '../../pages/detection_engine/rules/components/step_about_rule/helpers'; +import { isUrlInvalid } from '../../../alerts/components/rules/step_about_rule/helpers'; import { ExternalLinkIcon } from '../external_link_icon'; -import { navTabs } from '../../pages/home/home_navigations'; +import { navTabs } from '../../../app/home/home_navigations'; import { useGetUrlSearch } from '../navigation/use_get_url_search'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/links/translations.ts b/x-pack/plugins/siem/public/common/components/links/translations.ts similarity index 87% rename from x-pack/plugins/siem/public/components/links/translations.ts rename to x-pack/plugins/siem/public/common/components/links/translations.ts index bed867cd5bf504..fdc50361175776 100644 --- a/x-pack/plugins/siem/public/components/links/translations.ts +++ b/x-pack/plugins/siem/public/common/components/links/translations.ts @@ -6,7 +6,7 @@ import { i18n } from '@kbn/i18n'; -export * from '../page/network/ip_overview/translations'; +export * from '../../../network/components/ip_overview/translations'; export const CASE_DETAILS_LINK_ARIA = (detailName: string) => i18n.translate('xpack.siem.case.caseTable.caseDetailsLinkAria', { diff --git a/x-pack/plugins/siem/public/components/loader/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/loader/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/loader/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/loader/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/loader/index.test.tsx b/x-pack/plugins/siem/public/common/components/loader/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/loader/index.test.tsx rename to x-pack/plugins/siem/public/common/components/loader/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/loader/index.tsx b/x-pack/plugins/siem/public/common/components/loader/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/loader/index.tsx rename to x-pack/plugins/siem/public/common/components/loader/index.tsx diff --git a/x-pack/plugins/siem/public/components/localized_date_tooltip/index.test.tsx b/x-pack/plugins/siem/public/common/components/localized_date_tooltip/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/localized_date_tooltip/index.test.tsx rename to x-pack/plugins/siem/public/common/components/localized_date_tooltip/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/localized_date_tooltip/index.tsx b/x-pack/plugins/siem/public/common/components/localized_date_tooltip/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/localized_date_tooltip/index.tsx rename to x-pack/plugins/siem/public/common/components/localized_date_tooltip/index.tsx diff --git a/x-pack/plugins/siem/public/components/markdown/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/markdown/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/markdown/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/markdown/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/markdown/__snapshots__/markdown_hint.test.tsx.snap b/x-pack/plugins/siem/public/common/components/markdown/__snapshots__/markdown_hint.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/markdown/__snapshots__/markdown_hint.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/markdown/__snapshots__/markdown_hint.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/markdown/index.test.tsx b/x-pack/plugins/siem/public/common/components/markdown/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/markdown/index.test.tsx rename to x-pack/plugins/siem/public/common/components/markdown/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/markdown/index.tsx b/x-pack/plugins/siem/public/common/components/markdown/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/markdown/index.tsx rename to x-pack/plugins/siem/public/common/components/markdown/index.tsx diff --git a/x-pack/plugins/siem/public/components/markdown/markdown_hint.test.tsx b/x-pack/plugins/siem/public/common/components/markdown/markdown_hint.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/markdown/markdown_hint.test.tsx rename to x-pack/plugins/siem/public/common/components/markdown/markdown_hint.test.tsx diff --git a/x-pack/plugins/siem/public/components/markdown/markdown_hint.tsx b/x-pack/plugins/siem/public/common/components/markdown/markdown_hint.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/markdown/markdown_hint.tsx rename to x-pack/plugins/siem/public/common/components/markdown/markdown_hint.tsx diff --git a/x-pack/plugins/siem/public/components/markdown/translations.ts b/x-pack/plugins/siem/public/common/components/markdown/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/markdown/translations.ts rename to x-pack/plugins/siem/public/common/components/markdown/translations.ts diff --git a/x-pack/plugins/siem/public/components/markdown_editor/constants.ts b/x-pack/plugins/siem/public/common/components/markdown_editor/constants.ts similarity index 100% rename from x-pack/plugins/siem/public/components/markdown_editor/constants.ts rename to x-pack/plugins/siem/public/common/components/markdown_editor/constants.ts diff --git a/x-pack/plugins/siem/public/components/markdown_editor/form.tsx b/x-pack/plugins/siem/public/common/components/markdown_editor/form.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/markdown_editor/form.tsx rename to x-pack/plugins/siem/public/common/components/markdown_editor/form.tsx index 17c321b15418c9..2ed85b04fe3f6e 100644 --- a/x-pack/plugins/siem/public/components/markdown_editor/form.tsx +++ b/x-pack/plugins/siem/public/common/components/markdown_editor/form.tsx @@ -7,7 +7,7 @@ import { EuiFormRow } from '@elastic/eui'; import React, { useCallback } from 'react'; -import { FieldHook, getFieldValidityAndErrorMessage } from '../../shared_imports'; +import { FieldHook, getFieldValidityAndErrorMessage } from '../../../shared_imports'; import { CursorPosition, MarkdownEditor } from '.'; interface IMarkdownEditorForm { diff --git a/x-pack/plugins/siem/public/components/markdown_editor/index.tsx b/x-pack/plugins/siem/public/common/components/markdown_editor/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/markdown_editor/index.tsx rename to x-pack/plugins/siem/public/common/components/markdown_editor/index.tsx diff --git a/x-pack/plugins/siem/public/components/markdown_editor/translations.ts b/x-pack/plugins/siem/public/common/components/markdown_editor/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/markdown_editor/translations.ts rename to x-pack/plugins/siem/public/common/components/markdown_editor/translations.ts diff --git a/x-pack/plugins/siem/public/components/matrix_histogram/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/matrix_histogram/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/matrix_histogram/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/matrix_histogram/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/matrix_histogram/index.test.tsx b/x-pack/plugins/siem/public/common/components/matrix_histogram/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/matrix_histogram/index.test.tsx rename to x-pack/plugins/siem/public/common/components/matrix_histogram/index.test.tsx index 3b8a43a0f395a8..b45207ab47c7ad 100644 --- a/x-pack/plugins/siem/public/components/matrix_histogram/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/matrix_histogram/index.test.tsx @@ -11,7 +11,7 @@ import React from 'react'; import { MatrixHistogram } from '.'; import { useQuery } from '../../containers/matrix_histogram'; -import { HistogramType } from '../../graphql/types'; +import { HistogramType } from '../../../graphql/types'; jest.mock('../../lib/kibana'); jest.mock('./matrix_loader', () => { diff --git a/x-pack/plugins/siem/public/components/matrix_histogram/index.tsx b/x-pack/plugins/siem/public/common/components/matrix_histogram/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/matrix_histogram/index.tsx rename to x-pack/plugins/siem/public/common/components/matrix_histogram/index.tsx index ba3cb4f62af864..b2a9f915005f15 100644 --- a/x-pack/plugins/siem/public/components/matrix_histogram/index.tsx +++ b/x-pack/plugins/siem/public/common/components/matrix_histogram/index.tsx @@ -27,18 +27,20 @@ import { } from './types'; import { InspectButtonContainer } from '../inspect'; -import { State, inputsSelectors, hostsModel, networkModel } from '../../store'; +import { State, inputsSelectors } from '../../store'; +import { hostsModel } from '../../../hosts/store'; +import { networkModel } from '../../../network/store'; import { MatrixHistogramMappingTypes, GetTitle, GetSubTitle, } from '../../components/matrix_histogram/types'; -import { SetQuery } from '../../pages/hosts/navigation/types'; +import { SetQuery } from '../../../hosts/pages/navigation/types'; import { QueryTemplateProps } from '../../containers/query_template'; import { setAbsoluteRangeDatePicker } from '../../store/inputs/actions'; import { InputsModelId } from '../../store/inputs/constants'; -import { HistogramType } from '../../graphql/types'; +import { HistogramType } from '../../../graphql/types'; export interface OwnProps extends QueryTemplateProps { defaultStackByOption: MatrixHistogramOption; @@ -112,11 +114,11 @@ export const MatrixHistogramComponent: React.FC { diff --git a/x-pack/plugins/siem/public/components/matrix_histogram/utils.ts b/x-pack/plugins/siem/public/common/components/matrix_histogram/utils.ts similarity index 97% rename from x-pack/plugins/siem/public/components/matrix_histogram/utils.ts rename to x-pack/plugins/siem/public/common/components/matrix_histogram/utils.ts index d31eb1da15ea1f..45e9c54b2eff87 100644 --- a/x-pack/plugins/siem/public/components/matrix_histogram/utils.ts +++ b/x-pack/plugins/siem/public/common/components/matrix_histogram/utils.ts @@ -8,7 +8,7 @@ import { get, groupBy, map, toPairs } from 'lodash/fp'; import { UpdateDateRange, ChartSeriesData } from '../charts/common'; import { MatrixHistogramMappingTypes, BarchartConfigs } from './types'; -import { MatrixOverTimeHistogramData } from '../../graphql/types'; +import { MatrixOverTimeHistogramData } from '../../../graphql/types'; import { histogramDateTimeFormatter } from '../utils'; interface GetBarchartConfigsProps { diff --git a/x-pack/plugins/siem/public/components/ml/__snapshots__/entity_draggable.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml/__snapshots__/entity_draggable.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml/__snapshots__/entity_draggable.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml/__snapshots__/entity_draggable.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.tsx b/x-pack/plugins/siem/public/common/components/ml/anomaly/anomaly_table_provider.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/anomaly/anomaly_table_provider.tsx rename to x-pack/plugins/siem/public/common/components/ml/anomaly/anomaly_table_provider.tsx diff --git a/x-pack/plugins/siem/public/components/ml/anomaly/get_interval_from_anomalies.test.ts b/x-pack/plugins/siem/public/common/components/ml/anomaly/get_interval_from_anomalies.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/anomaly/get_interval_from_anomalies.test.ts rename to x-pack/plugins/siem/public/common/components/ml/anomaly/get_interval_from_anomalies.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/anomaly/get_interval_from_anomalies.ts b/x-pack/plugins/siem/public/common/components/ml/anomaly/get_interval_from_anomalies.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/anomaly/get_interval_from_anomalies.ts rename to x-pack/plugins/siem/public/common/components/ml/anomaly/get_interval_from_anomalies.ts diff --git a/x-pack/plugins/siem/public/components/ml/anomaly/translations.ts b/x-pack/plugins/siem/public/common/components/ml/anomaly/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/anomaly/translations.ts rename to x-pack/plugins/siem/public/common/components/ml/anomaly/translations.ts diff --git a/x-pack/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.test.ts b/x-pack/plugins/siem/public/common/components/ml/anomaly/use_anomalies_table_data.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.test.ts rename to x-pack/plugins/siem/public/common/components/ml/anomaly/use_anomalies_table_data.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts b/x-pack/plugins/siem/public/common/components/ml/anomaly/use_anomalies_table_data.ts similarity index 95% rename from x-pack/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts rename to x-pack/plugins/siem/public/common/components/ml/anomaly/use_anomalies_table_data.ts index 67efda67a20a32..51300d91450003 100644 --- a/x-pack/plugins/siem/public/components/ml/anomaly/use_anomalies_table_data.ts +++ b/x-pack/plugins/siem/public/common/components/ml/anomaly/use_anomalies_table_data.ts @@ -6,10 +6,10 @@ import { useState, useEffect } from 'react'; -import { DEFAULT_ANOMALY_SCORE } from '../../../../common/constants'; +import { DEFAULT_ANOMALY_SCORE } from '../../../../../common/constants'; import { anomaliesTableData } from '../api/anomalies_table_data'; import { InfluencerInput, Anomalies, CriteriaFields } from '../types'; -import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions'; import { useSiemJobs } from '../../ml_popover/hooks/use_siem_jobs'; import { useMlCapabilities } from '../../ml_popover/hooks/use_ml_capabilities'; import { useStateToaster, errorToToaster } from '../../toasters'; diff --git a/x-pack/plugins/siem/public/components/ml/api/anomalies_table_data.ts b/x-pack/plugins/siem/public/common/components/ml/api/anomalies_table_data.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/api/anomalies_table_data.ts rename to x-pack/plugins/siem/public/common/components/ml/api/anomalies_table_data.ts diff --git a/x-pack/plugins/siem/public/components/ml/api/errors.ts b/x-pack/plugins/siem/public/common/components/ml/api/errors.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/api/errors.ts rename to x-pack/plugins/siem/public/common/components/ml/api/errors.ts diff --git a/x-pack/plugins/siem/public/components/ml/api/get_ml_capabilities.ts b/x-pack/plugins/siem/public/common/components/ml/api/get_ml_capabilities.ts similarity index 92% rename from x-pack/plugins/siem/public/components/ml/api/get_ml_capabilities.ts rename to x-pack/plugins/siem/public/common/components/ml/api/get_ml_capabilities.ts index e6a792e779b0cc..32f6f888ab8d71 100644 --- a/x-pack/plugins/siem/public/components/ml/api/get_ml_capabilities.ts +++ b/x-pack/plugins/siem/public/common/components/ml/api/get_ml_capabilities.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { MlCapabilitiesResponse } from '../../../../../ml/public'; +import { MlCapabilitiesResponse } from '../../../../../../ml/public'; import { KibanaServices } from '../../../lib/kibana'; import { InfluencerInput } from '../types'; diff --git a/x-pack/plugins/siem/public/components/ml/api/throw_if_not_ok.test.ts b/x-pack/plugins/siem/public/common/components/ml/api/throw_if_not_ok.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/api/throw_if_not_ok.test.ts rename to x-pack/plugins/siem/public/common/components/ml/api/throw_if_not_ok.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/api/throw_if_not_ok.ts b/x-pack/plugins/siem/public/common/components/ml/api/throw_if_not_ok.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/api/throw_if_not_ok.ts rename to x-pack/plugins/siem/public/common/components/ml/api/throw_if_not_ok.ts diff --git a/x-pack/plugins/siem/public/components/ml/api/translations.ts b/x-pack/plugins/siem/public/common/components/ml/api/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/api/translations.ts rename to x-pack/plugins/siem/public/common/components/ml/api/translations.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/add_entities_to_kql.test.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/add_entities_to_kql.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/add_entities_to_kql.test.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/add_entities_to_kql.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/add_entities_to_kql.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/add_entities_to_kql.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/add_entities_to_kql.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/add_entities_to_kql.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/entity_helpers.test.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/entity_helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/entity_helpers.test.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/entity_helpers.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/entity_helpers.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/entity_helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/entity_helpers.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/entity_helpers.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx b/x-pack/plugins/siem/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx index b7c544273ae927..6ca723c50c6817 100644 --- a/x-pack/plugins/siem/public/components/ml/conditional_links/ml_host_conditional_container.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/conditional_links/ml_host_conditional_container.tsx @@ -11,10 +11,10 @@ import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom'; import { addEntitiesToKql } from './add_entities_to_kql'; import { replaceKQLParts } from './replace_kql_parts'; import { emptyEntity, multipleEntities, getMultipleEntities } from './entity_helpers'; -import { SiemPageName } from '../../../pages/home/types'; -import { HostsTableType } from '../../../store/hosts/model'; +import { SiemPageName } from '../../../../app/types'; +import { HostsTableType } from '../../../../hosts/store/model'; -import { url as urlUtils } from '../../../../../../../src/plugins/kibana_utils/public'; +import { url as urlUtils } from '../../../../../../../../src/plugins/kibana_utils/public'; interface QueryStringType { '?_g': string; diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx b/x-pack/plugins/siem/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx index 54773e3ab6dda7..05049cd9b4ea5e 100644 --- a/x-pack/plugins/siem/public/components/ml/conditional_links/ml_network_conditional_container.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/conditional_links/ml_network_conditional_container.tsx @@ -11,9 +11,9 @@ import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom'; import { addEntitiesToKql } from './add_entities_to_kql'; import { replaceKQLParts } from './replace_kql_parts'; import { emptyEntity, getMultipleEntities, multipleEntities } from './entity_helpers'; -import { SiemPageName } from '../../../pages/home/types'; +import { SiemPageName } from '../../../../app/types'; -import { url as urlUtils } from '../../../../../../../src/plugins/kibana_utils/public'; +import { url as urlUtils } from '../../../../../../../../src/plugins/kibana_utils/public'; interface QueryStringType { '?_g': string; diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/remove_kql_variables.test.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/remove_kql_variables.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/remove_kql_variables.test.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/remove_kql_variables.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/remove_kql_variables.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/remove_kql_variables.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/remove_kql_variables.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/remove_kql_variables.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/replace_kql_commas_with_or.test.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/replace_kql_commas_with_or.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/replace_kql_commas_with_or.test.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/replace_kql_commas_with_or.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/replace_kql_commas_with_or.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/replace_kql_commas_with_or.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/replace_kql_commas_with_or.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/replace_kql_commas_with_or.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/replace_kql_parts.test.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/replace_kql_parts.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/replace_kql_parts.test.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/replace_kql_parts.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/replace_kql_parts.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/replace_kql_parts.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/replace_kql_parts.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/replace_kql_parts.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/rison_helpers.test.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/rison_helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/rison_helpers.test.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/rison_helpers.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/conditional_links/rison_helpers.ts b/x-pack/plugins/siem/public/common/components/ml/conditional_links/rison_helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/conditional_links/rison_helpers.ts rename to x-pack/plugins/siem/public/common/components/ml/conditional_links/rison_helpers.ts diff --git a/x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_host_type.test.ts b/x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_host_type.test.ts similarity index 94% rename from x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_host_type.test.ts rename to x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_host_type.test.ts index d8e951adabbc9e..215df22f4a2558 100644 --- a/x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_host_type.test.ts +++ b/x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_host_type.test.ts @@ -5,7 +5,7 @@ */ import { getCriteriaFromHostType } from './get_criteria_from_host_type'; -import { HostsType } from '../../../store/hosts/model'; +import { HostsType } from '../../../../hosts/store/model'; describe('get_criteria_from_host_type', () => { test('returns host names from criteria if the host type is details', () => { diff --git a/x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_host_type.ts b/x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_host_type.ts similarity index 90% rename from x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_host_type.ts rename to x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_host_type.ts index 2667e3a089f41b..5988f0d1001b28 100644 --- a/x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_host_type.ts +++ b/x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_host_type.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { HostsType } from '../../../store/hosts/model'; +import { HostsType } from '../../../../hosts/store/model'; import { CriteriaFields } from '../types'; export const getCriteriaFromHostType = ( diff --git a/x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_network_type.test.ts b/x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_network_type.test.ts similarity index 92% rename from x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_network_type.test.ts rename to x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_network_type.test.ts index fe1cd77a611955..07bdee140a0cdd 100644 --- a/x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_network_type.test.ts +++ b/x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_network_type.test.ts @@ -5,8 +5,8 @@ */ import { getCriteriaFromNetworkType } from './get_criteria_from_network_type'; -import { NetworkType } from '../../../store/network/model'; -import { FlowTarget } from '../../../graphql/types'; +import { NetworkType } from '../../../../network/store/model'; +import { FlowTarget } from '../../../../graphql/types'; describe('get_criteria_from_network_type', () => { test('returns network names from criteria if the network type is details and it is source', () => { diff --git a/x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_network_type.ts b/x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_network_type.ts similarity index 86% rename from x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_network_type.ts rename to x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_network_type.ts index 75c7e580f93c04..d717edea97cce1 100644 --- a/x-pack/plugins/siem/public/components/ml/criteria/get_criteria_from_network_type.ts +++ b/x-pack/plugins/siem/public/common/components/ml/criteria/get_criteria_from_network_type.ts @@ -5,8 +5,8 @@ */ import { CriteriaFields } from '../types'; -import { NetworkType } from '../../../store/network/model'; -import { FlowTarget } from '../../../graphql/types'; +import { NetworkType } from '../../../../network/store/model'; +import { FlowTarget } from '../../../../graphql/types'; export const getCriteriaFromNetworkType = ( type: NetworkType, diff --git a/x-pack/plugins/siem/public/components/ml/criteria/host_to_criteria.test.ts b/x-pack/plugins/siem/public/common/components/ml/criteria/host_to_criteria.test.ts similarity index 95% rename from x-pack/plugins/siem/public/components/ml/criteria/host_to_criteria.test.ts rename to x-pack/plugins/siem/public/common/components/ml/criteria/host_to_criteria.test.ts index 8cc672ab4321cb..bdd107145516f3 100644 --- a/x-pack/plugins/siem/public/components/ml/criteria/host_to_criteria.test.ts +++ b/x-pack/plugins/siem/public/common/components/ml/criteria/host_to_criteria.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { HostItem } from '../../../graphql/types'; +import { HostItem } from '../../../../graphql/types'; import { CriteriaFields } from '../types'; import { hostToCriteria } from './host_to_criteria'; diff --git a/x-pack/plugins/siem/public/components/ml/criteria/host_to_criteria.ts b/x-pack/plugins/siem/public/common/components/ml/criteria/host_to_criteria.ts similarity index 91% rename from x-pack/plugins/siem/public/components/ml/criteria/host_to_criteria.ts rename to x-pack/plugins/siem/public/common/components/ml/criteria/host_to_criteria.ts index aeb5fa2646822a..f708bd43b8c9bf 100644 --- a/x-pack/plugins/siem/public/components/ml/criteria/host_to_criteria.ts +++ b/x-pack/plugins/siem/public/common/components/ml/criteria/host_to_criteria.ts @@ -5,7 +5,7 @@ */ import { CriteriaFields } from '../types'; -import { HostItem } from '../../../graphql/types'; +import { HostItem } from '../../../../graphql/types'; export const hostToCriteria = (hostItem: HostItem): CriteriaFields[] => { if (hostItem.host != null && hostItem.host.name != null) { diff --git a/x-pack/plugins/siem/public/components/ml/criteria/network_to_criteria.test.ts b/x-pack/plugins/siem/public/common/components/ml/criteria/network_to_criteria.test.ts similarity index 95% rename from x-pack/plugins/siem/public/components/ml/criteria/network_to_criteria.test.ts rename to x-pack/plugins/siem/public/common/components/ml/criteria/network_to_criteria.test.ts index d6abb4a42e80f6..6c0d2fc60a6264 100644 --- a/x-pack/plugins/siem/public/components/ml/criteria/network_to_criteria.test.ts +++ b/x-pack/plugins/siem/public/common/components/ml/criteria/network_to_criteria.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { FlowTarget } from '../../../graphql/types'; +import { FlowTarget } from '../../../../graphql/types'; import { CriteriaFields } from '../types'; import { networkToCriteria } from './network_to_criteria'; diff --git a/x-pack/plugins/siem/public/components/ml/criteria/network_to_criteria.ts b/x-pack/plugins/siem/public/common/components/ml/criteria/network_to_criteria.ts similarity index 91% rename from x-pack/plugins/siem/public/components/ml/criteria/network_to_criteria.ts rename to x-pack/plugins/siem/public/common/components/ml/criteria/network_to_criteria.ts index a859931d6e228f..de2cc35007e870 100644 --- a/x-pack/plugins/siem/public/components/ml/criteria/network_to_criteria.ts +++ b/x-pack/plugins/siem/public/common/components/ml/criteria/network_to_criteria.ts @@ -5,7 +5,7 @@ */ import { CriteriaFields } from '../types'; -import { FlowTarget } from '../../../graphql/types'; +import { FlowTarget } from '../../../../graphql/types'; export const networkToCriteria = (ip: string, flowTarget: FlowTarget): CriteriaFields[] => { if (flowTarget === FlowTarget.source) { diff --git a/x-pack/plugins/siem/public/components/ml/entity_draggable.test.tsx b/x-pack/plugins/siem/public/common/components/ml/entity_draggable.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/entity_draggable.test.tsx rename to x-pack/plugins/siem/public/common/components/ml/entity_draggable.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml/entity_draggable.tsx b/x-pack/plugins/siem/public/common/components/ml/entity_draggable.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/ml/entity_draggable.tsx rename to x-pack/plugins/siem/public/common/components/ml/entity_draggable.tsx index b0636b08a56346..9024aec17400c8 100644 --- a/x-pack/plugins/siem/public/components/ml/entity_draggable.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/entity_draggable.tsx @@ -6,8 +6,8 @@ import React from 'react'; import { DraggableWrapper, DragEffects } from '../drag_and_drop/draggable_wrapper'; -import { IS_OPERATOR } from '../timeline/data_providers/data_provider'; -import { Provider } from '../timeline/data_providers/provider'; +import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Provider } from '../../../timelines/components/timeline/data_providers/provider'; import { escapeDataProviderId } from '../drag_and_drop/helpers'; interface Props { diff --git a/x-pack/plugins/siem/public/components/ml/get_entries.test.ts b/x-pack/plugins/siem/public/common/components/ml/get_entries.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/get_entries.test.ts rename to x-pack/plugins/siem/public/common/components/ml/get_entries.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/get_entries.ts b/x-pack/plugins/siem/public/common/components/ml/get_entries.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/get_entries.ts rename to x-pack/plugins/siem/public/common/components/ml/get_entries.ts diff --git a/x-pack/plugins/siem/public/components/ml/influencers/__snapshots__/create_influencers.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml/influencers/__snapshots__/create_influencers.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml/influencers/__snapshots__/create_influencers.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml/influencers/__snapshots__/create_influencers.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx b/x-pack/plugins/siem/public/common/components/ml/influencers/create_influencers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/influencers/create_influencers.test.tsx rename to x-pack/plugins/siem/public/common/components/ml/influencers/create_influencers.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml/influencers/create_influencers.tsx b/x-pack/plugins/siem/public/common/components/ml/influencers/create_influencers.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/influencers/create_influencers.tsx rename to x-pack/plugins/siem/public/common/components/ml/influencers/create_influencers.tsx diff --git a/x-pack/plugins/siem/public/components/ml/influencers/get_host_name_from_influencers.test.ts b/x-pack/plugins/siem/public/common/components/ml/influencers/get_host_name_from_influencers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/influencers/get_host_name_from_influencers.test.ts rename to x-pack/plugins/siem/public/common/components/ml/influencers/get_host_name_from_influencers.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/influencers/get_host_name_from_influencers.ts b/x-pack/plugins/siem/public/common/components/ml/influencers/get_host_name_from_influencers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/influencers/get_host_name_from_influencers.ts rename to x-pack/plugins/siem/public/common/components/ml/influencers/get_host_name_from_influencers.ts diff --git a/x-pack/plugins/siem/public/components/ml/influencers/get_network_from_influencers.test.ts b/x-pack/plugins/siem/public/common/components/ml/influencers/get_network_from_influencers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/influencers/get_network_from_influencers.test.ts rename to x-pack/plugins/siem/public/common/components/ml/influencers/get_network_from_influencers.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/influencers/get_network_from_influencers.ts b/x-pack/plugins/siem/public/common/components/ml/influencers/get_network_from_influencers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/influencers/get_network_from_influencers.ts rename to x-pack/plugins/siem/public/common/components/ml/influencers/get_network_from_influencers.ts diff --git a/x-pack/plugins/siem/public/components/ml/influencers/host_to_influencers.test.ts b/x-pack/plugins/siem/public/common/components/ml/influencers/host_to_influencers.test.ts similarity index 95% rename from x-pack/plugins/siem/public/components/ml/influencers/host_to_influencers.test.ts rename to x-pack/plugins/siem/public/common/components/ml/influencers/host_to_influencers.test.ts index 47a1fd52e947f9..8e67168b6acd46 100644 --- a/x-pack/plugins/siem/public/components/ml/influencers/host_to_influencers.test.ts +++ b/x-pack/plugins/siem/public/common/components/ml/influencers/host_to_influencers.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { HostItem } from '../../../graphql/types'; +import { HostItem } from '../../../../graphql/types'; import { InfluencerInput } from '../types'; import { hostToInfluencers } from './host_to_influencers'; diff --git a/x-pack/plugins/siem/public/components/ml/influencers/host_to_influencers.ts b/x-pack/plugins/siem/public/common/components/ml/influencers/host_to_influencers.ts similarity index 92% rename from x-pack/plugins/siem/public/components/ml/influencers/host_to_influencers.ts rename to x-pack/plugins/siem/public/common/components/ml/influencers/host_to_influencers.ts index 69d1b6e26ac724..ae7698a1bac882 100644 --- a/x-pack/plugins/siem/public/components/ml/influencers/host_to_influencers.ts +++ b/x-pack/plugins/siem/public/common/components/ml/influencers/host_to_influencers.ts @@ -5,7 +5,7 @@ */ import { InfluencerInput } from '../types'; -import { HostItem } from '../../../graphql/types'; +import { HostItem } from '../../../../graphql/types'; export const hostToInfluencers = (hostItem: HostItem): InfluencerInput[] | null => { if (hostItem.host != null && hostItem.host.name != null) { diff --git a/x-pack/plugins/siem/public/components/ml/influencers/network_to_influencers.test.ts b/x-pack/plugins/siem/public/common/components/ml/influencers/network_to_influencers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/influencers/network_to_influencers.test.ts rename to x-pack/plugins/siem/public/common/components/ml/influencers/network_to_influencers.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/influencers/network_to_influencers.ts b/x-pack/plugins/siem/public/common/components/ml/influencers/network_to_influencers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/influencers/network_to_influencers.ts rename to x-pack/plugins/siem/public/common/components/ml/influencers/network_to_influencers.ts diff --git a/x-pack/plugins/siem/public/components/ml/links/create_explorer_link.test.ts b/x-pack/plugins/siem/public/common/components/ml/links/create_explorer_link.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/links/create_explorer_link.test.ts rename to x-pack/plugins/siem/public/common/components/ml/links/create_explorer_link.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/links/create_explorer_link.ts b/x-pack/plugins/siem/public/common/components/ml/links/create_explorer_link.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/links/create_explorer_link.ts rename to x-pack/plugins/siem/public/common/components/ml/links/create_explorer_link.ts diff --git a/x-pack/plugins/siem/public/components/ml/links/create_series_link.test.ts b/x-pack/plugins/siem/public/common/components/ml/links/create_series_link.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/links/create_series_link.test.ts rename to x-pack/plugins/siem/public/common/components/ml/links/create_series_link.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/links/create_series_link.ts b/x-pack/plugins/siem/public/common/components/ml/links/create_series_link.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/links/create_series_link.ts rename to x-pack/plugins/siem/public/common/components/ml/links/create_series_link.ts diff --git a/x-pack/plugins/siem/public/components/ml/mock.ts b/x-pack/plugins/siem/public/common/components/ml/mock.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/mock.ts rename to x-pack/plugins/siem/public/common/components/ml/mock.ts diff --git a/x-pack/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx b/x-pack/plugins/siem/public/common/components/ml/permissions/ml_capabilities_provider.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx rename to x-pack/plugins/siem/public/common/components/ml/permissions/ml_capabilities_provider.tsx index 9326c53b6064da..1d5c1b36e22af2 100644 --- a/x-pack/plugins/siem/public/components/ml/permissions/ml_capabilities_provider.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/permissions/ml_capabilities_provider.tsx @@ -6,8 +6,8 @@ import React, { useState, useEffect } from 'react'; -import { MlCapabilitiesResponse } from '../../../../../ml/public'; -import { emptyMlCapabilities } from '../../../../common/machine_learning/empty_ml_capabilities'; +import { MlCapabilitiesResponse } from '../../../../../../ml/public'; +import { emptyMlCapabilities } from '../../../../../common/machine_learning/empty_ml_capabilities'; import { getMlCapabilities } from '../api/get_ml_capabilities'; import { errorToToaster, useStateToaster } from '../../toasters'; diff --git a/x-pack/plugins/siem/public/components/ml/permissions/translations.ts b/x-pack/plugins/siem/public/common/components/ml/permissions/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/permissions/translations.ts rename to x-pack/plugins/siem/public/common/components/ml/permissions/translations.ts diff --git a/x-pack/plugins/siem/public/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml/score/__snapshots__/anomaly_scores.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml/score/__snapshots__/anomaly_scores.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/__snapshots__/anomaly_scores.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml/score/__snapshots__/anomaly_scores.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml/score/__snapshots__/create_descriptions_list.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml/score/__snapshots__/create_descriptions_list.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/__snapshots__/create_descriptions_list.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml/score/__snapshots__/create_descriptions_list.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml/score/__snapshots__/draggable_score.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml/score/__snapshots__/draggable_score.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/__snapshots__/draggable_score.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml/score/__snapshots__/draggable_score.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml/score/anomaly_score.test.tsx b/x-pack/plugins/siem/public/common/components/ml/score/anomaly_score.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/anomaly_score.test.tsx rename to x-pack/plugins/siem/public/common/components/ml/score/anomaly_score.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml/score/anomaly_score.tsx b/x-pack/plugins/siem/public/common/components/ml/score/anomaly_score.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/anomaly_score.tsx rename to x-pack/plugins/siem/public/common/components/ml/score/anomaly_score.tsx diff --git a/x-pack/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx b/x-pack/plugins/siem/public/common/components/ml/score/anomaly_scores.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/anomaly_scores.test.tsx rename to x-pack/plugins/siem/public/common/components/ml/score/anomaly_scores.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml/score/anomaly_scores.tsx b/x-pack/plugins/siem/public/common/components/ml/score/anomaly_scores.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/anomaly_scores.tsx rename to x-pack/plugins/siem/public/common/components/ml/score/anomaly_scores.tsx diff --git a/x-pack/plugins/siem/public/components/ml/score/create_description_list.tsx b/x-pack/plugins/siem/public/common/components/ml/score/create_description_list.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/ml/score/create_description_list.tsx rename to x-pack/plugins/siem/public/common/components/ml/score/create_description_list.tsx index e7615bf3b89ba8..0651bc5874860b 100644 --- a/x-pack/plugins/siem/public/components/ml/score/create_description_list.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/score/create_description_list.tsx @@ -8,7 +8,7 @@ import { EuiText, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic import React from 'react'; import styled from 'styled-components'; -import { DescriptionList } from '../../../../common/utility_types'; +import { DescriptionList } from '../../../../../common/utility_types'; import { Anomaly, NarrowDateRange } from '../types'; import { getScoreString } from './score_health'; import { PreferenceFormattedDate } from '../../formatted_date'; diff --git a/x-pack/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx b/x-pack/plugins/siem/public/common/components/ml/score/create_descriptions_list.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/create_descriptions_list.test.tsx rename to x-pack/plugins/siem/public/common/components/ml/score/create_descriptions_list.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml/score/create_entities_from_score.test.ts b/x-pack/plugins/siem/public/common/components/ml/score/create_entities_from_score.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/create_entities_from_score.test.ts rename to x-pack/plugins/siem/public/common/components/ml/score/create_entities_from_score.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/score/create_entities_from_score.ts b/x-pack/plugins/siem/public/common/components/ml/score/create_entities_from_score.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/create_entities_from_score.ts rename to x-pack/plugins/siem/public/common/components/ml/score/create_entities_from_score.ts diff --git a/x-pack/plugins/siem/public/components/ml/score/draggable_score.test.tsx b/x-pack/plugins/siem/public/common/components/ml/score/draggable_score.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/draggable_score.test.tsx rename to x-pack/plugins/siem/public/common/components/ml/score/draggable_score.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml/score/draggable_score.tsx b/x-pack/plugins/siem/public/common/components/ml/score/draggable_score.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/ml/score/draggable_score.tsx rename to x-pack/plugins/siem/public/common/components/ml/score/draggable_score.tsx index 732eaf4bc5e788..c849476f0c3db7 100644 --- a/x-pack/plugins/siem/public/components/ml/score/draggable_score.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/score/draggable_score.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { DraggableWrapper, DragEffects } from '../../drag_and_drop/draggable_wrapper'; import { Anomaly } from '../types'; -import { IS_OPERATOR } from '../../timeline/data_providers/data_provider'; -import { Provider } from '../../timeline/data_providers/provider'; +import { IS_OPERATOR } from '../../../../timelines/components/timeline/data_providers/data_provider'; +import { Provider } from '../../../../timelines/components/timeline/data_providers/provider'; import { Spacer } from '../../page'; import { getScoreString } from './score_health'; diff --git a/x-pack/plugins/siem/public/components/ml/score/get_score_string.test.ts b/x-pack/plugins/siem/public/common/components/ml/score/get_score_string.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/get_score_string.test.ts rename to x-pack/plugins/siem/public/common/components/ml/score/get_score_string.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/score/get_top_severity.test.ts b/x-pack/plugins/siem/public/common/components/ml/score/get_top_severity.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/get_top_severity.test.ts rename to x-pack/plugins/siem/public/common/components/ml/score/get_top_severity.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/score/get_top_severity.ts b/x-pack/plugins/siem/public/common/components/ml/score/get_top_severity.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/get_top_severity.ts rename to x-pack/plugins/siem/public/common/components/ml/score/get_top_severity.ts diff --git a/x-pack/plugins/siem/public/components/ml/score/score_health.tsx b/x-pack/plugins/siem/public/common/components/ml/score/score_health.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/score_health.tsx rename to x-pack/plugins/siem/public/common/components/ml/score/score_health.tsx diff --git a/x-pack/plugins/siem/public/components/ml/score/score_interval_to_datetime.test.ts b/x-pack/plugins/siem/public/common/components/ml/score/score_interval_to_datetime.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/score_interval_to_datetime.test.ts rename to x-pack/plugins/siem/public/common/components/ml/score/score_interval_to_datetime.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/score/score_interval_to_datetime.ts b/x-pack/plugins/siem/public/common/components/ml/score/score_interval_to_datetime.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/score_interval_to_datetime.ts rename to x-pack/plugins/siem/public/common/components/ml/score/score_interval_to_datetime.ts diff --git a/x-pack/plugins/siem/public/components/ml/score/translations.ts b/x-pack/plugins/siem/public/common/components/ml/score/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/score/translations.ts rename to x-pack/plugins/siem/public/common/components/ml/score/translations.ts diff --git a/x-pack/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx b/x-pack/plugins/siem/public/common/components/ml/tables/anomalies_host_table.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx rename to x-pack/plugins/siem/public/common/components/ml/tables/anomalies_host_table.tsx index 3272042732dff5..d6e343265b6e74 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/anomalies_host_table.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/tables/anomalies_host_table.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { useAnomaliesTableData } from '../anomaly/use_anomalies_table_data'; import { HeaderSection } from '../../header_section'; -import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions'; import * as i18n from './translations'; import { getAnomaliesHostTableColumnsCurated } from './get_anomalies_host_table_columns'; import { convertAnomaliesToHosts } from './convert_anomalies_to_hosts'; diff --git a/x-pack/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx b/x-pack/plugins/siem/public/common/components/ml/tables/anomalies_network_table.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx rename to x-pack/plugins/siem/public/common/components/ml/tables/anomalies_network_table.tsx index cc3b1196f8432f..c7a49202bf239c 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/anomalies_network_table.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/tables/anomalies_network_table.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { useAnomaliesTableData } from '../anomaly/use_anomalies_table_data'; import { HeaderSection } from '../../header_section'; -import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions'; import * as i18n from './translations'; import { convertAnomaliesToNetwork } from './convert_anomalies_to_network'; import { Loader } from '../../loader'; diff --git a/x-pack/plugins/siem/public/components/ml/tables/basic_table.tsx b/x-pack/plugins/siem/public/common/components/ml/tables/basic_table.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/basic_table.tsx rename to x-pack/plugins/siem/public/common/components/ml/tables/basic_table.tsx diff --git a/x-pack/plugins/siem/public/components/ml/tables/convert_anomalies_to_hosts.test.ts b/x-pack/plugins/siem/public/common/components/ml/tables/convert_anomalies_to_hosts.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/convert_anomalies_to_hosts.test.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/convert_anomalies_to_hosts.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/tables/convert_anomalies_to_hosts.ts b/x-pack/plugins/siem/public/common/components/ml/tables/convert_anomalies_to_hosts.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/convert_anomalies_to_hosts.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/convert_anomalies_to_hosts.ts diff --git a/x-pack/plugins/siem/public/components/ml/tables/convert_anomalies_to_network.test.ts b/x-pack/plugins/siem/public/common/components/ml/tables/convert_anomalies_to_network.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/convert_anomalies_to_network.test.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/convert_anomalies_to_network.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/tables/convert_anomalies_to_network.ts b/x-pack/plugins/siem/public/common/components/ml/tables/convert_anomalies_to_network.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/convert_anomalies_to_network.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/convert_anomalies_to_network.ts diff --git a/x-pack/plugins/siem/public/components/ml/tables/create_compound_key.test.ts b/x-pack/plugins/siem/public/common/components/ml/tables/create_compound_key.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/create_compound_key.test.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/create_compound_key.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/tables/create_compound_key.ts b/x-pack/plugins/siem/public/common/components/ml/tables/create_compound_key.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/create_compound_key.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/create_compound_key.ts diff --git a/x-pack/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.test.tsx b/x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_host_table_columns.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.test.tsx rename to x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_host_table_columns.test.tsx index 80980756d21305..ae9133f23c0b29 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.test.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_host_table_columns.test.tsx @@ -5,7 +5,7 @@ */ import { getAnomaliesHostTableColumnsCurated } from './get_anomalies_host_table_columns'; -import { HostsType } from '../../../store/hosts/model'; +import { HostsType } from '../../../../hosts/store/model'; import * as i18n from './translations'; import { AnomaliesByHost, Anomaly } from '../types'; import { Columns } from '../../paginated_table'; diff --git a/x-pack/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx b/x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_host_table_columns.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx rename to x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_host_table_columns.tsx index 4e6484c23613f1..4697eb1fbf86e0 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/get_anomalies_host_table_columns.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_host_table_columns.tsx @@ -19,7 +19,7 @@ import * as i18n from './translations'; import { getEntries } from '../get_entries'; import { DraggableScore } from '../score/draggable_score'; import { createExplorerLink } from '../links/create_explorer_link'; -import { HostsType } from '../../../store/hosts/model'; +import { HostsType } from '../../../../hosts/store/model'; import { escapeDataProviderId } from '../../drag_and_drop/helpers'; import { FormattedRelativePreferenceDate } from '../../formatted_date'; diff --git a/x-pack/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.test.tsx b/x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.test.tsx rename to x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx index 658444bfeda5c1..37cb99b33c793a 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.test.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_network_table_columns.test.tsx @@ -5,7 +5,7 @@ */ import { getAnomaliesNetworkTableColumnsCurated } from './get_anomalies_network_table_columns'; -import { NetworkType } from '../../../store/network/model'; +import { NetworkType } from '../../../../network/store/model'; import * as i18n from './translations'; import { AnomaliesByNetwork, Anomaly } from '../types'; import { Columns } from '../../paginated_table'; diff --git a/x-pack/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx b/x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_network_table_columns.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx rename to x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_network_table_columns.tsx index f6a493f80eb78f..f09a4d0779ac7a 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/get_anomalies_network_table_columns.tsx +++ b/x-pack/plugins/siem/public/common/components/ml/tables/get_anomalies_network_table_columns.tsx @@ -21,9 +21,9 @@ import { getEntries } from '../get_entries'; import { DraggableScore } from '../score/draggable_score'; import { createExplorerLink } from '../links/create_explorer_link'; import { FormattedRelativePreferenceDate } from '../../formatted_date'; -import { NetworkType } from '../../../store/network/model'; +import { NetworkType } from '../../../../network/store/model'; import { escapeDataProviderId } from '../../drag_and_drop/helpers'; -import { FlowTarget } from '../../../graphql/types'; +import { FlowTarget } from '../../../../graphql/types'; export const getAnomaliesNetworkTableColumns = ( startDate: number, diff --git a/x-pack/plugins/siem/public/components/ml/tables/host_equality.test.ts b/x-pack/plugins/siem/public/common/components/ml/tables/host_equality.test.ts similarity index 98% rename from x-pack/plugins/siem/public/components/ml/tables/host_equality.test.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/host_equality.test.ts index c5054d40f94ab0..89b87f95e5159d 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/host_equality.test.ts +++ b/x-pack/plugins/siem/public/common/components/ml/tables/host_equality.test.ts @@ -6,7 +6,7 @@ import { hostEquality } from './host_equality'; import { AnomaliesHostTableProps } from '../types'; -import { HostsType } from '../../../store/hosts/model'; +import { HostsType } from '../../../../hosts/store/model'; describe('host_equality', () => { test('it returns true if start and end date are equal', () => { diff --git a/x-pack/plugins/siem/public/components/ml/tables/host_equality.ts b/x-pack/plugins/siem/public/common/components/ml/tables/host_equality.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/host_equality.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/host_equality.ts diff --git a/x-pack/plugins/siem/public/components/ml/tables/network_equality.test.ts b/x-pack/plugins/siem/public/common/components/ml/tables/network_equality.test.ts similarity index 97% rename from x-pack/plugins/siem/public/components/ml/tables/network_equality.test.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/network_equality.test.ts index cb053d1a43d2f9..8b3e30c3290314 100644 --- a/x-pack/plugins/siem/public/components/ml/tables/network_equality.test.ts +++ b/x-pack/plugins/siem/public/common/components/ml/tables/network_equality.test.ts @@ -6,8 +6,8 @@ import { networkEquality } from './network_equality'; import { AnomaliesNetworkTableProps } from '../types'; -import { NetworkType } from '../../../store/network/model'; -import { FlowTarget } from '../../../graphql/types'; +import { NetworkType } from '../../../../network/store/model'; +import { FlowTarget } from '../../../../graphql/types'; describe('network_equality', () => { test('it returns true if start and end date are equal', () => { diff --git a/x-pack/plugins/siem/public/components/ml/tables/network_equality.ts b/x-pack/plugins/siem/public/common/components/ml/tables/network_equality.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/network_equality.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/network_equality.ts diff --git a/x-pack/plugins/siem/public/components/ml/tables/translations.ts b/x-pack/plugins/siem/public/common/components/ml/tables/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/tables/translations.ts rename to x-pack/plugins/siem/public/common/components/ml/tables/translations.ts diff --git a/x-pack/plugins/siem/public/components/ml/types.test.ts b/x-pack/plugins/siem/public/common/components/ml/types.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml/types.test.ts rename to x-pack/plugins/siem/public/common/components/ml/types.test.ts diff --git a/x-pack/plugins/siem/public/components/ml/types.ts b/x-pack/plugins/siem/public/common/components/ml/types.ts similarity index 91% rename from x-pack/plugins/siem/public/components/ml/types.ts rename to x-pack/plugins/siem/public/common/components/ml/types.ts index f70c7d3eb034c8..13bceaa473a84f 100644 --- a/x-pack/plugins/siem/public/components/ml/types.ts +++ b/x-pack/plugins/siem/public/common/components/ml/types.ts @@ -4,11 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Influencer } from '../../../../ml/public'; +import { Influencer } from '../../../../../ml/public'; -import { HostsType } from '../../store/hosts/model'; -import { NetworkType } from '../../store/network/model'; -import { FlowTarget } from '../../graphql/types'; +import { HostsType } from '../../../hosts/store/model'; +import { NetworkType } from '../../../network/store/model'; +import { FlowTarget } from '../../../graphql/types'; export interface Source { job_id: string; diff --git a/x-pack/plugins/siem/public/components/ml_popover/__mocks__/api.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/__mocks__/api.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/__mocks__/api.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/__mocks__/api.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/__snapshots__/popover_description.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml_popover/__snapshots__/popover_description.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/__snapshots__/popover_description.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml_popover/__snapshots__/popover_description.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml_popover/__snapshots__/upgrade_contents.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml_popover/__snapshots__/upgrade_contents.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/__snapshots__/upgrade_contents.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml_popover/__snapshots__/upgrade_contents.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml_popover/api.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/api.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/api.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/api.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/helpers.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/helpers.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/helpers.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/helpers.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/helpers.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/helpers.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/hooks/translations.ts b/x-pack/plugins/siem/public/common/components/ml_popover/hooks/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/hooks/translations.ts rename to x-pack/plugins/siem/public/common/components/ml_popover/hooks/translations.ts diff --git a/x-pack/plugins/siem/public/components/ml_popover/hooks/use_ml_capabilities.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/hooks/use_ml_capabilities.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/hooks/use_ml_capabilities.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/hooks/use_ml_capabilities.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/hooks/use_siem_jobs.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/hooks/use_siem_jobs.tsx index 98e74208b3dcc1..a84d88782926c3 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs.tsx +++ b/x-pack/plugins/siem/public/common/components/ml_popover/hooks/use_siem_jobs.tsx @@ -6,10 +6,10 @@ import { useEffect, useState } from 'react'; -import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../../common/constants'; import { checkRecognizer, getJobsSummary, getModules } from '../api'; import { SiemJob } from '../types'; -import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; +import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions'; import { errorToToaster, useStateToaster } from '../../toasters'; import { useUiSetting$ } from '../../../lib/kibana'; diff --git a/x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs_helpers.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/hooks/use_siem_jobs_helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs_helpers.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/hooks/use_siem_jobs_helpers.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs_helpers.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/hooks/use_siem_jobs_helpers.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/hooks/use_siem_jobs_helpers.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/hooks/use_siem_jobs_helpers.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/__snapshots__/job_switch.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/__snapshots__/job_switch.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/__snapshots__/job_switch.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/__snapshots__/job_switch.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/__snapshots__/jobs_table.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/__snapshots__/jobs_table.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/__snapshots__/jobs_table.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/__snapshots__/jobs_table.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/__snapshots__/showing_count.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/__snapshots__/showing_count.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/__snapshots__/showing_count.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/__snapshots__/showing_count.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/__snapshots__/groups_filter_popover.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/__snapshots__/groups_filter_popover.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/__snapshots__/groups_filter_popover.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/__snapshots__/groups_filter_popover.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/__snapshots__/jobs_table_filters.test.tsx.snap b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/__snapshots__/jobs_table_filters.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/__snapshots__/jobs_table_filters.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/__snapshots__/jobs_table_filters.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/groups_filter_popover.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/groups_filter_popover.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/groups_filter_popover.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/groups_filter_popover.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/jobs_table_filters.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx index 551ed5f08bd76e..8cb35fc6891858 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx +++ b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/jobs_table_filters.tsx @@ -14,7 +14,7 @@ import { // @ts-ignore no-exported-member EuiSearchBar, } from '@elastic/eui'; -import { EuiSearchBarQuery } from '../../../open_timeline/types'; +import { EuiSearchBarQuery } from '../../../../../timelines/components/open_timeline/types'; import * as i18n from './translations'; import { JobsFilters, SiemJob } from '../../types'; import { GroupsFilterPopover } from './groups_filter_popover'; diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/toggle_selected_group.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/toggle_selected_group.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/toggle_selected_group.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/toggle_selected_group.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/toggle_selected_group.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/toggle_selected_group.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/toggle_selected_group.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/toggle_selected_group.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/translations.ts b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/filters/translations.ts rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/filters/translations.ts diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/job_switch.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/job_switch.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/job_switch.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/job_switch.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/job_switch.tsx index 7de2f0fbfbc544..732f5cc062bf14 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/job_switch.tsx +++ b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/job_switch.tsx @@ -11,7 +11,7 @@ import { isJobLoading, isJobFailed, isJobStarted, -} from '../../../../common/machine_learning/helpers'; +} from '../../../../../common/machine_learning/helpers'; import { SiemJob } from '../types'; const StaticSwitch = styled(EuiSwitch)` diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/jobs_table.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/jobs_table.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/jobs_table.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/jobs_table.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/jobs_table.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/showing_count.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/showing_count.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/showing_count.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/showing_count.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/showing_count.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/showing_count.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/showing_count.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/jobs_table/translations.ts b/x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/jobs_table/translations.ts rename to x-pack/plugins/siem/public/common/components/ml_popover/jobs_table/translations.ts diff --git a/x-pack/plugins/siem/public/components/ml_popover/ml_modules.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/ml_modules.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/ml_modules.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/ml_modules.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/ml_popover.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/ml_popover.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/ml_popover.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/ml_popover.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/ml_popover.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/ml_popover.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/ml_popover/ml_popover.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/ml_popover.tsx index e7f7770ee87f80..292b5286e9f3e9 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/ml_popover.tsx +++ b/x-pack/plugins/siem/public/common/components/ml_popover/ml_popover.tsx @@ -12,7 +12,7 @@ import styled from 'styled-components'; import { useKibana } from '../../lib/kibana'; import { METRIC_TYPE, TELEMETRY_EVENT, track } from '../../lib/telemetry'; -import { hasMlAdminPermissions } from '../../../common/machine_learning/has_ml_admin_permissions'; +import { hasMlAdminPermissions } from '../../../../common/machine_learning/has_ml_admin_permissions'; import { errorToToaster, useStateToaster, ActionToaster } from '../toasters'; import { setupMlJob, startDatafeeds, stopDatafeeds } from './api'; import { filterJobs } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/ml_popover/popover_description.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/popover_description.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/popover_description.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/popover_description.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/popover_description.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/popover_description.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/popover_description.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/popover_description.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/translations.ts b/x-pack/plugins/siem/public/common/components/ml_popover/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/translations.ts rename to x-pack/plugins/siem/public/common/components/ml_popover/translations.ts diff --git a/x-pack/plugins/siem/public/components/ml_popover/types.ts b/x-pack/plugins/siem/public/common/components/ml_popover/types.ts similarity index 98% rename from x-pack/plugins/siem/public/components/ml_popover/types.ts rename to x-pack/plugins/siem/public/common/components/ml_popover/types.ts index 005f93650a8eb0..f39daa0b9a7fbe 100644 --- a/x-pack/plugins/siem/public/components/ml_popover/types.ts +++ b/x-pack/plugins/siem/public/common/components/ml_popover/types.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { AuditMessageBase } from '../../../../ml/public'; +import { AuditMessageBase } from '../../../../../ml/public'; import { MlError } from '../ml/types'; export interface Group { diff --git a/x-pack/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/upgrade_contents.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/upgrade_contents.test.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/upgrade_contents.test.tsx diff --git a/x-pack/plugins/siem/public/components/ml_popover/upgrade_contents.tsx b/x-pack/plugins/siem/public/common/components/ml_popover/upgrade_contents.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/ml_popover/upgrade_contents.tsx rename to x-pack/plugins/siem/public/common/components/ml_popover/upgrade_contents.tsx diff --git a/x-pack/plugins/siem/public/components/navigation/breadcrumbs/index.test.ts b/x-pack/plugins/siem/public/common/components/navigation/breadcrumbs/index.test.ts similarity index 98% rename from x-pack/plugins/siem/public/components/navigation/breadcrumbs/index.test.ts rename to x-pack/plugins/siem/public/common/components/navigation/breadcrumbs/index.test.ts index 2acae92c390dde..9ec2542c52db23 100644 --- a/x-pack/plugins/siem/public/components/navigation/breadcrumbs/index.test.ts +++ b/x-pack/plugins/siem/public/common/components/navigation/breadcrumbs/index.test.ts @@ -7,10 +7,10 @@ import '../../../mock/match_media'; import { encodeIpv6 } from '../../../lib/helpers'; import { getBreadcrumbsForRoute, setBreadcrumbs } from '.'; -import { HostsTableType } from '../../../store/hosts/model'; +import { HostsTableType } from '../../../../hosts/store/model'; import { RouteSpyState, SiemRouteType } from '../../../utils/route/types'; import { TabNavigationProps } from '../tab_navigation/types'; -import { NetworkRouteType } from '../../../pages/network/navigation/types'; +import { NetworkRouteType } from '../../../../network/pages/navigation/types'; const setBreadcrumbsMock = jest.fn(); const chromeMock = { diff --git a/x-pack/plugins/siem/public/components/navigation/breadcrumbs/index.ts b/x-pack/plugins/siem/public/common/components/navigation/breadcrumbs/index.ts similarity index 91% rename from x-pack/plugins/siem/public/components/navigation/breadcrumbs/index.ts rename to x-pack/plugins/siem/public/common/components/navigation/breadcrumbs/index.ts index 8abc099ee7f693..16ae1b1e096ca8 100644 --- a/x-pack/plugins/siem/public/components/navigation/breadcrumbs/index.ts +++ b/x-pack/plugins/siem/public/common/components/navigation/breadcrumbs/index.ts @@ -6,15 +6,16 @@ import { getOr, omit } from 'lodash/fp'; -import { ChromeBreadcrumb } from '../../../../../../../src/core/public'; -import { APP_NAME } from '../../../../common/constants'; -import { StartServices } from '../../../plugin'; -import { getBreadcrumbs as getHostDetailsBreadcrumbs } from '../../../pages/hosts/details/utils'; -import { getBreadcrumbs as getIPDetailsBreadcrumbs } from '../../../pages/network/ip_details'; -import { getBreadcrumbs as getCaseDetailsBreadcrumbs } from '../../../pages/case/utils'; -import { getBreadcrumbs as getDetectionRulesBreadcrumbs } from '../../../pages/detection_engine/rules/utils'; -import { getBreadcrumbs as getTimelinesBreadcrumbs } from '../../../pages/timelines'; -import { SiemPageName } from '../../../pages/home/types'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import { ChromeBreadcrumb } from '../../../../../../../../src/core/public'; +import { APP_NAME } from '../../../../../common/constants'; +import { StartServices } from '../../../../plugin'; +import { getBreadcrumbs as getHostDetailsBreadcrumbs } from '../../../../hosts/pages/details/utils'; +import { getBreadcrumbs as getIPDetailsBreadcrumbs } from '../../../../network/pages/ip_details'; +import { getBreadcrumbs as getCaseDetailsBreadcrumbs } from '../../../../cases/pages/utils'; +import { getBreadcrumbs as getDetectionRulesBreadcrumbs } from '../../../../alerts/pages/detection_engine/rules/utils'; +import { getBreadcrumbs as getTimelinesBreadcrumbs } from '../../../../timelines/pages'; +import { SiemPageName } from '../../../../app/types'; import { RouteSpyState, HostRouteSpyState, diff --git a/x-pack/plugins/siem/public/components/navigation/helpers.ts b/x-pack/plugins/siem/public/common/components/navigation/helpers.ts similarity index 93% rename from x-pack/plugins/siem/public/components/navigation/helpers.ts rename to x-pack/plugins/siem/public/common/components/navigation/helpers.ts index 291cb90098f78e..8f5a3ac63fa1ad 100644 --- a/x-pack/plugins/siem/public/components/navigation/helpers.ts +++ b/x-pack/plugins/siem/public/common/components/navigation/helpers.ts @@ -8,7 +8,7 @@ import { isEmpty } from 'lodash/fp'; import { Location } from 'history'; import { UrlInputsModel } from '../../store/inputs/model'; -import { TimelineUrl } from '../../store/timeline/model'; +import { TimelineUrl } from '../../../timelines/store/timeline/model'; import { CONSTANTS } from '../url_state/constants'; import { URL_STATE_KEYS, KeyUrlState, UrlState } from '../url_state/types'; import { @@ -16,7 +16,7 @@ import { replaceStateKeyInQueryString, getQueryStringFromLocation, } from '../url_state/helpers'; -import { Query, Filter } from '../../../../../../src/plugins/data/public'; +import { Query, Filter } from '../../../../../../../src/plugins/data/public'; import { SearchNavTab } from './types'; diff --git a/x-pack/plugins/siem/public/components/navigation/index.test.tsx b/x-pack/plugins/siem/public/common/components/navigation/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/navigation/index.test.tsx rename to x-pack/plugins/siem/public/common/components/navigation/index.test.tsx index d8b62029138c82..ff3f9ba0694a9c 100644 --- a/x-pack/plugins/siem/public/components/navigation/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/navigation/index.test.tsx @@ -10,8 +10,8 @@ import React from 'react'; import { CONSTANTS } from '../url_state/constants'; import { SiemNavigationComponent } from './'; import { setBreadcrumbs } from './breadcrumbs'; -import { navTabs } from '../../pages/home/home_navigations'; -import { HostsTableType } from '../../store/hosts/model'; +import { navTabs } from '../../../app/home/home_navigations'; +import { HostsTableType } from '../../../hosts/store/model'; import { RouteSpyState } from '../../utils/route/types'; import { SiemNavigationProps, SiemNavigationComponentProps } from './types'; diff --git a/x-pack/plugins/siem/public/components/navigation/index.tsx b/x-pack/plugins/siem/public/common/components/navigation/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/navigation/index.tsx rename to x-pack/plugins/siem/public/common/components/navigation/index.tsx diff --git a/x-pack/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx b/x-pack/plugins/siem/public/common/components/navigation/tab_navigation/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx rename to x-pack/plugins/siem/public/common/components/navigation/tab_navigation/index.test.tsx index 99ded06cfdcc86..b9572caece94fa 100644 --- a/x-pack/plugins/siem/public/components/navigation/tab_navigation/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/navigation/tab_navigation/index.test.tsx @@ -7,10 +7,10 @@ import { mount } from 'enzyme'; import React from 'react'; -import { navTabs } from '../../../pages/home/home_navigations'; -import { SiemPageName } from '../../../pages/home/types'; -import { navTabsHostDetails } from '../../../pages/hosts/details/nav_tabs'; -import { HostsTableType } from '../../../store/hosts/model'; +import { navTabs } from '../../../../app/home/home_navigations'; +import { SiemPageName } from '../../../../app/types'; +import { navTabsHostDetails } from '../../../../hosts/pages/details/nav_tabs'; +import { HostsTableType } from '../../../../hosts/store/model'; import { RouteSpyState } from '../../../utils/route/types'; import { CONSTANTS } from '../../url_state/constants'; import { TabNavigationComponent } from './'; diff --git a/x-pack/plugins/siem/public/components/navigation/tab_navigation/index.tsx b/x-pack/plugins/siem/public/common/components/navigation/tab_navigation/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/navigation/tab_navigation/index.tsx rename to x-pack/plugins/siem/public/common/components/navigation/tab_navigation/index.tsx diff --git a/x-pack/plugins/siem/public/components/navigation/tab_navigation/types.ts b/x-pack/plugins/siem/public/common/components/navigation/tab_navigation/types.ts similarity index 80% rename from x-pack/plugins/siem/public/components/navigation/tab_navigation/types.ts rename to x-pack/plugins/siem/public/common/components/navigation/tab_navigation/types.ts index 2e2dea09f8c38b..a283691cfe0df4 100644 --- a/x-pack/plugins/siem/public/components/navigation/tab_navigation/types.ts +++ b/x-pack/plugins/siem/public/common/components/navigation/tab_navigation/types.ts @@ -6,9 +6,9 @@ import { UrlInputsModel } from '../../../store/inputs/model'; import { CONSTANTS } from '../../url_state/constants'; -import { HostsTableType } from '../../../store/hosts/model'; -import { TimelineUrl } from '../../../store/timeline/model'; -import { Filter, Query } from '../../../../../../../src/plugins/data/public'; +import { HostsTableType } from '../../../../hosts/store/model'; +import { TimelineUrl } from '../../../../timelines/store/timeline/model'; +import { Filter, Query } from '../../../../../../../../src/plugins/data/public'; import { SiemNavigationProps } from '../types'; diff --git a/x-pack/plugins/siem/public/components/navigation/types.ts b/x-pack/plugins/siem/public/common/components/navigation/types.ts similarity index 83% rename from x-pack/plugins/siem/public/components/navigation/types.ts rename to x-pack/plugins/siem/public/common/components/navigation/types.ts index e8a2865938062b..f0256813c29e78 100644 --- a/x-pack/plugins/siem/public/components/navigation/types.ts +++ b/x-pack/plugins/siem/public/common/components/navigation/types.ts @@ -4,10 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Filter, Query } from '../../../../../../src/plugins/data/public'; -import { HostsTableType } from '../../store/hosts/model'; +import { Filter, Query } from '../../../../../../../src/plugins/data/public'; +import { HostsTableType } from '../../../hosts/store/model'; import { UrlInputsModel } from '../../store/inputs/model'; -import { TimelineUrl } from '../../store/timeline/model'; +import { TimelineUrl } from '../../../timelines/store/timeline/model'; import { CONSTANTS, UrlStateType } from '../url_state/constants'; export interface SiemNavigationProps { diff --git a/x-pack/plugins/siem/public/components/navigation/use_get_url_search.tsx b/x-pack/plugins/siem/public/common/components/navigation/use_get_url_search.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/navigation/use_get_url_search.tsx rename to x-pack/plugins/siem/public/common/components/navigation/use_get_url_search.tsx diff --git a/x-pack/plugins/siem/public/components/news_feed/helpers.test.ts b/x-pack/plugins/siem/public/common/components/news_feed/helpers.test.ts similarity index 99% rename from x-pack/plugins/siem/public/components/news_feed/helpers.test.ts rename to x-pack/plugins/siem/public/common/components/news_feed/helpers.test.ts index 96bd9b08bf8bf0..cdd04b50a6d506 100644 --- a/x-pack/plugins/siem/public/components/news_feed/helpers.test.ts +++ b/x-pack/plugins/siem/public/common/components/news_feed/helpers.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { NEWS_FEED_URL_SETTING_DEFAULT } from '../../../common/constants'; +import { NEWS_FEED_URL_SETTING_DEFAULT } from '../../../../common/constants'; import { KibanaServices } from '../../lib/kibana'; import { rawNewsApiResponse } from '../../mock/news'; import { rawNewsJSON } from '../../mock/raw_news'; diff --git a/x-pack/plugins/siem/public/components/news_feed/helpers.ts b/x-pack/plugins/siem/public/common/components/news_feed/helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/news_feed/helpers.ts rename to x-pack/plugins/siem/public/common/components/news_feed/helpers.ts diff --git a/x-pack/plugins/siem/public/components/news_feed/index.tsx b/x-pack/plugins/siem/public/common/components/news_feed/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/news_feed/index.tsx rename to x-pack/plugins/siem/public/common/components/news_feed/index.tsx diff --git a/x-pack/plugins/siem/public/components/news_feed/news_feed.tsx b/x-pack/plugins/siem/public/common/components/news_feed/news_feed.tsx similarity index 86% rename from x-pack/plugins/siem/public/components/news_feed/news_feed.tsx rename to x-pack/plugins/siem/public/common/components/news_feed/news_feed.tsx index cd356212b44006..523273d1caf2e7 100644 --- a/x-pack/plugins/siem/public/components/news_feed/news_feed.tsx +++ b/x-pack/plugins/siem/public/common/components/news_feed/news_feed.tsx @@ -6,8 +6,8 @@ import React from 'react'; -import { LoadingPlaceholders } from '../page/overview/loading_placeholders'; -import { NEWS_FEED_TITLE } from '../../pages/overview/translations'; +import { LoadingPlaceholders } from '../../../overview/components/loading_placeholders'; +import { NEWS_FEED_TITLE } from '../../../overview/pages/translations'; import { SidebarHeader } from '../sidebar_header'; import { NoNews } from './no_news'; diff --git a/x-pack/plugins/siem/public/components/news_feed/news_link/index.tsx b/x-pack/plugins/siem/public/common/components/news_feed/news_link/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/news_feed/news_link/index.tsx rename to x-pack/plugins/siem/public/common/components/news_feed/news_link/index.tsx diff --git a/x-pack/plugins/siem/public/components/news_feed/no_news/index.tsx b/x-pack/plugins/siem/public/common/components/news_feed/no_news/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/news_feed/no_news/index.tsx rename to x-pack/plugins/siem/public/common/components/news_feed/no_news/index.tsx diff --git a/x-pack/plugins/siem/public/components/news_feed/post/index.tsx b/x-pack/plugins/siem/public/common/components/news_feed/post/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/news_feed/post/index.tsx rename to x-pack/plugins/siem/public/common/components/news_feed/post/index.tsx diff --git a/x-pack/plugins/siem/public/components/news_feed/translations.ts b/x-pack/plugins/siem/public/common/components/news_feed/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/news_feed/translations.ts rename to x-pack/plugins/siem/public/common/components/news_feed/translations.ts diff --git a/x-pack/plugins/siem/public/components/news_feed/types.ts b/x-pack/plugins/siem/public/common/components/news_feed/types.ts similarity index 100% rename from x-pack/plugins/siem/public/components/news_feed/types.ts rename to x-pack/plugins/siem/public/common/components/news_feed/types.ts diff --git a/x-pack/plugins/siem/public/components/page/index.tsx b/x-pack/plugins/siem/public/common/components/page/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/page/index.tsx rename to x-pack/plugins/siem/public/common/components/page/index.tsx diff --git a/x-pack/plugins/siem/public/components/page/manage_query.tsx b/x-pack/plugins/siem/public/common/components/page/manage_query.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/page/manage_query.tsx rename to x-pack/plugins/siem/public/common/components/page/manage_query.tsx index 3b723c66f5af57..9e78f704b0f054 100644 --- a/x-pack/plugins/siem/public/components/page/manage_query.tsx +++ b/x-pack/plugins/siem/public/common/components/page/manage_query.tsx @@ -9,7 +9,7 @@ import { omit } from 'lodash/fp'; import React from 'react'; import { inputsModel } from '../../store'; -import { SetQuery } from '../../pages/hosts/navigation/types'; +import { SetQuery } from '../../../hosts/pages/navigation/types'; interface OwnProps { deleteQuery?: ({ id }: { id: string }) => void; diff --git a/x-pack/plugins/siem/public/components/page/translations.ts b/x-pack/plugins/siem/public/common/components/page/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/translations.ts rename to x-pack/plugins/siem/public/common/components/page/translations.ts diff --git a/x-pack/plugins/siem/public/components/page_route/index.tsx b/x-pack/plugins/siem/public/common/components/page_route/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/page_route/index.tsx rename to x-pack/plugins/siem/public/common/components/page_route/index.tsx diff --git a/x-pack/plugins/siem/public/components/page_route/pageroute.test.tsx b/x-pack/plugins/siem/public/common/components/page_route/pageroute.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/page_route/pageroute.test.tsx rename to x-pack/plugins/siem/public/common/components/page_route/pageroute.test.tsx diff --git a/x-pack/plugins/siem/public/components/page_route/pageroute.tsx b/x-pack/plugins/siem/public/common/components/page_route/pageroute.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/page_route/pageroute.tsx rename to x-pack/plugins/siem/public/common/components/page_route/pageroute.tsx diff --git a/x-pack/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/paginated_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/paginated_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/paginated_table/helpers.test.ts b/x-pack/plugins/siem/public/common/components/paginated_table/helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/paginated_table/helpers.test.ts rename to x-pack/plugins/siem/public/common/components/paginated_table/helpers.test.ts diff --git a/x-pack/plugins/siem/public/components/paginated_table/helpers.ts b/x-pack/plugins/siem/public/common/components/paginated_table/helpers.ts similarity index 89% rename from x-pack/plugins/siem/public/components/paginated_table/helpers.ts rename to x-pack/plugins/siem/public/common/components/paginated_table/helpers.ts index c63b8699e79eef..8fde81adc922a7 100644 --- a/x-pack/plugins/siem/public/components/paginated_table/helpers.ts +++ b/x-pack/plugins/siem/public/common/components/paginated_table/helpers.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { PaginationInputPaginated } from '../../graphql/types'; +import { PaginationInputPaginated } from '../../../graphql/types'; export const generateTablePaginationOptions = ( activePage: number, diff --git a/x-pack/plugins/siem/public/components/paginated_table/index.mock.tsx b/x-pack/plugins/siem/public/common/components/paginated_table/index.mock.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/paginated_table/index.mock.tsx rename to x-pack/plugins/siem/public/common/components/paginated_table/index.mock.tsx diff --git a/x-pack/plugins/siem/public/components/paginated_table/index.test.tsx b/x-pack/plugins/siem/public/common/components/paginated_table/index.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/paginated_table/index.test.tsx rename to x-pack/plugins/siem/public/common/components/paginated_table/index.test.tsx index 94dac6607ce217..108ae19b5a2b47 100644 --- a/x-pack/plugins/siem/public/components/paginated_table/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/paginated_table/index.test.tsx @@ -7,8 +7,8 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../common/constants'; -import { Direction } from '../../graphql/types'; +import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../common/constants'; +import { Direction } from '../../../graphql/types'; import { BasicTableProps, PaginatedTable } from './index'; import { getHostsColumns, mockData, rowItems, sortedHosts } from './index.mock'; diff --git a/x-pack/plugins/siem/public/components/paginated_table/index.tsx b/x-pack/plugins/siem/public/common/components/paginated_table/index.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/paginated_table/index.tsx rename to x-pack/plugins/siem/public/common/components/paginated_table/index.tsx index a815ecd1005180..3b3130af77cfd7 100644 --- a/x-pack/plugins/siem/public/components/paginated_table/index.tsx +++ b/x-pack/plugins/siem/public/common/components/paginated_table/index.tsx @@ -22,22 +22,22 @@ import { noop } from 'lodash/fp'; import React, { FC, memo, useState, useEffect, ComponentType } from 'react'; import styled from 'styled-components'; -import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../common/constants'; -import { AuthTableColumns } from '../page/hosts/authentications_table'; -import { HostsTableColumns } from '../page/hosts/hosts_table'; -import { NetworkDnsColumns } from '../page/network/network_dns_table/columns'; -import { NetworkHttpColumns } from '../page/network/network_http_table/columns'; +import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../common/constants'; +import { AuthTableColumns } from '../../../hosts/components/authentications_table'; +import { HostsTableColumns } from '../../../hosts/components/hosts_table'; +import { NetworkDnsColumns } from '../../../network/components/network_dns_table/columns'; +import { NetworkHttpColumns } from '../../../network/components/network_http_table/columns'; import { NetworkTopNFlowColumns, NetworkTopNFlowColumnsIpDetails, -} from '../page/network/network_top_n_flow_table/columns'; +} from '../../../network/components/network_top_n_flow_table/columns'; import { NetworkTopCountriesColumns, NetworkTopCountriesColumnsIpDetails, -} from '../page/network/network_top_countries_table/columns'; -import { TlsColumns } from '../page/network/tls_table/columns'; -import { UncommonProcessTableColumns } from '../page/hosts/uncommon_process_table'; -import { UsersColumns } from '../page/network/users_table/columns'; +} from '../../../network/components/network_top_countries_table/columns'; +import { TlsColumns } from '../../../network/components/tls_table/columns'; +import { UncommonProcessTableColumns } from '../../../hosts/components/uncommon_process_table'; +import { UsersColumns } from '../../../network/components/users_table/columns'; import { HeaderSection } from '../header_section'; import { Loader } from '../loader'; import { useStateToaster } from '../toasters'; diff --git a/x-pack/plugins/siem/public/components/paginated_table/translations.ts b/x-pack/plugins/siem/public/common/components/paginated_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/paginated_table/translations.ts rename to x-pack/plugins/siem/public/common/components/paginated_table/translations.ts diff --git a/x-pack/plugins/siem/public/components/panel/index.test.tsx b/x-pack/plugins/siem/public/common/components/panel/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/panel/index.test.tsx rename to x-pack/plugins/siem/public/common/components/panel/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/panel/index.tsx b/x-pack/plugins/siem/public/common/components/panel/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/panel/index.tsx rename to x-pack/plugins/siem/public/common/components/panel/index.tsx diff --git a/x-pack/plugins/siem/public/components/progress_inline/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/progress_inline/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/progress_inline/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/progress_inline/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/progress_inline/index.test.tsx b/x-pack/plugins/siem/public/common/components/progress_inline/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/progress_inline/index.test.tsx rename to x-pack/plugins/siem/public/common/components/progress_inline/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/progress_inline/index.tsx b/x-pack/plugins/siem/public/common/components/progress_inline/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/progress_inline/index.tsx rename to x-pack/plugins/siem/public/common/components/progress_inline/index.tsx diff --git a/x-pack/plugins/siem/public/components/query_bar/index.test.tsx b/x-pack/plugins/siem/public/common/components/query_bar/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/query_bar/index.test.tsx rename to x-pack/plugins/siem/public/common/components/query_bar/index.test.tsx index e27669b2b15be2..74c07640b83286 100644 --- a/x-pack/plugins/siem/public/components/query_bar/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/query_bar/index.test.tsx @@ -7,10 +7,10 @@ import { mount } from 'enzyme'; import React from 'react'; -import { DEFAULT_FROM, DEFAULT_TO } from '../../../common/constants'; +import { DEFAULT_FROM, DEFAULT_TO } from '../../../../common/constants'; import { TestProviders, mockIndexPattern } from '../../mock'; import { createKibanaCoreStartMock } from '../../mock/kibana_core'; -import { FilterManager, SearchBar } from '../../../../../../src/plugins/data/public'; +import { FilterManager, SearchBar } from '../../../../../../../src/plugins/data/public'; import { QueryBar, QueryBarComponentProps } from '.'; import { createKibanaContextProviderMock } from '../../mock/kibana_react'; diff --git a/x-pack/plugins/siem/public/components/query_bar/index.tsx b/x-pack/plugins/siem/public/common/components/query_bar/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/query_bar/index.tsx rename to x-pack/plugins/siem/public/common/components/query_bar/index.tsx index 1ad7bc16b901ee..557d389aefee92 100644 --- a/x-pack/plugins/siem/public/components/query_bar/index.tsx +++ b/x-pack/plugins/siem/public/common/components/query_bar/index.tsx @@ -17,8 +17,8 @@ import { SavedQuery, SearchBar, SavedQueryTimeFilter, -} from '../../../../../../src/plugins/data/public'; -import { Storage } from '../../../../../../src/plugins/kibana_utils/public'; +} from '../../../../../../../src/plugins/data/public'; +import { Storage } from '../../../../../../../src/plugins/kibana_utils/public'; export interface QueryBarComponentProps { dataTestSubj?: string; diff --git a/x-pack/plugins/siem/public/components/scroll_to_top/index.test.tsx b/x-pack/plugins/siem/public/common/components/scroll_to_top/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/scroll_to_top/index.test.tsx rename to x-pack/plugins/siem/public/common/components/scroll_to_top/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/scroll_to_top/index.tsx b/x-pack/plugins/siem/public/common/components/scroll_to_top/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/scroll_to_top/index.tsx rename to x-pack/plugins/siem/public/common/components/scroll_to_top/index.tsx diff --git a/x-pack/plugins/siem/public/components/search_bar/index.tsx b/x-pack/plugins/siem/public/common/components/search_bar/index.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/search_bar/index.tsx rename to x-pack/plugins/siem/public/common/components/search_bar/index.tsx index 4dd1b114ccff39..995955cff54f57 100644 --- a/x-pack/plugins/siem/public/components/search_bar/index.tsx +++ b/x-pack/plugins/siem/public/common/components/search_bar/index.tsx @@ -38,7 +38,9 @@ import { startSelector, toStrSelector, } from './selectors'; -import { timelineActions, hostsActions, networkActions } from '../../store/actions'; +import { hostsActions } from '../../../hosts/store'; +import { networkActions } from '../../../network/store'; +import { timelineActions } from '../../../timelines/store/timeline'; import { useKibana } from '../../lib/kibana'; interface SiemSearchBarProps { diff --git a/x-pack/plugins/siem/public/components/search_bar/selectors.ts b/x-pack/plugins/siem/public/common/components/search_bar/selectors.ts similarity index 91% rename from x-pack/plugins/siem/public/components/search_bar/selectors.ts rename to x-pack/plugins/siem/public/common/components/search_bar/selectors.ts index 4e700a46ca0e2d..793737a1ad754c 100644 --- a/x-pack/plugins/siem/public/components/search_bar/selectors.ts +++ b/x-pack/plugins/siem/public/common/components/search_bar/selectors.ts @@ -6,7 +6,7 @@ import { createSelector } from 'reselect'; import { InputsRange } from '../../store/inputs/model'; -import { Query, SavedQuery } from '../../../../../../src/plugins/data/public'; +import { Query, SavedQuery } from '../../../../../../../src/plugins/data/public'; export { endSelector, diff --git a/x-pack/plugins/siem/public/components/selectable_text/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/selectable_text/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/selectable_text/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/selectable_text/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/selectable_text/index.test.tsx b/x-pack/plugins/siem/public/common/components/selectable_text/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/selectable_text/index.test.tsx rename to x-pack/plugins/siem/public/common/components/selectable_text/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/selectable_text/index.tsx b/x-pack/plugins/siem/public/common/components/selectable_text/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/selectable_text/index.tsx rename to x-pack/plugins/siem/public/common/components/selectable_text/index.tsx diff --git a/x-pack/plugins/siem/public/components/sidebar_header/index.tsx b/x-pack/plugins/siem/public/common/components/sidebar_header/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/sidebar_header/index.tsx rename to x-pack/plugins/siem/public/common/components/sidebar_header/index.tsx diff --git a/x-pack/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/stat_items/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/stat_items/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/stat_items/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/stat_items/index.test.tsx b/x-pack/plugins/siem/public/common/components/stat_items/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/stat_items/index.test.tsx rename to x-pack/plugins/siem/public/common/components/stat_items/index.test.tsx index 95ef747bc429ac..e0da50abf6b532 100644 --- a/x-pack/plugins/siem/public/components/stat_items/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/stat_items/index.test.tsx @@ -23,17 +23,17 @@ import { import { BarChart } from '../charts/barchart'; import { AreaChart } from '../charts/areachart'; import { EuiHorizontalRule } from '@elastic/eui'; -import { fieldTitleChartMapping } from '../page/network/kpi_network'; +import { fieldTitleChartMapping } from '../../../network/components/kpi_network'; import { mockData, mockEnableChartsData, mockNoChartMappings, mockNarrowDateRange, -} from '../page/network/kpi_network/mock'; -import { mockGlobalState, apolloClientObservable } from '../../mock'; +} from '../../../network/components/kpi_network/mock'; +import { mockGlobalState, apolloClientObservable, SUB_PLUGINS_REDUCER } from '../../mock'; import { State, createStore } from '../../store'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { KpiNetworkData, KpiHostsData } from '../../graphql/types'; +import { KpiNetworkData, KpiHostsData } from '../../../graphql/types'; const from = new Date('2019-06-15T06:00:00.000Z').valueOf(); const to = new Date('2019-06-18T06:00:00.000Z').valueOf(); @@ -49,7 +49,7 @@ jest.mock('../charts/barchart', () => { describe('Stat Items Component', () => { const theme = () => ({ eui: euiDarkVars, darkMode: true }); const state: State = mockGlobalState; - const store = createStore(state, apolloClientObservable); + const store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); describe.each([ [ diff --git a/x-pack/plugins/siem/public/components/stat_items/index.tsx b/x-pack/plugins/siem/public/common/components/stat_items/index.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/stat_items/index.tsx rename to x-pack/plugins/siem/public/common/components/stat_items/index.tsx index 3ebcba0a85a40d..b2543f70e9401e 100644 --- a/x-pack/plugins/siem/public/components/stat_items/index.tsx +++ b/x-pack/plugins/siem/public/common/components/stat_items/index.tsx @@ -18,7 +18,7 @@ import { get, getOr } from 'lodash/fp'; import React, { useState, useEffect } from 'react'; import styled from 'styled-components'; -import { KpiHostsData, KpiNetworkData } from '../../graphql/types'; +import { KpiHostsData, KpiNetworkData } from '../../../graphql/types'; import { AreaChart } from '../charts/areachart'; import { BarChart } from '../charts/barchart'; import { ChartSeriesData, ChartData, ChartSeriesConfigs, UpdateDateRange } from '../charts/common'; diff --git a/x-pack/plugins/siem/public/components/subtitle/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/subtitle/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/subtitle/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/subtitle/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/subtitle/index.test.tsx b/x-pack/plugins/siem/public/common/components/subtitle/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/subtitle/index.test.tsx rename to x-pack/plugins/siem/public/common/components/subtitle/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/subtitle/index.tsx b/x-pack/plugins/siem/public/common/components/subtitle/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/subtitle/index.tsx rename to x-pack/plugins/siem/public/common/components/subtitle/index.tsx diff --git a/x-pack/plugins/siem/public/components/super_date_picker/index.test.tsx b/x-pack/plugins/siem/public/common/components/super_date_picker/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/super_date_picker/index.test.tsx rename to x-pack/plugins/siem/public/common/components/super_date_picker/index.test.tsx index b6b515ceeffa61..ba4848923b2afa 100644 --- a/x-pack/plugins/siem/public/components/super_date_picker/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/super_date_picker/index.test.tsx @@ -8,9 +8,9 @@ import { mount } from 'enzyme'; import React from 'react'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { DEFAULT_TIMEPICKER_QUICK_RANGES } from '../../../common/constants'; +import { DEFAULT_TIMEPICKER_QUICK_RANGES } from '../../../../common/constants'; import { useUiSetting$ } from '../../lib/kibana'; -import { apolloClientObservable, mockGlobalState } from '../../mock'; +import { apolloClientObservable, mockGlobalState, SUB_PLUGINS_REDUCER } from '../../mock'; import { createUseUiSetting$Mock } from '../../mock/kibana_react'; import { createStore, State } from '../../store'; @@ -75,11 +75,11 @@ const timepickerRanges = [ describe('SIEM Super Date Picker', () => { describe('#SuperDatePicker', () => { const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { jest.clearAllMocks(); - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); mockUseUiSetting$.mockImplementation((key, defaultValue) => { const useUiSetting$Mock = createUseUiSetting$Mock(); diff --git a/x-pack/plugins/siem/public/components/super_date_picker/index.tsx b/x-pack/plugins/siem/public/common/components/super_date_picker/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/super_date_picker/index.tsx rename to x-pack/plugins/siem/public/common/components/super_date_picker/index.tsx index ad38a7d61bcba6..d1936ac61e26b5 100644 --- a/x-pack/plugins/siem/public/components/super_date_picker/index.tsx +++ b/x-pack/plugins/siem/public/common/components/super_date_picker/index.tsx @@ -17,10 +17,11 @@ import React, { useState, useCallback } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import { Dispatch } from 'redux'; -import { DEFAULT_TIMEPICKER_QUICK_RANGES } from '../../../common/constants'; +import { DEFAULT_TIMEPICKER_QUICK_RANGES } from '../../../../common/constants'; +import { timelineActions } from '../../../timelines/store/timeline'; import { useUiSetting$ } from '../../lib/kibana'; import { inputsModel, State } from '../../store'; -import { inputsActions, timelineActions } from '../../store/actions'; +import { inputsActions } from '../../store/actions'; import { InputsModelId } from '../../store/inputs/constants'; import { policySelector, diff --git a/x-pack/plugins/siem/public/components/super_date_picker/selectors.test.ts b/x-pack/plugins/siem/public/common/components/super_date_picker/selectors.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/super_date_picker/selectors.test.ts rename to x-pack/plugins/siem/public/common/components/super_date_picker/selectors.test.ts diff --git a/x-pack/plugins/siem/public/components/super_date_picker/selectors.ts b/x-pack/plugins/siem/public/common/components/super_date_picker/selectors.ts similarity index 100% rename from x-pack/plugins/siem/public/components/super_date_picker/selectors.ts rename to x-pack/plugins/siem/public/common/components/super_date_picker/selectors.ts diff --git a/x-pack/plugins/siem/public/components/tables/__snapshots__/helpers.test.tsx.snap b/x-pack/plugins/siem/public/common/components/tables/__snapshots__/helpers.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/tables/__snapshots__/helpers.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/tables/__snapshots__/helpers.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/tables/helpers.test.tsx b/x-pack/plugins/siem/public/common/components/tables/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/tables/helpers.test.tsx rename to x-pack/plugins/siem/public/common/components/tables/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/components/tables/helpers.tsx b/x-pack/plugins/siem/public/common/components/tables/helpers.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/tables/helpers.tsx rename to x-pack/plugins/siem/public/common/components/tables/helpers.tsx index f4f7375c26d14c..c9d90504c36dbd 100644 --- a/x-pack/plugins/siem/public/components/tables/helpers.tsx +++ b/x-pack/plugins/siem/public/common/components/tables/helpers.tsx @@ -13,8 +13,8 @@ import { DragEffects, DraggableWrapper } from '../drag_and_drop/draggable_wrappe import { escapeDataProviderId } from '../drag_and_drop/helpers'; import { defaultToEmptyTag, getEmptyTagValue } from '../empty_value'; import { MoreRowItems, Spacer } from '../page'; -import { IS_OPERATOR } from '../timeline/data_providers/data_provider'; -import { Provider } from '../timeline/data_providers/provider'; +import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Provider } from '../../../timelines/components/timeline/data_providers/provider'; const Subtext = styled.div` font-size: ${props => props.theme.eui.euiFontSizeXS}; diff --git a/x-pack/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap b/x-pack/plugins/siem/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/toasters/errors.ts b/x-pack/plugins/siem/public/common/components/toasters/errors.ts similarity index 100% rename from x-pack/plugins/siem/public/components/toasters/errors.ts rename to x-pack/plugins/siem/public/common/components/toasters/errors.ts diff --git a/x-pack/plugins/siem/public/components/toasters/index.test.tsx b/x-pack/plugins/siem/public/common/components/toasters/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/toasters/index.test.tsx rename to x-pack/plugins/siem/public/common/components/toasters/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/toasters/index.tsx b/x-pack/plugins/siem/public/common/components/toasters/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/toasters/index.tsx rename to x-pack/plugins/siem/public/common/components/toasters/index.tsx diff --git a/x-pack/plugins/siem/public/components/toasters/modal_all_errors.test.tsx b/x-pack/plugins/siem/public/common/components/toasters/modal_all_errors.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/toasters/modal_all_errors.test.tsx rename to x-pack/plugins/siem/public/common/components/toasters/modal_all_errors.test.tsx diff --git a/x-pack/plugins/siem/public/components/toasters/modal_all_errors.tsx b/x-pack/plugins/siem/public/common/components/toasters/modal_all_errors.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/toasters/modal_all_errors.tsx rename to x-pack/plugins/siem/public/common/components/toasters/modal_all_errors.tsx diff --git a/x-pack/plugins/siem/public/components/toasters/translations.ts b/x-pack/plugins/siem/public/common/components/toasters/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/toasters/translations.ts rename to x-pack/plugins/siem/public/common/components/toasters/translations.ts diff --git a/x-pack/plugins/siem/public/components/toasters/utils.test.ts b/x-pack/plugins/siem/public/common/components/toasters/utils.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/toasters/utils.test.ts rename to x-pack/plugins/siem/public/common/components/toasters/utils.test.ts diff --git a/x-pack/plugins/siem/public/components/toasters/utils.ts b/x-pack/plugins/siem/public/common/components/toasters/utils.ts similarity index 100% rename from x-pack/plugins/siem/public/components/toasters/utils.ts rename to x-pack/plugins/siem/public/common/components/toasters/utils.ts diff --git a/x-pack/plugins/siem/public/components/top_n/helpers.test.tsx b/x-pack/plugins/siem/public/common/components/top_n/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/top_n/helpers.test.tsx rename to x-pack/plugins/siem/public/common/components/top_n/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/components/top_n/helpers.ts b/x-pack/plugins/siem/public/common/components/top_n/helpers.ts similarity index 96% rename from x-pack/plugins/siem/public/components/top_n/helpers.ts rename to x-pack/plugins/siem/public/common/components/top_n/helpers.ts index 8d9ae48d29b691..a4226cc58530aa 100644 --- a/x-pack/plugins/siem/public/components/top_n/helpers.ts +++ b/x-pack/plugins/siem/public/common/components/top_n/helpers.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { EventType } from '../../store/timeline/model'; +import { EventType } from '../../../timelines/store/timeline/model'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/top_n/index.test.tsx b/x-pack/plugins/siem/public/common/components/top_n/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/top_n/index.test.tsx rename to x-pack/plugins/siem/public/common/components/top_n/index.test.tsx index 9325dcf499b2b4..24d1939d9319d3 100644 --- a/x-pack/plugins/siem/public/components/top_n/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/top_n/index.test.tsx @@ -8,11 +8,19 @@ import { mount, ReactWrapper } from 'enzyme'; import React from 'react'; import { mockBrowserFields } from '../../containers/source/mock'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../mock'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../mock'; import { createKibanaCoreStartMock } from '../../mock/kibana_core'; -import { FilterManager } from '../../../../../../src/plugins/data/public'; +import { FilterManager } from '../../../../../../../src/plugins/data/public'; import { createStore, State } from '../../store'; -import { TimelineContext, TimelineTypeContext } from '../timeline/timeline_context'; +import { + TimelineContext, + TimelineTypeContext, +} from '../../../timelines/components/timeline/timeline_context'; import { Props } from './top_n'; import { ACTIVE_TIMELINE_REDUX_ID, StatefulTopN } from '.'; @@ -132,7 +140,7 @@ const state: State = { }, }, }; -const store = createStore(state, apolloClientObservable); +const store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); describe('StatefulTopN', () => { // Suppress warnings about "react-beautiful-dnd" diff --git a/x-pack/plugins/siem/public/components/top_n/index.tsx b/x-pack/plugins/siem/public/common/components/top_n/index.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/top_n/index.tsx rename to x-pack/plugins/siem/public/common/components/top_n/index.tsx index 9863df42f101d3..a71b27e0bd9cb4 100644 --- a/x-pack/plugins/siem/public/components/top_n/index.tsx +++ b/x-pack/plugins/siem/public/common/components/top_n/index.tsx @@ -10,13 +10,14 @@ import { connect, ConnectedProps } from 'react-redux'; import { GlobalTime } from '../../containers/global_time'; import { BrowserFields, WithSource } from '../../containers/source'; import { useKibana } from '../../lib/kibana'; -import { esQuery, Filter, Query } from '../../../../../../src/plugins/data/public'; -import { inputsModel, inputsSelectors, State, timelineSelectors } from '../../store'; +import { esQuery, Filter, Query } from '../../../../../../../src/plugins/data/public'; +import { inputsModel, inputsSelectors, State } from '../../store'; import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions'; -import { timelineDefaults } from '../../store/timeline/defaults'; -import { TimelineModel } from '../../store/timeline/model'; -import { combineQueries } from '../timeline/helpers'; -import { useTimelineTypeContext } from '../timeline/timeline_context'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; +import { timelineSelectors } from '../../../timelines/store/timeline'; +import { TimelineModel } from '../../../timelines/store/timeline/model'; +import { combineQueries } from '../../../timelines/components/timeline/helpers'; +import { useTimelineTypeContext } from '../../../timelines/components/timeline/timeline_context'; import { getOptions } from './helpers'; import { TopN } from './top_n'; diff --git a/x-pack/plugins/siem/public/components/top_n/top_n.test.tsx b/x-pack/plugins/siem/public/common/components/top_n/top_n.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/top_n/top_n.test.tsx rename to x-pack/plugins/siem/public/common/components/top_n/top_n.test.tsx diff --git a/x-pack/plugins/siem/public/components/top_n/top_n.tsx b/x-pack/plugins/siem/public/common/components/top_n/top_n.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/top_n/top_n.tsx rename to x-pack/plugins/siem/public/common/components/top_n/top_n.tsx index d8dc63ef92ec60..0ccb7e1e72f1f5 100644 --- a/x-pack/plugins/siem/public/components/top_n/top_n.tsx +++ b/x-pack/plugins/siem/public/common/components/top_n/top_n.tsx @@ -9,12 +9,12 @@ import React, { useCallback, useMemo, useState } from 'react'; import styled from 'styled-components'; import { ActionCreator } from 'typescript-fsa'; -import { EventsByDataset } from '../../pages/overview/events_by_dataset'; -import { SignalsByCategory } from '../../pages/overview/signals_by_category'; -import { Filter, IIndexPattern, Query } from '../../../../../../src/plugins/data/public'; +import { EventsByDataset } from '../../../overview/components/events_by_dataset'; +import { SignalsByCategory } from '../../../overview/components/signals_by_category'; +import { Filter, IIndexPattern, Query } from '../../../../../../../src/plugins/data/public'; import { inputsModel } from '../../store'; import { InputsModelId } from '../../store/inputs/constants'; -import { EventType } from '../../store/timeline/model'; +import { EventType } from '../../../timelines/store/timeline/model'; import { TopNOption } from './helpers'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/top_n/translations.ts b/x-pack/plugins/siem/public/common/components/top_n/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/top_n/translations.ts rename to x-pack/plugins/siem/public/common/components/top_n/translations.ts diff --git a/x-pack/plugins/siem/public/components/truncatable_text/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/truncatable_text/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/truncatable_text/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/truncatable_text/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/truncatable_text/index.test.tsx b/x-pack/plugins/siem/public/common/components/truncatable_text/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/truncatable_text/index.test.tsx rename to x-pack/plugins/siem/public/common/components/truncatable_text/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/truncatable_text/index.tsx b/x-pack/plugins/siem/public/common/components/truncatable_text/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/truncatable_text/index.tsx rename to x-pack/plugins/siem/public/common/components/truncatable_text/index.tsx diff --git a/x-pack/plugins/siem/public/components/url_state/constants.ts b/x-pack/plugins/siem/public/common/components/url_state/constants.ts similarity index 100% rename from x-pack/plugins/siem/public/components/url_state/constants.ts rename to x-pack/plugins/siem/public/common/components/url_state/constants.ts diff --git a/x-pack/plugins/siem/public/components/url_state/helpers.test.ts b/x-pack/plugins/siem/public/common/components/url_state/helpers.test.ts similarity index 91% rename from x-pack/plugins/siem/public/components/url_state/helpers.test.ts rename to x-pack/plugins/siem/public/common/components/url_state/helpers.test.ts index c6c18d4c25a747..410bd62e3a708f 100644 --- a/x-pack/plugins/siem/public/components/url_state/helpers.test.ts +++ b/x-pack/plugins/siem/public/common/components/url_state/helpers.test.ts @@ -3,9 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { navTabs } from '../../pages/home/home_navigations'; +import { navTabs } from '../../../app/home/home_navigations'; import { getTitle } from './helpers'; -import { HostsType } from '../../store/hosts/model'; +import { HostsType } from '../../../hosts/store/model'; describe('Helpers Url_State', () => { describe('getTitle', () => { diff --git a/x-pack/plugins/siem/public/components/url_state/helpers.ts b/x-pack/plugins/siem/public/common/components/url_state/helpers.ts similarity index 95% rename from x-pack/plugins/siem/public/components/url_state/helpers.ts rename to x-pack/plugins/siem/public/common/components/url_state/helpers.ts index 62196b90e5e6f2..8f13e4dd0cdcf7 100644 --- a/x-pack/plugins/siem/public/components/url_state/helpers.ts +++ b/x-pack/plugins/siem/public/common/components/url_state/helpers.ts @@ -9,13 +9,14 @@ import { parse, stringify } from 'query-string'; import { decode, encode } from 'rison-node'; import * as H from 'history'; -import { Query, Filter } from '../../../../../../src/plugins/data/public'; -import { url } from '../../../../../../src/plugins/kibana_utils/public'; +import { Query, Filter } from '../../../../../../../src/plugins/data/public'; +import { url } from '../../../../../../../src/plugins/kibana_utils/public'; -import { SiemPageName } from '../../pages/home/types'; -import { inputsSelectors, State, timelineSelectors } from '../../store'; +import { SiemPageName } from '../../../app/types'; +import { inputsSelectors, State } from '../../store'; import { UrlInputsModel } from '../../store/inputs/model'; -import { TimelineUrl } from '../../store/timeline/model'; +import { TimelineUrl } from '../../../timelines/store/timeline/model'; +import { timelineSelectors } from '../../../timelines/store/timeline'; import { formatDate } from '../super_date_picker'; import { NavTab } from '../navigation/types'; import { CONSTANTS, UrlStateType } from './constants'; diff --git a/x-pack/plugins/siem/public/components/url_state/index.test.tsx b/x-pack/plugins/siem/public/common/components/url_state/index.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/url_state/index.test.tsx rename to x-pack/plugins/siem/public/common/components/url_state/index.test.tsx index 4d2a717153894e..b901bc2b820cce 100644 --- a/x-pack/plugins/siem/public/components/url_state/index.test.tsx +++ b/x-pack/plugins/siem/public/common/components/url_state/index.test.tsx @@ -8,7 +8,7 @@ import { mount } from 'enzyme'; import React from 'react'; import { HookWrapper } from '../../mock'; -import { SiemPageName } from '../../pages/home/types'; +import { SiemPageName } from '../../../app/types'; import { RouteSpyState } from '../../utils/route/types'; import { CONSTANTS } from './constants'; import { diff --git a/x-pack/plugins/siem/public/components/url_state/index.tsx b/x-pack/plugins/siem/public/common/components/url_state/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/url_state/index.tsx rename to x-pack/plugins/siem/public/common/components/url_state/index.tsx index 294e41a1faa7b4..f90e9cf62801b7 100644 --- a/x-pack/plugins/siem/public/components/url_state/index.tsx +++ b/x-pack/plugins/siem/public/common/components/url_state/index.tsx @@ -9,13 +9,13 @@ import { compose, Dispatch } from 'redux'; import { connect } from 'react-redux'; import deepEqual from 'fast-deep-equal'; -import { timelineActions } from '../../store/actions'; +import { timelineActions } from '../../../timelines/store/timeline'; import { RouteSpyState } from '../../utils/route/types'; import { useRouteSpy } from '../../utils/route/use_route_spy'; import { UrlStateContainerPropTypes, UrlStateProps } from './types'; import { useUrlStateHooks } from './use_url_state'; -import { dispatchUpdateTimeline } from '../open_timeline/helpers'; +import { dispatchUpdateTimeline } from '../../../timelines/components/open_timeline/helpers'; import { dispatchSetInitialStateFromUrl } from './initialize_redux_by_url'; import { makeMapStateToProps } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/url_state/index_mocked.test.tsx b/x-pack/plugins/siem/public/common/components/url_state/index_mocked.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/url_state/index_mocked.test.tsx rename to x-pack/plugins/siem/public/common/components/url_state/index_mocked.test.tsx index 4adc17b32e1891..122f7f6fed57ed 100644 --- a/x-pack/plugins/siem/public/components/url_state/index_mocked.test.tsx +++ b/x-pack/plugins/siem/public/common/components/url_state/index_mocked.test.tsx @@ -8,7 +8,7 @@ import { mount } from 'enzyme'; import React from 'react'; import { HookWrapper } from '../../mock/hook_wrapper'; -import { SiemPageName } from '../../pages/home/types'; +import { SiemPageName } from '../../../app/types'; import { CONSTANTS } from './constants'; import { getFilterQuery, getMockPropsObj, mockHistory, testCases } from './test_dependencies'; diff --git a/x-pack/plugins/siem/public/components/url_state/initialize_redux_by_url.tsx b/x-pack/plugins/siem/public/common/components/url_state/initialize_redux_by_url.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/url_state/initialize_redux_by_url.tsx rename to x-pack/plugins/siem/public/common/components/url_state/initialize_redux_by_url.tsx index 54a196d1b81617..441424faa48dcb 100644 --- a/x-pack/plugins/siem/public/components/url_state/initialize_redux_by_url.tsx +++ b/x-pack/plugins/siem/public/common/components/url_state/initialize_redux_by_url.tsx @@ -7,7 +7,7 @@ import { get, isEmpty } from 'lodash/fp'; import { Dispatch } from 'redux'; -import { Query, Filter } from '../../../../../../src/plugins/data/public'; +import { Query, Filter } from '../../../../../../../src/plugins/data/public'; import { inputsActions } from '../../store/actions'; import { InputsModelId, TimeRangeKinds } from '../../store/inputs/constants'; import { @@ -16,12 +16,12 @@ import { AbsoluteTimeRange, RelativeTimeRange, } from '../../store/inputs/model'; -import { TimelineUrl } from '../../store/timeline/model'; +import { TimelineUrl } from '../../../timelines/store/timeline/model'; import { CONSTANTS } from './constants'; import { decodeRisonUrlState } from './helpers'; import { normalizeTimeRange } from './normalize_time_range'; import { DispatchSetInitialStateFromUrl, SetInitialStateFromUrl } from './types'; -import { queryTimelineById } from '../open_timeline/helpers'; +import { queryTimelineById } from '../../../timelines/components/open_timeline/helpers'; export const dispatchSetInitialStateFromUrl = ( dispatch: Dispatch diff --git a/x-pack/plugins/siem/public/components/url_state/normalize_time_range.test.ts b/x-pack/plugins/siem/public/common/components/url_state/normalize_time_range.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/url_state/normalize_time_range.test.ts rename to x-pack/plugins/siem/public/common/components/url_state/normalize_time_range.test.ts diff --git a/x-pack/plugins/siem/public/components/url_state/normalize_time_range.ts b/x-pack/plugins/siem/public/common/components/url_state/normalize_time_range.ts similarity index 100% rename from x-pack/plugins/siem/public/components/url_state/normalize_time_range.ts rename to x-pack/plugins/siem/public/common/components/url_state/normalize_time_range.ts diff --git a/x-pack/plugins/siem/public/components/url_state/test_dependencies.ts b/x-pack/plugins/siem/public/common/components/url_state/test_dependencies.ts similarity index 95% rename from x-pack/plugins/siem/public/components/url_state/test_dependencies.ts rename to x-pack/plugins/siem/public/common/components/url_state/test_dependencies.ts index 974bee53bc2ba0..de6a00bfadb80c 100644 --- a/x-pack/plugins/siem/public/components/url_state/test_dependencies.ts +++ b/x-pack/plugins/siem/public/common/components/url_state/test_dependencies.ts @@ -5,17 +5,18 @@ */ import { ActionCreator } from 'typescript-fsa'; -import { DispatchUpdateTimeline } from '../open_timeline/types'; -import { navTabs } from '../../pages/home/home_navigations'; -import { SiemPageName } from '../../pages/home/types'; -import { hostsModel, networkModel } from '../../store'; +import { DispatchUpdateTimeline } from '../../../timelines/components/open_timeline/types'; +import { navTabs } from '../../../app/home/home_navigations'; +import { SiemPageName } from '../../../app/types'; import { inputsActions } from '../../store/actions'; -import { HostsTableType } from '../../store/hosts/model'; import { CONSTANTS } from './constants'; import { dispatchSetInitialStateFromUrl } from './initialize_redux_by_url'; import { UrlStateContainerPropTypes, LocationTypes } from './types'; -import { Query } from '../../../../../../src/plugins/data/public'; +import { Query } from '../../../../../../../src/plugins/data/public'; +import { networkModel } from '../../../network/store'; +import { hostsModel } from '../../../hosts/store'; +import { HostsTableType } from '../../../hosts/store/model'; type Action = 'PUSH' | 'POP' | 'REPLACE'; const pop: Action = 'POP'; diff --git a/x-pack/plugins/siem/public/components/url_state/types.ts b/x-pack/plugins/siem/public/common/components/url_state/types.ts similarity index 96% rename from x-pack/plugins/siem/public/components/url_state/types.ts rename to x-pack/plugins/siem/public/common/components/url_state/types.ts index 9d8a4a8e6a9087..56578d84e12e47 100644 --- a/x-pack/plugins/siem/public/components/url_state/types.ts +++ b/x-pack/plugins/siem/public/common/components/url_state/types.ts @@ -16,9 +16,9 @@ import { } from 'src/plugins/data/public'; import { UrlInputsModel } from '../../store/inputs/model'; -import { TimelineUrl } from '../../store/timeline/model'; +import { TimelineUrl } from '../../../timelines/store/timeline/model'; import { RouteSpyState } from '../../utils/route/types'; -import { DispatchUpdateTimeline } from '../open_timeline/types'; +import { DispatchUpdateTimeline } from '../../../timelines/components/open_timeline/types'; import { NavTab } from '../navigation/types'; import { CONSTANTS, UrlStateType } from './constants'; diff --git a/x-pack/plugins/siem/public/components/url_state/use_url_state.tsx b/x-pack/plugins/siem/public/common/components/url_state/use_url_state.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/url_state/use_url_state.tsx rename to x-pack/plugins/siem/public/common/components/url_state/use_url_state.tsx index a7704e0e86970a..b3436a7da82970 100644 --- a/x-pack/plugins/siem/public/components/url_state/use_url_state.tsx +++ b/x-pack/plugins/siem/public/common/components/url_state/use_url_state.tsx @@ -27,7 +27,7 @@ import { ALL_URL_STATE_KEYS, UrlStateToRedux, } from './types'; -import { SiemPageName } from '../../pages/home/types'; +import { SiemPageName } from '../../../app/types'; function usePrevious(value: PreviousLocationUrlState) { const ref = useRef(value); diff --git a/x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar.test.tsx.snap b/x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar_action.test.tsx.snap b/x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar_action.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar_action.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar_action.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar_group.test.tsx.snap b/x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar_group.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar_group.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar_group.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar_section.test.tsx.snap b/x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar_section.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar_section.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar_section.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar_text.test.tsx.snap b/x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar_text.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/__snapshots__/utility_bar_text.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/utility_bar/__snapshots__/utility_bar_text.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/utility_bar/index.ts b/x-pack/plugins/siem/public/common/components/utility_bar/index.ts similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/index.ts rename to x-pack/plugins/siem/public/common/components/utility_bar/index.ts diff --git a/x-pack/plugins/siem/public/components/utility_bar/styles.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/styles.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/styles.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/styles.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar.test.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar.test.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar.test.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar_action.test.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_action.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar_action.test.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_action.test.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar_action.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_action.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar_action.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_action.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar_group.test.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_group.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar_group.test.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_group.test.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar_group.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_group.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar_group.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_group.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar_section.test.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_section.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar_section.test.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_section.test.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar_section.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_section.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar_section.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_section.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar_text.test.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_text.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar_text.test.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_text.test.tsx diff --git a/x-pack/plugins/siem/public/components/utility_bar/utility_bar_text.tsx b/x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_text.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/utility_bar/utility_bar_text.tsx rename to x-pack/plugins/siem/public/common/components/utility_bar/utility_bar_text.tsx diff --git a/x-pack/plugins/siem/public/components/utils.ts b/x-pack/plugins/siem/public/common/components/utils.ts similarity index 100% rename from x-pack/plugins/siem/public/components/utils.ts rename to x-pack/plugins/siem/public/common/components/utils.ts diff --git a/x-pack/plugins/siem/public/components/with_hover_actions/index.tsx b/x-pack/plugins/siem/public/common/components/with_hover_actions/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/with_hover_actions/index.tsx rename to x-pack/plugins/siem/public/common/components/with_hover_actions/index.tsx diff --git a/x-pack/plugins/siem/public/components/wrapper_page/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/common/components/wrapper_page/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/wrapper_page/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/common/components/wrapper_page/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/wrapper_page/index.test.tsx b/x-pack/plugins/siem/public/common/components/wrapper_page/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/wrapper_page/index.test.tsx rename to x-pack/plugins/siem/public/common/components/wrapper_page/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/wrapper_page/index.tsx b/x-pack/plugins/siem/public/common/components/wrapper_page/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/wrapper_page/index.tsx rename to x-pack/plugins/siem/public/common/components/wrapper_page/index.tsx diff --git a/x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts b/x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts similarity index 94% rename from x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts rename to x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts index f63349d3e573ad..c3d470df11be77 100644 --- a/x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts +++ b/x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts @@ -8,7 +8,7 @@ import { MatrixHistogramOption, MatrixHisrogramConfigs, } from '../../../components/matrix_histogram/types'; -import { HistogramType } from '../../../graphql/types'; +import { HistogramType } from '../../../../graphql/types'; export const anomaliesStackByOptions: MatrixHistogramOption[] = [ { diff --git a/x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx b/x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx rename to x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/index.tsx index 2bbb4cde92b151..a5574bd2a57c76 100644 --- a/x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/index.tsx +++ b/x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/index.tsx @@ -6,7 +6,7 @@ import React, { useEffect } from 'react'; -import { DEFAULT_ANOMALY_SCORE } from '../../../../common/constants'; +import { DEFAULT_ANOMALY_SCORE } from '../../../../../common/constants'; import { AnomaliesQueryTabBodyProps } from './types'; import { getAnomaliesFilterQuery } from './utils'; import { useSiemJobs } from '../../../components/ml_popover/hooks/use_siem_jobs'; diff --git a/x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/translations.ts b/x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/translations.ts rename to x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/translations.ts diff --git a/x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/types.ts b/x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/types.ts similarity index 78% rename from x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/types.ts rename to x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/types.ts index f6cae81e3c6c4b..ecf4c3590a42c2 100644 --- a/x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/types.ts +++ b/x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/types.ts @@ -4,13 +4,13 @@ * you may not use this file except in compliance with the Elastic License. */ -import { ESTermQuery } from '../../../../common/typed_json'; +import { ESTermQuery } from '../../../../../common/typed_json'; import { NarrowDateRange } from '../../../components/ml/types'; import { UpdateDateRange } from '../../../components/charts/common'; -import { SetQuery } from '../../../pages/hosts/navigation/types'; -import { FlowTarget } from '../../../graphql/types'; -import { HostsType } from '../../../store/hosts/model'; -import { NetworkType } from '../../../store/network/model'; +import { SetQuery } from '../../../../hosts/pages/navigation/types'; +import { FlowTarget } from '../../../../graphql/types'; +import { HostsType } from '../../../../hosts/store/model'; +import { NetworkType } from '../../../../network/store//model'; import { AnomaliesHostTable } from '../../../components/ml/tables/anomalies_host_table'; import { AnomaliesNetworkTable } from '../../../components/ml/tables/anomalies_network_table'; diff --git a/x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/utils.ts b/x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts similarity index 93% rename from x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/utils.ts rename to x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts index 790a797b2fead4..e815db68ebcdd0 100644 --- a/x-pack/plugins/siem/public/containers/anomalies/anomalies_query_tab_body/utils.ts +++ b/x-pack/plugins/siem/public/common/containers/anomalies/anomalies_query_tab_body/utils.ts @@ -6,10 +6,10 @@ import deepmerge from 'deepmerge'; -import { ESTermQuery } from '../../../../common/typed_json'; +import { ESTermQuery } from '../../../../../common/typed_json'; import { createFilter } from '../../helpers'; import { SiemJob } from '../../../components/ml_popover/types'; -import { FlowTarget } from '../../../graphql/types'; +import { FlowTarget } from '../../../../graphql/types'; export const getAnomaliesFilterQuery = ( filterQuery: string | ESTermQuery | undefined, diff --git a/x-pack/plugins/siem/public/containers/errors/index.test.tsx b/x-pack/plugins/siem/public/common/containers/errors/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/errors/index.test.tsx rename to x-pack/plugins/siem/public/common/containers/errors/index.test.tsx diff --git a/x-pack/plugins/siem/public/containers/errors/index.tsx b/x-pack/plugins/siem/public/common/containers/errors/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/errors/index.tsx rename to x-pack/plugins/siem/public/common/containers/errors/index.tsx diff --git a/x-pack/plugins/siem/public/containers/errors/translations.ts b/x-pack/plugins/siem/public/common/containers/errors/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/errors/translations.ts rename to x-pack/plugins/siem/public/common/containers/errors/translations.ts diff --git a/x-pack/plugins/siem/public/containers/events/last_event_time/index.ts b/x-pack/plugins/siem/public/common/containers/events/last_event_time/index.ts similarity index 93% rename from x-pack/plugins/siem/public/containers/events/last_event_time/index.ts rename to x-pack/plugins/siem/public/common/containers/events/last_event_time/index.ts index 9cae503d309408..17b2cb746e92b3 100644 --- a/x-pack/plugins/siem/public/containers/events/last_event_time/index.ts +++ b/x-pack/plugins/siem/public/common/containers/events/last_event_time/index.ts @@ -7,8 +7,12 @@ import { get } from 'lodash/fp'; import React, { useEffect, useState } from 'react'; -import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; -import { GetLastEventTimeQuery, LastEventIndexKey, LastTimeDetails } from '../../../graphql/types'; +import { DEFAULT_INDEX_KEY } from '../../../../../common/constants'; +import { + GetLastEventTimeQuery, + LastEventIndexKey, + LastTimeDetails, +} from '../../../../graphql/types'; import { inputsModel } from '../../../store'; import { QueryTemplateProps } from '../../query_template'; import { useUiSetting$ } from '../../../lib/kibana'; diff --git a/x-pack/plugins/siem/public/containers/events/last_event_time/last_event_time.gql_query.ts b/x-pack/plugins/siem/public/common/containers/events/last_event_time/last_event_time.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/events/last_event_time/last_event_time.gql_query.ts rename to x-pack/plugins/siem/public/common/containers/events/last_event_time/last_event_time.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/events/last_event_time/mock.ts b/x-pack/plugins/siem/public/common/containers/events/last_event_time/mock.ts similarity index 93% rename from x-pack/plugins/siem/public/containers/events/last_event_time/mock.ts rename to x-pack/plugins/siem/public/common/containers/events/last_event_time/mock.ts index 43f55dfcf27776..938473f92782a7 100644 --- a/x-pack/plugins/siem/public/containers/events/last_event_time/mock.ts +++ b/x-pack/plugins/siem/public/common/containers/events/last_event_time/mock.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { DEFAULT_INDEX_PATTERN } from '../../../../common/constants'; -import { GetLastEventTimeQuery, LastEventIndexKey } from '../../../graphql/types'; +import { DEFAULT_INDEX_PATTERN } from '../../../../../common/constants'; +import { GetLastEventTimeQuery, LastEventIndexKey } from '../../../../graphql/types'; import { LastEventTimeGqlQuery } from './last_event_time.gql_query'; diff --git a/x-pack/plugins/siem/public/containers/global_time/index.tsx b/x-pack/plugins/siem/public/common/containers/global_time/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/global_time/index.tsx rename to x-pack/plugins/siem/public/common/containers/global_time/index.tsx diff --git a/x-pack/plugins/siem/public/containers/helpers.test.ts b/x-pack/plugins/siem/public/common/containers/helpers.test.ts similarity index 94% rename from x-pack/plugins/siem/public/containers/helpers.test.ts rename to x-pack/plugins/siem/public/common/containers/helpers.test.ts index 5d378d79acc7a4..360ba28a746b07 100644 --- a/x-pack/plugins/siem/public/containers/helpers.test.ts +++ b/x-pack/plugins/siem/public/common/containers/helpers.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { ESQuery } from '../../common/typed_json'; +import { ESQuery } from '../../../common/typed_json'; import { createFilter } from './helpers'; diff --git a/x-pack/plugins/siem/public/containers/helpers.ts b/x-pack/plugins/siem/public/common/containers/helpers.ts similarity index 91% rename from x-pack/plugins/siem/public/containers/helpers.ts rename to x-pack/plugins/siem/public/common/containers/helpers.ts index 5f66e3f4b88d4d..39fd1987218fa2 100644 --- a/x-pack/plugins/siem/public/containers/helpers.ts +++ b/x-pack/plugins/siem/public/common/containers/helpers.ts @@ -7,7 +7,7 @@ import { FetchPolicy } from 'apollo-client'; import { isString } from 'lodash/fp'; -import { ESQuery } from '../../common/typed_json'; +import { ESQuery } from '../../../common/typed_json'; export const createFilter = (filterQuery: ESQuery | string | undefined) => isString(filterQuery) ? filterQuery : JSON.stringify(filterQuery); diff --git a/x-pack/plugins/siem/public/containers/kuery_autocompletion/index.tsx b/x-pack/plugins/siem/public/common/containers/kuery_autocompletion/index.tsx similarity index 98% rename from x-pack/plugins/siem/public/containers/kuery_autocompletion/index.tsx rename to x-pack/plugins/siem/public/common/containers/kuery_autocompletion/index.tsx index 6120538a01e78b..af4eb1ff7a5e1f 100644 --- a/x-pack/plugins/siem/public/containers/kuery_autocompletion/index.tsx +++ b/x-pack/plugins/siem/public/common/containers/kuery_autocompletion/index.tsx @@ -5,7 +5,7 @@ */ import React, { useState } from 'react'; -import { QuerySuggestion, IIndexPattern } from '../../../../../../src/plugins/data/public'; +import { QuerySuggestion, IIndexPattern } from '../../../../../../../src/plugins/data/public'; import { useKibana } from '../../lib/kibana'; type RendererResult = React.ReactElement | null; diff --git a/x-pack/plugins/siem/public/containers/matrix_histogram/index.gql_query.ts b/x-pack/plugins/siem/public/common/containers/matrix_histogram/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/matrix_histogram/index.gql_query.ts rename to x-pack/plugins/siem/public/common/containers/matrix_histogram/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/matrix_histogram/index.test.tsx b/x-pack/plugins/siem/public/common/containers/matrix_histogram/index.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/containers/matrix_histogram/index.test.tsx rename to x-pack/plugins/siem/public/common/containers/matrix_histogram/index.test.tsx index 80899a061e7c16..cb988d7ebf1901 100644 --- a/x-pack/plugins/siem/public/containers/matrix_histogram/index.test.tsx +++ b/x-pack/plugins/siem/public/common/containers/matrix_histogram/index.test.tsx @@ -9,7 +9,7 @@ import { mount } from 'enzyme'; import React from 'react'; import { useApolloClient } from '../../utils/apollo_context'; import { errorToToaster } from '../../components/toasters'; -import { MatrixOverTimeHistogramData, HistogramType } from '../../graphql/types'; +import { MatrixOverTimeHistogramData, HistogramType } from '../../../graphql/types'; import { InspectQuery, Refetch } from '../../store/inputs/model'; const mockQuery = jest.fn().mockResolvedValue({ diff --git a/x-pack/plugins/siem/public/containers/matrix_histogram/index.ts b/x-pack/plugins/siem/public/common/containers/matrix_histogram/index.ts similarity index 97% rename from x-pack/plugins/siem/public/containers/matrix_histogram/index.ts rename to x-pack/plugins/siem/public/common/containers/matrix_histogram/index.ts index 18bb611191bbc8..649ca526c21025 100644 --- a/x-pack/plugins/siem/public/containers/matrix_histogram/index.ts +++ b/x-pack/plugins/siem/public/common/containers/matrix_histogram/index.ts @@ -7,7 +7,7 @@ import { isEmpty } from 'lodash/fp'; import { useEffect, useMemo, useState, useRef } from 'react'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { MatrixHistogramQueryProps } from '../../components/matrix_histogram/types'; import { errorToToaster, useStateToaster } from '../../components/toasters'; import { useUiSetting$ } from '../../lib/kibana'; @@ -15,7 +15,7 @@ import { createFilter } from '../helpers'; import { useApolloClient } from '../../utils/apollo_context'; import { inputsModel } from '../../store'; import { MatrixHistogramGqlQuery } from './index.gql_query'; -import { GetMatrixHistogramQuery, MatrixOverTimeHistogramData } from '../../graphql/types'; +import { GetMatrixHistogramQuery, MatrixOverTimeHistogramData } from '../../../graphql/types'; export const useQuery = ({ endDate, diff --git a/x-pack/plugins/siem/public/containers/query_template.tsx b/x-pack/plugins/siem/public/common/containers/query_template.tsx similarity index 98% rename from x-pack/plugins/siem/public/containers/query_template.tsx rename to x-pack/plugins/siem/public/common/containers/query_template.tsx index dfb452c24b86e5..fdc95c1dadfe16 100644 --- a/x-pack/plugins/siem/public/containers/query_template.tsx +++ b/x-pack/plugins/siem/public/common/containers/query_template.tsx @@ -8,7 +8,7 @@ import { ApolloQueryResult } from 'apollo-client'; import React from 'react'; import { FetchMoreOptions, FetchMoreQueryOptions, OperationVariables } from 'react-apollo'; -import { ESQuery } from '../../common/typed_json'; +import { ESQuery } from '../../../common/typed_json'; export interface QueryTemplateProps { id?: string; diff --git a/x-pack/plugins/siem/public/containers/query_template_paginated.tsx b/x-pack/plugins/siem/public/common/containers/query_template_paginated.tsx similarity index 98% rename from x-pack/plugins/siem/public/containers/query_template_paginated.tsx rename to x-pack/plugins/siem/public/common/containers/query_template_paginated.tsx index db618f216d83e7..446e1125b2807e 100644 --- a/x-pack/plugins/siem/public/containers/query_template_paginated.tsx +++ b/x-pack/plugins/siem/public/common/containers/query_template_paginated.tsx @@ -10,7 +10,7 @@ import React from 'react'; import { FetchMoreOptions, FetchMoreQueryOptions, OperationVariables } from 'react-apollo'; import deepEqual from 'fast-deep-equal'; -import { ESQuery } from '../../common/typed_json'; +import { ESQuery } from '../../../common/typed_json'; import { inputsModel } from '../store/model'; import { generateTablePaginationOptions } from '../components/paginated_table/helpers'; diff --git a/x-pack/plugins/siem/public/containers/source/index.gql_query.ts b/x-pack/plugins/siem/public/common/containers/source/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/source/index.gql_query.ts rename to x-pack/plugins/siem/public/common/containers/source/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/source/index.test.tsx b/x-pack/plugins/siem/public/common/containers/source/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/source/index.test.tsx rename to x-pack/plugins/siem/public/common/containers/source/index.test.tsx diff --git a/x-pack/plugins/siem/public/containers/source/index.tsx b/x-pack/plugins/siem/public/common/containers/source/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/containers/source/index.tsx rename to x-pack/plugins/siem/public/common/containers/source/index.tsx index e9359fdb195877..8c33c556c67674 100644 --- a/x-pack/plugins/siem/public/containers/source/index.tsx +++ b/x-pack/plugins/siem/public/common/containers/source/index.tsx @@ -11,10 +11,10 @@ import React, { useEffect, useMemo, useState } from 'react'; import memoizeOne from 'memoize-one'; import { IIndexPattern } from 'src/plugins/data/public'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { useUiSetting$ } from '../../lib/kibana'; -import { IndexField, SourceQuery } from '../../graphql/types'; +import { IndexField, SourceQuery } from '../../../graphql/types'; import { sourceQuery } from './index.gql_query'; import { useApolloClient } from '../../utils/apollo_context'; diff --git a/x-pack/plugins/siem/public/containers/source/mock.ts b/x-pack/plugins/siem/public/common/containers/source/mock.ts similarity index 99% rename from x-pack/plugins/siem/public/containers/source/mock.ts rename to x-pack/plugins/siem/public/common/containers/source/mock.ts index 092aad9e7400cc..55e8b6ac02b128 100644 --- a/x-pack/plugins/siem/public/containers/source/mock.ts +++ b/x-pack/plugins/siem/public/common/containers/source/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { DEFAULT_INDEX_PATTERN } from '../../../common/constants'; +import { DEFAULT_INDEX_PATTERN } from '../../../../common/constants'; import { BrowserFields } from '.'; import { sourceQuery } from './index.gql_query'; diff --git a/x-pack/plugins/siem/public/hooks/api/__mock__/api.tsx b/x-pack/plugins/siem/public/common/hooks/api/__mock__/api.tsx similarity index 100% rename from x-pack/plugins/siem/public/hooks/api/__mock__/api.tsx rename to x-pack/plugins/siem/public/common/hooks/api/__mock__/api.tsx diff --git a/x-pack/plugins/siem/public/hooks/api/api.tsx b/x-pack/plugins/siem/public/common/hooks/api/api.tsx similarity index 94% rename from x-pack/plugins/siem/public/hooks/api/api.tsx rename to x-pack/plugins/siem/public/common/hooks/api/api.tsx index 8120e3819d9a81..12863bffcf5150 100644 --- a/x-pack/plugins/siem/public/hooks/api/api.tsx +++ b/x-pack/plugins/siem/public/common/hooks/api/api.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { StartServices } from '../../plugin'; +import { StartServices } from '../../../plugin'; import { IndexPatternSavedObject, IndexPatternSavedObjectAttributes } from '../types'; /** diff --git a/x-pack/plugins/siem/public/hooks/api/helpers.test.tsx b/x-pack/plugins/siem/public/common/hooks/api/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/hooks/api/helpers.test.tsx rename to x-pack/plugins/siem/public/common/hooks/api/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/hooks/api/helpers.tsx b/x-pack/plugins/siem/public/common/hooks/api/helpers.tsx similarity index 100% rename from x-pack/plugins/siem/public/hooks/api/helpers.tsx rename to x-pack/plugins/siem/public/common/hooks/api/helpers.tsx diff --git a/x-pack/plugins/siem/public/hooks/translations.ts b/x-pack/plugins/siem/public/common/hooks/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/hooks/translations.ts rename to x-pack/plugins/siem/public/common/hooks/translations.ts diff --git a/x-pack/plugins/siem/public/hooks/types.ts b/x-pack/plugins/siem/public/common/hooks/types.ts similarity index 80% rename from x-pack/plugins/siem/public/hooks/types.ts rename to x-pack/plugins/siem/public/common/hooks/types.ts index 6527904964d000..36b626b0ba9f1d 100644 --- a/x-pack/plugins/siem/public/hooks/types.ts +++ b/x-pack/plugins/siem/public/common/hooks/types.ts @@ -4,7 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { SimpleSavedObject } from '../../../../../src/core/public'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import { SimpleSavedObject } from '../../../../../../src/core/public'; // eslint-disable-next-line @typescript-eslint/consistent-type-definitions export type IndexPatternSavedObjectAttributes = { title: string }; diff --git a/x-pack/plugins/siem/public/hooks/use_add_to_timeline.tsx b/x-pack/plugins/siem/public/common/hooks/use_add_to_timeline.tsx similarity index 95% rename from x-pack/plugins/siem/public/hooks/use_add_to_timeline.tsx rename to x-pack/plugins/siem/public/common/hooks/use_add_to_timeline.tsx index be0ddb153457e9..9d3c1efbe34511 100644 --- a/x-pack/plugins/siem/public/hooks/use_add_to_timeline.tsx +++ b/x-pack/plugins/siem/public/common/hooks/use_add_to_timeline.tsx @@ -9,8 +9,8 @@ import { useCallback } from 'react'; import { DraggableId, FluidDragActions, Position, SensorAPI } from 'react-beautiful-dnd'; import { IS_DRAGGING_CLASS_NAME } from '../components/drag_and_drop/helpers'; -import { HIGHLIGHTED_DROP_TARGET_CLASS_NAME } from '../components/timeline/data_providers/empty'; -import { EMPTY_PROVIDERS_GROUP_CLASS_NAME } from '../components/timeline/data_providers/providers'; +import { HIGHLIGHTED_DROP_TARGET_CLASS_NAME } from '../../timelines/components/timeline/data_providers/empty'; +import { EMPTY_PROVIDERS_GROUP_CLASS_NAME } from '../../timelines/components/timeline/data_providers/providers'; let _sensorApiSingleton: SensorAPI; diff --git a/x-pack/plugins/siem/public/hooks/use_index_patterns.tsx b/x-pack/plugins/siem/public/common/hooks/use_index_patterns.tsx similarity index 100% rename from x-pack/plugins/siem/public/hooks/use_index_patterns.tsx rename to x-pack/plugins/siem/public/common/hooks/use_index_patterns.tsx diff --git a/x-pack/plugins/siem/public/hooks/use_providers_portal.tsx b/x-pack/plugins/siem/public/common/hooks/use_providers_portal.tsx similarity index 100% rename from x-pack/plugins/siem/public/hooks/use_providers_portal.tsx rename to x-pack/plugins/siem/public/common/hooks/use_providers_portal.tsx diff --git a/x-pack/plugins/siem/public/lib/clipboard/clipboard.tsx b/x-pack/plugins/siem/public/common/lib/clipboard/clipboard.tsx similarity index 100% rename from x-pack/plugins/siem/public/lib/clipboard/clipboard.tsx rename to x-pack/plugins/siem/public/common/lib/clipboard/clipboard.tsx diff --git a/x-pack/plugins/siem/public/lib/clipboard/translations.ts b/x-pack/plugins/siem/public/common/lib/clipboard/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/clipboard/translations.ts rename to x-pack/plugins/siem/public/common/lib/clipboard/translations.ts diff --git a/x-pack/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.tsx b/x-pack/plugins/siem/public/common/lib/clipboard/with_copy_to_clipboard.tsx similarity index 100% rename from x-pack/plugins/siem/public/lib/clipboard/with_copy_to_clipboard.tsx rename to x-pack/plugins/siem/public/common/lib/clipboard/with_copy_to_clipboard.tsx diff --git a/x-pack/plugins/siem/public/lib/compose/helpers.test.ts b/x-pack/plugins/siem/public/common/lib/compose/helpers.test.ts similarity index 94% rename from x-pack/plugins/siem/public/lib/compose/helpers.test.ts rename to x-pack/plugins/siem/public/common/lib/compose/helpers.test.ts index af4521b4f6e2c6..4a3d734d0a6d45 100644 --- a/x-pack/plugins/siem/public/lib/compose/helpers.test.ts +++ b/x-pack/plugins/siem/public/common/lib/compose/helpers.test.ts @@ -9,7 +9,7 @@ import { errorLink, reTryOneTimeOnErrorLink } from '../../containers/errors'; import { getLinks } from './helpers'; import { withClientState } from 'apollo-link-state'; import * as apolloLinkHttp from 'apollo-link-http'; -import introspectionQueryResultData from '../../graphql/introspection.json'; +import introspectionQueryResultData from '../../../graphql/introspection.json'; jest.mock('apollo-cache-inmemory'); jest.mock('apollo-link-http'); diff --git a/x-pack/plugins/siem/public/lib/compose/helpers.ts b/x-pack/plugins/siem/public/common/lib/compose/helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/compose/helpers.ts rename to x-pack/plugins/siem/public/common/lib/compose/helpers.ts diff --git a/x-pack/plugins/siem/public/lib/compose/kibana_compose.tsx b/x-pack/plugins/siem/public/common/lib/compose/kibana_compose.tsx similarity index 83% rename from x-pack/plugins/siem/public/lib/compose/kibana_compose.tsx rename to x-pack/plugins/siem/public/common/lib/compose/kibana_compose.tsx index fb30c9a5411ed7..f7c7c65318482d 100644 --- a/x-pack/plugins/siem/public/lib/compose/kibana_compose.tsx +++ b/x-pack/plugins/siem/public/common/lib/compose/kibana_compose.tsx @@ -8,8 +8,9 @@ import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemo import ApolloClient from 'apollo-client'; import { ApolloLink } from 'apollo-link'; -import { CoreStart } from '../../../../../../src/core/public'; -import introspectionQueryResultData from '../../graphql/introspection.json'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import { CoreStart } from '../../../../../../../src/core/public'; +import introspectionQueryResultData from '../../../graphql/introspection.json'; import { AppFrontendLibs } from '../lib'; import { getLinks } from './helpers'; diff --git a/x-pack/plugins/siem/public/lib/connectors/components/connector_flyout/index.tsx b/x-pack/plugins/siem/public/common/lib/connectors/components/connector_flyout/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/lib/connectors/components/connector_flyout/index.tsx rename to x-pack/plugins/siem/public/common/lib/connectors/components/connector_flyout/index.tsx index 10b1e75c6ea845..246a7cced37e5f 100644 --- a/x-pack/plugins/siem/public/lib/connectors/components/connector_flyout/index.tsx +++ b/x-pack/plugins/siem/public/common/lib/connectors/components/connector_flyout/index.tsx @@ -10,10 +10,10 @@ import { EuiFieldText, EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSpacer } from ' import { isEmpty, get } from 'lodash/fp'; // eslint-disable-next-line @kbn/eslint/no-restricted-paths -import { ActionConnectorFieldsProps } from '../../../../../../triggers_actions_ui/public/types'; -import { FieldMapping } from '../../../../pages/case/components/configure_cases/field_mapping'; +import { ActionConnectorFieldsProps } from '../../../../../../../triggers_actions_ui/public/types'; +import { FieldMapping } from '../../../../../cases/components/configure_cases/field_mapping'; -import { CasesConfigurationMapping } from '../../../../containers/case/configure/types'; +import { CasesConfigurationMapping } from '../../../../../cases/containers/configure/types'; import * as i18n from '../../translations'; import { ActionConnector, ConnectorFlyoutHOCProps } from '../../types'; diff --git a/x-pack/plugins/siem/public/lib/connectors/config.ts b/x-pack/plugins/siem/public/common/lib/connectors/config.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/config.ts rename to x-pack/plugins/siem/public/common/lib/connectors/config.ts diff --git a/x-pack/plugins/siem/public/lib/connectors/index.ts b/x-pack/plugins/siem/public/common/lib/connectors/index.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/index.ts rename to x-pack/plugins/siem/public/common/lib/connectors/index.ts diff --git a/x-pack/plugins/siem/public/lib/connectors/jira/config.ts b/x-pack/plugins/siem/public/common/lib/connectors/jira/config.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/jira/config.ts rename to x-pack/plugins/siem/public/common/lib/connectors/jira/config.ts diff --git a/x-pack/plugins/siem/public/lib/connectors/jira/flyout.tsx b/x-pack/plugins/siem/public/common/lib/connectors/jira/flyout.tsx similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/jira/flyout.tsx rename to x-pack/plugins/siem/public/common/lib/connectors/jira/flyout.tsx diff --git a/x-pack/plugins/siem/public/lib/connectors/jira/index.tsx b/x-pack/plugins/siem/public/common/lib/connectors/jira/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/lib/connectors/jira/index.tsx rename to x-pack/plugins/siem/public/common/lib/connectors/jira/index.tsx index 049ccb7cf17b7e..f7e293d9ad2f8e 100644 --- a/x-pack/plugins/siem/public/lib/connectors/jira/index.tsx +++ b/x-pack/plugins/siem/public/common/lib/connectors/jira/index.tsx @@ -8,7 +8,7 @@ import { lazy } from 'react'; import { ValidationResult, // eslint-disable-next-line @kbn/eslint/no-restricted-paths -} from '../../../../../triggers_actions_ui/public/types'; +} from '../../../../../../triggers_actions_ui/public/types'; import { connector } from './config'; import { createActionType } from '../utils'; diff --git a/x-pack/plugins/siem/public/lib/connectors/jira/logo.svg b/x-pack/plugins/siem/public/common/lib/connectors/jira/logo.svg similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/jira/logo.svg rename to x-pack/plugins/siem/public/common/lib/connectors/jira/logo.svg diff --git a/x-pack/plugins/siem/public/lib/connectors/jira/translations.ts b/x-pack/plugins/siem/public/common/lib/connectors/jira/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/jira/translations.ts rename to x-pack/plugins/siem/public/common/lib/connectors/jira/translations.ts diff --git a/x-pack/plugins/siem/public/lib/connectors/jira/types.ts b/x-pack/plugins/siem/public/common/lib/connectors/jira/types.ts similarity index 78% rename from x-pack/plugins/siem/public/lib/connectors/jira/types.ts rename to x-pack/plugins/siem/public/common/lib/connectors/jira/types.ts index d6b8a6cadcb902..fafb4a0d41fb3b 100644 --- a/x-pack/plugins/siem/public/lib/connectors/jira/types.ts +++ b/x-pack/plugins/siem/public/common/lib/connectors/jira/types.ts @@ -10,9 +10,9 @@ import { JiraPublicConfigurationType, JiraSecretConfigurationType, -} from '../../../../../actions/server/builtin_action_types/jira/types'; +} from '../../../../../../actions/server/builtin_action_types/jira/types'; -export { JiraFieldsType } from '../../../../../case/common/api/connectors'; +export { JiraFieldsType } from '../../../../../../case/common/api/connectors'; export * from '../types'; diff --git a/x-pack/plugins/siem/public/lib/connectors/servicenow/config.ts b/x-pack/plugins/siem/public/common/lib/connectors/servicenow/config.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/servicenow/config.ts rename to x-pack/plugins/siem/public/common/lib/connectors/servicenow/config.ts diff --git a/x-pack/plugins/siem/public/lib/connectors/servicenow/flyout.tsx b/x-pack/plugins/siem/public/common/lib/connectors/servicenow/flyout.tsx similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/servicenow/flyout.tsx rename to x-pack/plugins/siem/public/common/lib/connectors/servicenow/flyout.tsx diff --git a/x-pack/plugins/siem/public/lib/connectors/servicenow/index.tsx b/x-pack/plugins/siem/public/common/lib/connectors/servicenow/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/lib/connectors/servicenow/index.tsx rename to x-pack/plugins/siem/public/common/lib/connectors/servicenow/index.tsx index 0a239648271d1a..c9c5298365e817 100644 --- a/x-pack/plugins/siem/public/lib/connectors/servicenow/index.tsx +++ b/x-pack/plugins/siem/public/common/lib/connectors/servicenow/index.tsx @@ -8,7 +8,7 @@ import { lazy } from 'react'; import { ValidationResult, // eslint-disable-next-line @kbn/eslint/no-restricted-paths -} from '../../../../../triggers_actions_ui/public/types'; +} from '../../../../../../triggers_actions_ui/public/types'; import { connector } from './config'; import { createActionType } from '../utils'; import logo from './logo.svg'; diff --git a/x-pack/plugins/siem/public/lib/connectors/servicenow/logo.svg b/x-pack/plugins/siem/public/common/lib/connectors/servicenow/logo.svg similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/servicenow/logo.svg rename to x-pack/plugins/siem/public/common/lib/connectors/servicenow/logo.svg diff --git a/x-pack/plugins/siem/public/lib/connectors/servicenow/translations.ts b/x-pack/plugins/siem/public/common/lib/connectors/servicenow/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/servicenow/translations.ts rename to x-pack/plugins/siem/public/common/lib/connectors/servicenow/translations.ts diff --git a/x-pack/plugins/siem/public/lib/connectors/servicenow/types.ts b/x-pack/plugins/siem/public/common/lib/connectors/servicenow/types.ts similarity index 78% rename from x-pack/plugins/siem/public/lib/connectors/servicenow/types.ts rename to x-pack/plugins/siem/public/common/lib/connectors/servicenow/types.ts index 43da5624a497b4..b4a80e28c8d154 100644 --- a/x-pack/plugins/siem/public/lib/connectors/servicenow/types.ts +++ b/x-pack/plugins/siem/public/common/lib/connectors/servicenow/types.ts @@ -10,9 +10,9 @@ import { ServiceNowPublicConfigurationType, ServiceNowSecretConfigurationType, -} from '../../../../../actions/server/builtin_action_types/servicenow/types'; +} from '../../../../../../actions/server/builtin_action_types/servicenow/types'; -export { ServiceNowFieldsType } from '../../../../../case/common/api/connectors'; +export { ServiceNowFieldsType } from '../../../../../../case/common/api/connectors'; export * from '../types'; diff --git a/x-pack/plugins/siem/public/lib/connectors/translations.ts b/x-pack/plugins/siem/public/common/lib/connectors/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/translations.ts rename to x-pack/plugins/siem/public/common/lib/connectors/translations.ts diff --git a/x-pack/plugins/siem/public/lib/connectors/types.ts b/x-pack/plugins/siem/public/common/lib/connectors/types.ts similarity index 82% rename from x-pack/plugins/siem/public/lib/connectors/types.ts rename to x-pack/plugins/siem/public/common/lib/connectors/types.ts index 3d3692c9806e48..1d688ad9b1d6a9 100644 --- a/x-pack/plugins/siem/public/lib/connectors/types.ts +++ b/x-pack/plugins/siem/public/common/lib/connectors/types.ts @@ -7,13 +7,16 @@ /* eslint-disable no-restricted-imports */ /* eslint-disable @kbn/eslint/no-restricted-paths */ -import { ActionType } from '../../../../triggers_actions_ui/public'; -import { IErrorObject } from '../../../../triggers_actions_ui/public/types'; -import { ExternalIncidentServiceConfiguration } from '../../../../actions/server/builtin_action_types/case/types'; +import { ActionType } from '../../../../../triggers_actions_ui/public'; +import { IErrorObject } from '../../../../../triggers_actions_ui/public/types'; +import { ExternalIncidentServiceConfiguration } from '../../../../../actions/server/builtin_action_types/case/types'; -import { ActionType as ThirdPartySupportedActions, CaseField } from '../../../../case/common/api'; +import { + ActionType as ThirdPartySupportedActions, + CaseField, +} from '../../../../../case/common/api'; -export { ThirdPartyField as AllThirdPartyFields } from '../../../../case/common/api'; +export { ThirdPartyField as AllThirdPartyFields } from '../../../../../case/common/api'; export interface ThirdPartyField { label: string; diff --git a/x-pack/plugins/siem/public/lib/connectors/utils.ts b/x-pack/plugins/siem/public/common/lib/connectors/utils.ts similarity index 93% rename from x-pack/plugins/siem/public/lib/connectors/utils.ts rename to x-pack/plugins/siem/public/common/lib/connectors/utils.ts index cc1608a05e2ce8..b9c90a593b2020 100644 --- a/x-pack/plugins/siem/public/lib/connectors/utils.ts +++ b/x-pack/plugins/siem/public/common/lib/connectors/utils.ts @@ -8,7 +8,7 @@ import { ActionTypeModel, ValidationResult, // eslint-disable-next-line @kbn/eslint/no-restricted-paths -} from '../../../../triggers_actions_ui/public/types'; +} from '../../../../../triggers_actions_ui/public/types'; import { ActionConnector, @@ -20,7 +20,7 @@ import { import { isUrlInvalid } from './validators'; import * as i18n from './translations'; -import { CasesConfigurationMapping } from '../../containers/case/configure/types'; +import { CasesConfigurationMapping } from '../../../cases/containers/configure/types'; export const createActionType = ({ id, diff --git a/x-pack/plugins/siem/public/lib/connectors/validators.ts b/x-pack/plugins/siem/public/common/lib/connectors/validators.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/connectors/validators.ts rename to x-pack/plugins/siem/public/common/lib/connectors/validators.ts diff --git a/x-pack/plugins/siem/public/lib/helpers/index.test.tsx b/x-pack/plugins/siem/public/common/lib/helpers/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/lib/helpers/index.test.tsx rename to x-pack/plugins/siem/public/common/lib/helpers/index.test.tsx diff --git a/x-pack/plugins/siem/public/lib/helpers/index.tsx b/x-pack/plugins/siem/public/common/lib/helpers/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/lib/helpers/index.tsx rename to x-pack/plugins/siem/public/common/lib/helpers/index.tsx diff --git a/x-pack/plugins/siem/public/lib/helpers/scheduler.ts b/x-pack/plugins/siem/public/common/lib/helpers/scheduler.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/helpers/scheduler.ts rename to x-pack/plugins/siem/public/common/lib/helpers/scheduler.ts diff --git a/x-pack/plugins/siem/public/lib/history/index.ts b/x-pack/plugins/siem/public/common/lib/history/index.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/history/index.ts rename to x-pack/plugins/siem/public/common/lib/history/index.ts diff --git a/x-pack/plugins/siem/public/lib/keury/index.test.ts b/x-pack/plugins/siem/public/common/lib/keury/index.test.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/keury/index.test.ts rename to x-pack/plugins/siem/public/common/lib/keury/index.test.ts diff --git a/x-pack/plugins/siem/public/lib/keury/index.ts b/x-pack/plugins/siem/public/common/lib/keury/index.ts similarity index 95% rename from x-pack/plugins/siem/public/lib/keury/index.ts rename to x-pack/plugins/siem/public/common/lib/keury/index.ts index 810baa89cd60dc..53f845de48fb31 100644 --- a/x-pack/plugins/siem/public/lib/keury/index.ts +++ b/x-pack/plugins/siem/public/common/lib/keury/index.ts @@ -12,9 +12,9 @@ import { esQuery, esKuery, IIndexPattern, -} from '../../../../../../src/plugins/data/public'; +} from '../../../../../../../src/plugins/data/public'; -import { JsonObject } from '../../../../../../src/plugins/kibana_utils/public'; +import { JsonObject } from '../../../../../../../src/plugins/kibana_utils/public'; import { KueryFilterQuery } from '../../store'; diff --git a/x-pack/plugins/siem/public/lib/kibana/__mocks__/index.ts b/x-pack/plugins/siem/public/common/lib/kibana/__mocks__/index.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/kibana/__mocks__/index.ts rename to x-pack/plugins/siem/public/common/lib/kibana/__mocks__/index.ts diff --git a/x-pack/plugins/siem/public/lib/kibana/hooks.ts b/x-pack/plugins/siem/public/common/lib/kibana/hooks.ts similarity index 95% rename from x-pack/plugins/siem/public/lib/kibana/hooks.ts rename to x-pack/plugins/siem/public/common/lib/kibana/hooks.ts index d62701fe5944ab..ebdefa66b0ef36 100644 --- a/x-pack/plugins/siem/public/lib/kibana/hooks.ts +++ b/x-pack/plugins/siem/public/common/lib/kibana/hooks.ts @@ -8,11 +8,11 @@ import moment from 'moment-timezone'; import { useCallback, useEffect, useState } from 'react'; import { i18n } from '@kbn/i18n'; -import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../../../common/constants'; +import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../../../../common/constants'; import { useUiSetting, useKibana } from './kibana_react'; import { errorToToaster, useStateToaster } from '../../components/toasters'; -import { AuthenticatedUser } from '../../../../security/common/model'; -import { convertToCamelCase } from '../../containers/case/utils'; +import { AuthenticatedUser } from '../../../../../security/common/model'; +import { convertToCamelCase } from '../../../cases/containers/utils'; export const useDateFormat = (): string => useUiSetting(DEFAULT_DATE_FORMAT); diff --git a/x-pack/plugins/siem/public/lib/kibana/index.ts b/x-pack/plugins/siem/public/common/lib/kibana/index.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/kibana/index.ts rename to x-pack/plugins/siem/public/common/lib/kibana/index.ts diff --git a/x-pack/plugins/siem/public/lib/kibana/kibana_react.ts b/x-pack/plugins/siem/public/common/lib/kibana/kibana_react.ts similarity index 86% rename from x-pack/plugins/siem/public/lib/kibana/kibana_react.ts rename to x-pack/plugins/siem/public/common/lib/kibana/kibana_react.ts index 88be8d25e5840a..42738c6bbe7d8f 100644 --- a/x-pack/plugins/siem/public/lib/kibana/kibana_react.ts +++ b/x-pack/plugins/siem/public/common/lib/kibana/kibana_react.ts @@ -11,8 +11,8 @@ import { useUiSetting, useUiSetting$, withKibana, -} from '../../../../../../src/plugins/kibana_react/public'; -import { StartServices } from '../../plugin'; +} from '../../../../../../../src/plugins/kibana_react/public'; +import { StartServices } from '../../../plugin'; export type KibanaContext = KibanaReactContextValue; export interface WithKibanaProps { diff --git a/x-pack/plugins/siem/public/lib/kibana/services.ts b/x-pack/plugins/siem/public/common/lib/kibana/services.ts similarity index 89% rename from x-pack/plugins/siem/public/lib/kibana/services.ts rename to x-pack/plugins/siem/public/common/lib/kibana/services.ts index 4ab3e102f56ab5..8a8138691ba173 100644 --- a/x-pack/plugins/siem/public/lib/kibana/services.ts +++ b/x-pack/plugins/siem/public/common/lib/kibana/services.ts @@ -4,7 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { CoreStart } from '../../../../../../src/core/public'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import { CoreStart } from '../../../../../../../src/core/public'; type GlobalServices = Pick; diff --git a/x-pack/plugins/siem/public/lib/lib.ts b/x-pack/plugins/siem/public/common/lib/lib.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/lib.ts rename to x-pack/plugins/siem/public/common/lib/lib.ts diff --git a/x-pack/plugins/siem/public/lib/note/index.ts b/x-pack/plugins/siem/public/common/lib/note/index.ts similarity index 100% rename from x-pack/plugins/siem/public/lib/note/index.ts rename to x-pack/plugins/siem/public/common/lib/note/index.ts diff --git a/x-pack/plugins/siem/public/lib/telemetry/index.ts b/x-pack/plugins/siem/public/common/lib/telemetry/index.ts similarity index 96% rename from x-pack/plugins/siem/public/lib/telemetry/index.ts rename to x-pack/plugins/siem/public/common/lib/telemetry/index.ts index 37d181e9b8ad73..0ed524c2ae5483 100644 --- a/x-pack/plugins/siem/public/lib/telemetry/index.ts +++ b/x-pack/plugins/siem/public/common/lib/telemetry/index.ts @@ -6,7 +6,7 @@ import { METRIC_TYPE, UiStatsMetricType } from '@kbn/analytics'; -import { SetupPlugins } from '../../plugin'; +import { SetupPlugins } from '../../../plugin'; export { telemetryMiddleware } from './middleware'; export { METRIC_TYPE }; diff --git a/x-pack/plugins/siem/public/lib/telemetry/middleware.ts b/x-pack/plugins/siem/public/common/lib/telemetry/middleware.ts similarity index 91% rename from x-pack/plugins/siem/public/lib/telemetry/middleware.ts rename to x-pack/plugins/siem/public/common/lib/telemetry/middleware.ts index ca889e20e695f3..87acdddf87ed7e 100644 --- a/x-pack/plugins/siem/public/lib/telemetry/middleware.ts +++ b/x-pack/plugins/siem/public/common/lib/telemetry/middleware.ts @@ -7,7 +7,7 @@ import { Action, Dispatch, MiddlewareAPI } from 'redux'; import { track, METRIC_TYPE, TELEMETRY_EVENT } from './'; -import * as timelineActions from '../../store/timeline/actions'; +import * as timelineActions from '../../../timelines/store/timeline/actions'; export const telemetryMiddleware = (api: MiddlewareAPI) => (next: Dispatch) => (action: Action) => { if (timelineActions.endTimelineSaving.match(action)) { diff --git a/x-pack/plugins/siem/public/lib/theme/use_eui_theme.tsx b/x-pack/plugins/siem/public/common/lib/theme/use_eui_theme.tsx similarity index 89% rename from x-pack/plugins/siem/public/lib/theme/use_eui_theme.tsx rename to x-pack/plugins/siem/public/common/lib/theme/use_eui_theme.tsx index 1696001203bc87..23dae0d019f300 100644 --- a/x-pack/plugins/siem/public/lib/theme/use_eui_theme.tsx +++ b/x-pack/plugins/siem/public/common/lib/theme/use_eui_theme.tsx @@ -7,7 +7,7 @@ import darkTheme from '@elastic/eui/dist/eui_theme_dark.json'; import lightTheme from '@elastic/eui/dist/eui_theme_light.json'; -import { DEFAULT_DARK_MODE } from '../../../common/constants'; +import { DEFAULT_DARK_MODE } from '../../../../common/constants'; import { useUiSetting$ } from '../kibana'; export const useEuiTheme = () => { diff --git a/x-pack/plugins/siem/public/mock/global_state.ts b/x-pack/plugins/siem/public/common/mock/global_state.ts similarity index 95% rename from x-pack/plugins/siem/public/mock/global_state.ts rename to x-pack/plugins/siem/public/common/mock/global_state.ts index d0223b7834db00..e215aa7403ec9e 100644 --- a/x-pack/plugins/siem/public/mock/global_state.ts +++ b/x-pack/plugins/siem/public/common/mock/global_state.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { DEFAULT_TIMELINE_WIDTH } from '../components/timeline/body/constants'; +import { DEFAULT_TIMELINE_WIDTH } from '../../timelines/components/timeline/body/constants'; import { Direction, FlowTarget, @@ -13,8 +13,8 @@ import { NetworkTopTablesFields, TlsFields, UsersFields, -} from '../graphql/types'; -import { networkModel, State } from '../store'; +} from '../../graphql/types'; +import { State } from '../store'; import { defaultHeaders } from './header'; import { @@ -22,8 +22,9 @@ import { DEFAULT_TO, DEFAULT_INTERVAL_TYPE, DEFAULT_INTERVAL_VALUE, -} from '../../common/constants'; -import { TimelineType } from '../../common/types/timeline'; +} from '../../../common/constants'; +import { networkModel } from '../../network/store'; +import { TimelineType } from '../../../common/types/timeline'; export const mockGlobalState: State = { app: { diff --git a/x-pack/plugins/siem/public/mock/header.ts b/x-pack/plugins/siem/public/common/mock/header.ts similarity index 94% rename from x-pack/plugins/siem/public/mock/header.ts rename to x-pack/plugins/siem/public/common/mock/header.ts index 61af5a5f098b5d..51636e1efb254a 100644 --- a/x-pack/plugins/siem/public/mock/header.ts +++ b/x-pack/plugins/siem/public/common/mock/header.ts @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { ColumnHeaderOptions } from '../store/timeline/model'; -import { defaultColumnHeaderType } from '../components/timeline/body/column_headers/default_headers'; +import { ColumnHeaderOptions } from '../../timelines/store/timeline/model'; +import { defaultColumnHeaderType } from '../../timelines/components/timeline/body/column_headers/default_headers'; import { DEFAULT_COLUMN_MIN_WIDTH, DEFAULT_DATE_COLUMN_MIN_WIDTH, -} from '../components/timeline/body/constants'; +} from '../../timelines/components/timeline/body/constants'; export const defaultHeaders: ColumnHeaderOptions[] = [ { diff --git a/x-pack/plugins/siem/public/mock/hook_wrapper.tsx b/x-pack/plugins/siem/public/common/mock/hook_wrapper.tsx similarity index 100% rename from x-pack/plugins/siem/public/mock/hook_wrapper.tsx rename to x-pack/plugins/siem/public/common/mock/hook_wrapper.tsx diff --git a/x-pack/plugins/siem/public/mock/index.ts b/x-pack/plugins/siem/public/common/mock/index.ts similarity index 100% rename from x-pack/plugins/siem/public/mock/index.ts rename to x-pack/plugins/siem/public/common/mock/index.ts diff --git a/x-pack/plugins/siem/public/mock/index_pattern.ts b/x-pack/plugins/siem/public/common/mock/index_pattern.ts similarity index 100% rename from x-pack/plugins/siem/public/mock/index_pattern.ts rename to x-pack/plugins/siem/public/common/mock/index_pattern.ts diff --git a/x-pack/plugins/siem/public/mock/kibana_core.ts b/x-pack/plugins/siem/public/common/mock/kibana_core.ts similarity index 66% rename from x-pack/plugins/siem/public/mock/kibana_core.ts rename to x-pack/plugins/siem/public/common/mock/kibana_core.ts index b175ddbf5106db..e82c37e3a5b663 100644 --- a/x-pack/plugins/siem/public/mock/kibana_core.ts +++ b/x-pack/plugins/siem/public/common/mock/kibana_core.ts @@ -4,8 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { coreMock } from '../../../../../src/core/public/mocks'; -import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths +import { coreMock } from '../../../../../../src/core/public/mocks'; +import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks'; export const createKibanaCoreStartMock = () => coreMock.createStart(); export const createKibanaPluginsStartMock = () => ({ diff --git a/x-pack/plugins/siem/public/mock/kibana_react.ts b/x-pack/plugins/siem/public/common/mock/kibana_react.ts similarity index 95% rename from x-pack/plugins/siem/public/mock/kibana_react.ts rename to x-pack/plugins/siem/public/common/mock/kibana_react.ts index cebba3e237f986..0c51d39257a979 100644 --- a/x-pack/plugins/siem/public/mock/kibana_react.ts +++ b/x-pack/plugins/siem/public/common/mock/kibana_react.ts @@ -7,7 +7,7 @@ /* eslint-disable react/display-name */ import React from 'react'; -import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public'; +import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public'; import { DEFAULT_SIEM_TIME_RANGE, @@ -24,7 +24,7 @@ import { DEFAULT_INTERVAL_VALUE, DEFAULT_BYTES_FORMAT, DEFAULT_INDEX_PATTERN, -} from '../../common/constants'; +} from '../../../common/constants'; import { createKibanaCoreStartMock, createKibanaPluginsStartMock } from './kibana_core'; // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/x-pack/plugins/siem/public/mock/match_media.ts b/x-pack/plugins/siem/public/common/mock/match_media.ts similarity index 100% rename from x-pack/plugins/siem/public/mock/match_media.ts rename to x-pack/plugins/siem/public/common/mock/match_media.ts diff --git a/x-pack/plugins/siem/public/mock/mock_detail_item.ts b/x-pack/plugins/siem/public/common/mock/mock_detail_item.ts similarity index 98% rename from x-pack/plugins/siem/public/mock/mock_detail_item.ts rename to x-pack/plugins/siem/public/common/mock/mock_detail_item.ts index c25428649d5630..2395010a0ba2e6 100644 --- a/x-pack/plugins/siem/public/mock/mock_detail_item.ts +++ b/x-pack/plugins/siem/public/common/mock/mock_detail_item.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { DetailItem } from '../graphql/types'; +import { DetailItem } from '../../graphql/types'; export const mockDetailItemDataId = 'Y-6TfmcB0WOhS6qyMv3s'; diff --git a/x-pack/plugins/siem/public/mock/mock_ecs.ts b/x-pack/plugins/siem/public/common/mock/mock_ecs.ts similarity index 99% rename from x-pack/plugins/siem/public/mock/mock_ecs.ts rename to x-pack/plugins/siem/public/common/mock/mock_ecs.ts index 59e26039e6bffc..7fbbabb29da1b3 100644 --- a/x-pack/plugins/siem/public/mock/mock_ecs.ts +++ b/x-pack/plugins/siem/public/common/mock/mock_ecs.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Ecs } from '../graphql/types'; +import { Ecs } from '../../graphql/types'; export const mockEcsData: Ecs[] = [ { diff --git a/x-pack/plugins/siem/public/mock/mock_endgame_ecs_data.ts b/x-pack/plugins/siem/public/common/mock/mock_endgame_ecs_data.ts similarity index 99% rename from x-pack/plugins/siem/public/mock/mock_endgame_ecs_data.ts rename to x-pack/plugins/siem/public/common/mock/mock_endgame_ecs_data.ts index e6eee3d1c1cb1f..9b2cd14499db43 100644 --- a/x-pack/plugins/siem/public/mock/mock_endgame_ecs_data.ts +++ b/x-pack/plugins/siem/public/common/mock/mock_endgame_ecs_data.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Ecs } from '../graphql/types'; +import { Ecs } from '../../graphql/types'; export const mockEndgameDnsRequest: Ecs = { _id: 'S8jPcG0BOpWiDweSou3g', diff --git a/x-pack/plugins/siem/public/mock/mock_timeline_data.ts b/x-pack/plugins/siem/public/common/mock/mock_timeline_data.ts similarity index 99% rename from x-pack/plugins/siem/public/mock/mock_timeline_data.ts rename to x-pack/plugins/siem/public/common/mock/mock_timeline_data.ts index b300053d5f227d..7503062300d2d8 100644 --- a/x-pack/plugins/siem/public/mock/mock_timeline_data.ts +++ b/x-pack/plugins/siem/public/common/mock/mock_timeline_data.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Ecs, TimelineItem } from '../graphql/types'; +import { Ecs, TimelineItem } from '../../graphql/types'; export const mockTimelineData: TimelineItem[] = [ { diff --git a/x-pack/plugins/siem/public/mock/netflow.ts b/x-pack/plugins/siem/public/common/mock/netflow.ts similarity index 92% rename from x-pack/plugins/siem/public/mock/netflow.ts rename to x-pack/plugins/siem/public/common/mock/netflow.ts index 333188cca4b7e9..4dad794533374a 100644 --- a/x-pack/plugins/siem/public/mock/netflow.ts +++ b/x-pack/plugins/siem/public/common/mock/netflow.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { ONE_MILLISECOND_AS_NANOSECONDS } from '../components/formatted_duration/helpers'; -import { Ecs } from '../graphql/types'; +import { ONE_MILLISECOND_AS_NANOSECONDS } from '../../timelines/components/formatted_duration/helpers'; +import { Ecs } from '../../graphql/types'; /** Returns mock data for testing the Netflow component */ export const getMockNetflowData = (): Ecs => ({ diff --git a/x-pack/plugins/siem/public/mock/news.ts b/x-pack/plugins/siem/public/common/mock/news.ts similarity index 100% rename from x-pack/plugins/siem/public/mock/news.ts rename to x-pack/plugins/siem/public/common/mock/news.ts diff --git a/x-pack/plugins/siem/public/mock/raw_news.ts b/x-pack/plugins/siem/public/common/mock/raw_news.ts similarity index 100% rename from x-pack/plugins/siem/public/mock/raw_news.ts rename to x-pack/plugins/siem/public/common/mock/raw_news.ts diff --git a/x-pack/plugins/siem/public/mock/test_providers.tsx b/x-pack/plugins/siem/public/common/mock/test_providers.tsx similarity index 92% rename from x-pack/plugins/siem/public/mock/test_providers.tsx rename to x-pack/plugins/siem/public/common/mock/test_providers.tsx index 59e3874c6d0a1b..679e0bdc14cd5a 100644 --- a/x-pack/plugins/siem/public/mock/test_providers.tsx +++ b/x-pack/plugins/siem/public/common/mock/test_providers.tsx @@ -20,7 +20,8 @@ import { ThemeProvider } from 'styled-components'; import { createStore, State } from '../store'; import { mockGlobalState } from './global_state'; import { createKibanaContextProviderMock } from './kibana_react'; -import { FieldHook, useForm } from '../shared_imports'; +import { FieldHook, useForm } from '../../shared_imports'; +import { SUB_PLUGINS_REDUCER } from './utils'; const state: State = mockGlobalState; @@ -62,7 +63,7 @@ const MockKibanaContextProvider = createKibanaContextProviderMock(); /** A utility for wrapping children in the providers required to run most tests */ const TestProvidersComponent: React.FC = ({ children, - store = createStore(state, apolloClientObservable), + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable), onDragEnd = jest.fn(), }) => ( @@ -82,7 +83,7 @@ export const TestProviders = React.memo(TestProvidersComponent); const TestProviderWithoutDragAndDropComponent: React.FC = ({ children, - store = createStore(state, apolloClientObservable), + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable), }) => ( {children} diff --git a/x-pack/plugins/siem/public/mock/timeline_results.ts b/x-pack/plugins/siem/public/common/mock/timeline_results.ts similarity index 99% rename from x-pack/plugins/siem/public/mock/timeline_results.ts rename to x-pack/plugins/siem/public/common/mock/timeline_results.ts index 1af0f533a7ca95..b1a9b65874edc0 100644 --- a/x-pack/plugins/siem/public/mock/timeline_results.ts +++ b/x-pack/plugins/siem/public/common/mock/timeline_results.ts @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { FilterStateStore } from '../../../../../src/plugins/data/common/es_query/filters/meta_filter'; +import { FilterStateStore } from '../../../../../../src/plugins/data/common/es_query/filters/meta_filter'; -import { TimelineType } from '../../common/types/timeline'; +import { TimelineType } from '../../../common/types/timeline'; -import { OpenTimelineResult } from '../components/open_timeline/types'; -import { GetAllTimeline, SortFieldTimeline, TimelineResult, Direction } from '../graphql/types'; -import { allTimelinesQuery } from '../containers/timeline/all/index.gql_query'; -import { CreateTimelineProps } from '../pages/detection_engine/components/signals/types'; -import { TimelineModel } from '../store/timeline/model'; -import { timelineDefaults } from '../store/timeline/defaults'; +import { OpenTimelineResult } from '../../timelines/components/open_timeline/types'; +import { GetAllTimeline, SortFieldTimeline, TimelineResult, Direction } from '../../graphql/types'; +import { allTimelinesQuery } from '../../timelines/containers/all/index.gql_query'; +import { CreateTimelineProps } from '../../alerts/components/signals/types'; +import { TimelineModel } from '../../timelines/store/timeline/model'; +import { timelineDefaults } from '../../timelines/store/timeline/defaults'; export interface MockedProvidedQuery { request: { query: GetAllTimeline.Query; diff --git a/x-pack/plugins/siem/public/mock/utils.ts b/x-pack/plugins/siem/public/common/mock/utils.ts similarity index 57% rename from x-pack/plugins/siem/public/mock/utils.ts rename to x-pack/plugins/siem/public/common/mock/utils.ts index 6a372f163a648f..2b54bf83c0a9b7 100644 --- a/x-pack/plugins/siem/public/mock/utils.ts +++ b/x-pack/plugins/siem/public/common/mock/utils.ts @@ -4,9 +4,19 @@ * you may not use this file except in compliance with the Elastic License. */ +import { hostsReducer } from '../../hosts/store'; +import { networkReducer } from '../../network/store'; +import { timelineReducer } from '../../timelines/store/timeline/reducer'; + interface Global extends NodeJS.Global { // eslint-disable-next-line @typescript-eslint/no-explicit-any window?: any; } export const globalNode: Global = global; + +export const SUB_PLUGINS_REDUCER = { + hosts: hostsReducer, + network: networkReducer, + timeline: timelineReducer, +}; diff --git a/x-pack/plugins/siem/public/store/actions.ts b/x-pack/plugins/siem/public/common/store/actions.ts similarity index 74% rename from x-pack/plugins/siem/public/store/actions.ts rename to x-pack/plugins/siem/public/common/store/actions.ts index 12da695d2966d9..8a6c292c4893a2 100644 --- a/x-pack/plugins/siem/public/store/actions.ts +++ b/x-pack/plugins/siem/public/common/store/actions.ts @@ -6,7 +6,4 @@ export { appActions } from './app'; export { dragAndDropActions } from './drag_and_drop'; -export { hostsActions } from './hosts'; export { inputsActions } from './inputs'; -export { networkActions } from './network'; -export { timelineActions } from './timeline'; diff --git a/x-pack/plugins/siem/public/store/app/actions.ts b/x-pack/plugins/siem/public/common/store/app/actions.ts similarity index 100% rename from x-pack/plugins/siem/public/store/app/actions.ts rename to x-pack/plugins/siem/public/common/store/app/actions.ts diff --git a/x-pack/plugins/siem/public/store/app/index.ts b/x-pack/plugins/siem/public/common/store/app/index.ts similarity index 100% rename from x-pack/plugins/siem/public/store/app/index.ts rename to x-pack/plugins/siem/public/common/store/app/index.ts diff --git a/x-pack/plugins/siem/public/store/app/model.ts b/x-pack/plugins/siem/public/common/store/app/model.ts similarity index 100% rename from x-pack/plugins/siem/public/store/app/model.ts rename to x-pack/plugins/siem/public/common/store/app/model.ts diff --git a/x-pack/plugins/siem/public/store/app/reducer.ts b/x-pack/plugins/siem/public/common/store/app/reducer.ts similarity index 100% rename from x-pack/plugins/siem/public/store/app/reducer.ts rename to x-pack/plugins/siem/public/common/store/app/reducer.ts diff --git a/x-pack/plugins/siem/public/store/app/selectors.ts b/x-pack/plugins/siem/public/common/store/app/selectors.ts similarity index 100% rename from x-pack/plugins/siem/public/store/app/selectors.ts rename to x-pack/plugins/siem/public/common/store/app/selectors.ts diff --git a/x-pack/plugins/siem/public/store/constants.ts b/x-pack/plugins/siem/public/common/store/constants.ts similarity index 100% rename from x-pack/plugins/siem/public/store/constants.ts rename to x-pack/plugins/siem/public/common/store/constants.ts diff --git a/x-pack/plugins/siem/public/store/drag_and_drop/actions.ts b/x-pack/plugins/siem/public/common/store/drag_and_drop/actions.ts similarity index 86% rename from x-pack/plugins/siem/public/store/drag_and_drop/actions.ts rename to x-pack/plugins/siem/public/common/store/drag_and_drop/actions.ts index 5d3cdc5a126f92..82b544641adcb8 100644 --- a/x-pack/plugins/siem/public/store/drag_and_drop/actions.ts +++ b/x-pack/plugins/siem/public/common/store/drag_and_drop/actions.ts @@ -6,7 +6,7 @@ import actionCreatorFactory from 'typescript-fsa'; -import { DataProvider } from '../../components/timeline/data_providers/data_provider'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; const actionCreator = actionCreatorFactory('x-pack/siem/local/drag_and_drop'); diff --git a/x-pack/plugins/siem/public/store/drag_and_drop/index.ts b/x-pack/plugins/siem/public/common/store/drag_and_drop/index.ts similarity index 100% rename from x-pack/plugins/siem/public/store/drag_and_drop/index.ts rename to x-pack/plugins/siem/public/common/store/drag_and_drop/index.ts diff --git a/x-pack/plugins/siem/public/store/drag_and_drop/model.ts b/x-pack/plugins/siem/public/common/store/drag_and_drop/model.ts similarity index 79% rename from x-pack/plugins/siem/public/store/drag_and_drop/model.ts rename to x-pack/plugins/siem/public/common/store/drag_and_drop/model.ts index 6b6491b32a1d0e..e62bf05c042f8f 100644 --- a/x-pack/plugins/siem/public/store/drag_and_drop/model.ts +++ b/x-pack/plugins/siem/public/common/store/drag_and_drop/model.ts @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { DataProvider } from '../../components/timeline/data_providers/data_provider'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; export interface IdToDataProvider { [id: string]: DataProvider; diff --git a/x-pack/plugins/siem/public/store/drag_and_drop/reducer.test.ts b/x-pack/plugins/siem/public/common/store/drag_and_drop/reducer.test.ts similarity index 85% rename from x-pack/plugins/siem/public/store/drag_and_drop/reducer.test.ts rename to x-pack/plugins/siem/public/common/store/drag_and_drop/reducer.test.ts index e779b990b590e5..d89f7beb208d52 100644 --- a/x-pack/plugins/siem/public/store/drag_and_drop/reducer.test.ts +++ b/x-pack/plugins/siem/public/common/store/drag_and_drop/reducer.test.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { DataProvider } from '../../components/timeline/data_providers/data_provider'; -import { mockDataProviders } from '../../components/timeline/data_providers/mock/mock_data_providers'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { mockDataProviders } from '../../../timelines/components/timeline/data_providers/mock/mock_data_providers'; import { IdToDataProvider } from './model'; import { registerProviderHandler, unRegisterProviderHandler } from './reducer'; diff --git a/x-pack/plugins/siem/public/store/drag_and_drop/reducer.ts b/x-pack/plugins/siem/public/common/store/drag_and_drop/reducer.ts similarity index 93% rename from x-pack/plugins/siem/public/store/drag_and_drop/reducer.ts rename to x-pack/plugins/siem/public/common/store/drag_and_drop/reducer.ts index d5d49f3a0a1b1f..d402da136a5961 100644 --- a/x-pack/plugins/siem/public/store/drag_and_drop/reducer.ts +++ b/x-pack/plugins/siem/public/common/store/drag_and_drop/reducer.ts @@ -7,7 +7,7 @@ import { omit } from 'lodash/fp'; import { reducerWithInitialState } from 'typescript-fsa-reducers'; -import { DataProvider } from '../../components/timeline/data_providers/data_provider'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; import { registerProvider, unRegisterProvider } from './actions'; import { DragAndDropModel, IdToDataProvider } from './model'; diff --git a/x-pack/plugins/siem/public/store/drag_and_drop/selectors.ts b/x-pack/plugins/siem/public/common/store/drag_and_drop/selectors.ts similarity index 100% rename from x-pack/plugins/siem/public/store/drag_and_drop/selectors.ts rename to x-pack/plugins/siem/public/common/store/drag_and_drop/selectors.ts diff --git a/x-pack/plugins/siem/public/store/epic.ts b/x-pack/plugins/siem/public/common/store/epic.ts similarity index 59% rename from x-pack/plugins/siem/public/store/epic.ts rename to x-pack/plugins/siem/public/common/store/epic.ts index 336960588f48c6..b9e8e7d88c202a 100644 --- a/x-pack/plugins/siem/public/store/epic.ts +++ b/x-pack/plugins/siem/public/common/store/epic.ts @@ -5,10 +5,10 @@ */ import { combineEpics } from 'redux-observable'; -import { createTimelineEpic } from './timeline/epic'; -import { createTimelineFavoriteEpic } from './timeline/epic_favorite'; -import { createTimelineNoteEpic } from './timeline/epic_note'; -import { createTimelinePinnedEventEpic } from './timeline/epic_pinned_event'; +import { createTimelineEpic } from '../../timelines/store/timeline/epic'; +import { createTimelineFavoriteEpic } from '../../timelines/store/timeline/epic_favorite'; +import { createTimelineNoteEpic } from '../../timelines/store/timeline/epic_note'; +import { createTimelinePinnedEventEpic } from '../../timelines/store/timeline/epic_pinned_event'; export const createRootEpic = () => combineEpics( diff --git a/x-pack/plugins/siem/public/store/index.ts b/x-pack/plugins/siem/public/common/store/index.ts similarity index 100% rename from x-pack/plugins/siem/public/store/index.ts rename to x-pack/plugins/siem/public/common/store/index.ts diff --git a/x-pack/plugins/siem/public/store/inputs/actions.ts b/x-pack/plugins/siem/public/common/store/inputs/actions.ts similarity index 96% rename from x-pack/plugins/siem/public/store/inputs/actions.ts rename to x-pack/plugins/siem/public/common/store/inputs/actions.ts index 04cdf5246de2ce..5b26957843f082 100644 --- a/x-pack/plugins/siem/public/store/inputs/actions.ts +++ b/x-pack/plugins/siem/public/common/store/inputs/actions.ts @@ -8,7 +8,7 @@ import actionCreatorFactory from 'typescript-fsa'; import { InspectQuery, Refetch, RefetchKql } from './model'; import { InputsModelId } from './constants'; -import { Filter, SavedQuery } from '../../../../../../src/plugins/data/public'; +import { Filter, SavedQuery } from '../../../../../../../src/plugins/data/public'; const actionCreator = actionCreatorFactory('x-pack/siem/local/inputs'); diff --git a/x-pack/plugins/siem/public/store/inputs/constants.ts b/x-pack/plugins/siem/public/common/store/inputs/constants.ts similarity index 100% rename from x-pack/plugins/siem/public/store/inputs/constants.ts rename to x-pack/plugins/siem/public/common/store/inputs/constants.ts diff --git a/x-pack/plugins/siem/public/store/inputs/helpers.test.ts b/x-pack/plugins/siem/public/common/store/inputs/helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/store/inputs/helpers.test.ts rename to x-pack/plugins/siem/public/common/store/inputs/helpers.test.ts diff --git a/x-pack/plugins/siem/public/store/inputs/helpers.ts b/x-pack/plugins/siem/public/common/store/inputs/helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/store/inputs/helpers.ts rename to x-pack/plugins/siem/public/common/store/inputs/helpers.ts diff --git a/x-pack/plugins/siem/public/store/inputs/index.ts b/x-pack/plugins/siem/public/common/store/inputs/index.ts similarity index 100% rename from x-pack/plugins/siem/public/store/inputs/index.ts rename to x-pack/plugins/siem/public/common/store/inputs/index.ts diff --git a/x-pack/plugins/siem/public/store/inputs/model.ts b/x-pack/plugins/siem/public/common/store/inputs/model.ts similarity index 96% rename from x-pack/plugins/siem/public/store/inputs/model.ts rename to x-pack/plugins/siem/public/common/store/inputs/model.ts index 3e6be6ce859e59..e851caf523eb4b 100644 --- a/x-pack/plugins/siem/public/store/inputs/model.ts +++ b/x-pack/plugins/siem/public/common/store/inputs/model.ts @@ -7,7 +7,7 @@ import { Dispatch } from 'redux'; import { InputsModelId } from './constants'; import { CONSTANTS } from '../../components/url_state/constants'; -import { Query, Filter, SavedQuery } from '../../../../../../src/plugins/data/public'; +import { Query, Filter, SavedQuery } from '../../../../../../../src/plugins/data/public'; export interface AbsoluteTimeRange { kind: 'absolute'; diff --git a/x-pack/plugins/siem/public/store/inputs/reducer.ts b/x-pack/plugins/siem/public/common/store/inputs/reducer.ts similarity index 100% rename from x-pack/plugins/siem/public/store/inputs/reducer.ts rename to x-pack/plugins/siem/public/common/store/inputs/reducer.ts diff --git a/x-pack/plugins/siem/public/store/inputs/selectors.ts b/x-pack/plugins/siem/public/common/store/inputs/selectors.ts similarity index 100% rename from x-pack/plugins/siem/public/store/inputs/selectors.ts rename to x-pack/plugins/siem/public/common/store/inputs/selectors.ts diff --git a/x-pack/plugins/siem/public/store/model.ts b/x-pack/plugins/siem/public/common/store/model.ts similarity index 83% rename from x-pack/plugins/siem/public/store/model.ts rename to x-pack/plugins/siem/public/common/store/model.ts index 686dc096e61b01..0032a95cce321a 100644 --- a/x-pack/plugins/siem/public/store/model.ts +++ b/x-pack/plugins/siem/public/common/store/model.ts @@ -6,7 +6,5 @@ export { appModel } from './app'; export { dragAndDropModel } from './drag_and_drop'; -export { hostsModel } from './hosts'; export { inputsModel } from './inputs'; -export { networkModel } from './network'; export * from './types'; diff --git a/x-pack/plugins/siem/public/common/store/reducer.ts b/x-pack/plugins/siem/public/common/store/reducer.ts new file mode 100644 index 00000000000000..da1dcd3ea9e730 --- /dev/null +++ b/x-pack/plugins/siem/public/common/store/reducer.ts @@ -0,0 +1,46 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineReducers } from 'redux'; + +import { appReducer, AppState, initialAppState } from './app'; +import { dragAndDropReducer, DragAndDropState, initialDragAndDropState } from './drag_and_drop'; +import { createInitialInputsState, initialInputsState, inputsReducer, InputsState } from './inputs'; + +import { HostsPluginState, HostsPluginReducer } from '../../hosts/store'; +import { NetworkPluginState, NetworkPluginReducer } from '../../network/store'; +import { TimelinePluginState, TimelinePluginReducer } from '../../timelines/store/timeline'; + +export interface State extends HostsPluginState, NetworkPluginState, TimelinePluginState { + app: AppState; + dragAndDrop: DragAndDropState; + inputs: InputsState; +} + +export const initialState: Pick = { + app: initialAppState, + dragAndDrop: initialDragAndDropState, + inputs: initialInputsState, +}; + +type SubPluginsInitState = HostsPluginState & NetworkPluginState & TimelinePluginState; +export type SubPluginsInitReducer = HostsPluginReducer & + NetworkPluginReducer & + TimelinePluginReducer; + +export const createInitialState = (pluginsInitState: SubPluginsInitState): State => ({ + ...initialState, + ...pluginsInitState, + inputs: createInitialInputsState(), +}); + +export const createReducer = (pluginsReducer: SubPluginsInitReducer) => + combineReducers({ + app: appReducer, + dragAndDrop: dragAndDropReducer, + inputs: inputsReducer, + ...pluginsReducer, + }); diff --git a/x-pack/plugins/siem/public/store/selectors.ts b/x-pack/plugins/siem/public/common/store/selectors.ts similarity index 73% rename from x-pack/plugins/siem/public/store/selectors.ts rename to x-pack/plugins/siem/public/common/store/selectors.ts index b188f95ad27cfa..b938bae39b634b 100644 --- a/x-pack/plugins/siem/public/store/selectors.ts +++ b/x-pack/plugins/siem/public/common/store/selectors.ts @@ -6,7 +6,4 @@ export { appSelectors } from './app'; export { dragAndDropSelectors } from './drag_and_drop'; -export { hostsSelectors } from './hosts'; export { inputsSelectors } from './inputs'; -export { networkSelectors } from './network'; -export { timelineSelectors } from './timeline'; diff --git a/x-pack/plugins/siem/public/store/store.ts b/x-pack/plugins/siem/public/common/store/store.ts similarity index 87% rename from x-pack/plugins/siem/public/store/store.ts rename to x-pack/plugins/siem/public/common/store/store.ts index 2af0f87b4494d9..ea7cb417fb24b2 100644 --- a/x-pack/plugins/siem/public/store/store.ts +++ b/x-pack/plugins/siem/public/common/store/store.ts @@ -9,13 +9,13 @@ import { Action, applyMiddleware, compose, createStore as createReduxStore, Stor import { createEpicMiddleware } from 'redux-observable'; import { Observable } from 'rxjs'; -import { AppApolloClient } from '../lib/lib'; import { telemetryMiddleware } from '../lib/telemetry'; import { appSelectors } from './app'; -import { timelineSelectors } from './timeline'; +import { timelineSelectors } from '../../timelines/store/timeline'; import { inputsSelectors } from './inputs'; -import { State, initialState, reducer } from './reducer'; +import { State, SubPluginsInitReducer, createReducer } from './reducer'; import { createRootEpic } from './epic'; +import { AppApolloClient } from '../lib/lib'; type ComposeType = typeof compose; declare global { @@ -24,8 +24,10 @@ declare global { } } let store: Store | null = null; +export { SubPluginsInitReducer }; export const createStore = ( - state: State = initialState, + state: State, + pluginsReducer: SubPluginsInitReducer, apolloClient: Observable ): Store => { const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; @@ -45,7 +47,7 @@ export const createStore = ( ); store = createReduxStore( - reducer, + createReducer(pluginsReducer), state, composeEnhancers(applyMiddleware(epicMiddleware, telemetryMiddleware)) ); diff --git a/x-pack/plugins/siem/public/store/types.ts b/x-pack/plugins/siem/public/common/store/types.ts similarity index 100% rename from x-pack/plugins/siem/public/store/types.ts rename to x-pack/plugins/siem/public/common/store/types.ts diff --git a/x-pack/plugins/siem/public/pages/common/translations.ts b/x-pack/plugins/siem/public/common/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/common/translations.ts rename to x-pack/plugins/siem/public/common/translations.ts diff --git a/x-pack/plugins/siem/public/utils/api/index.ts b/x-pack/plugins/siem/public/common/utils/api/index.ts similarity index 100% rename from x-pack/plugins/siem/public/utils/api/index.ts rename to x-pack/plugins/siem/public/common/utils/api/index.ts diff --git a/x-pack/plugins/siem/public/utils/apollo_context.ts b/x-pack/plugins/siem/public/common/utils/apollo_context.ts similarity index 100% rename from x-pack/plugins/siem/public/utils/apollo_context.ts rename to x-pack/plugins/siem/public/common/utils/apollo_context.ts diff --git a/x-pack/plugins/siem/public/utils/default_date_settings.test.ts b/x-pack/plugins/siem/public/common/utils/default_date_settings.test.ts similarity index 99% rename from x-pack/plugins/siem/public/utils/default_date_settings.test.ts rename to x-pack/plugins/siem/public/common/utils/default_date_settings.test.ts index 9dc179ba7a6e2d..3ae3ef2326ea2b 100644 --- a/x-pack/plugins/siem/public/utils/default_date_settings.test.ts +++ b/x-pack/plugins/siem/public/common/utils/default_date_settings.test.ts @@ -21,7 +21,7 @@ import { DEFAULT_INTERVAL_PAUSE, DEFAULT_INTERVAL_VALUE, DEFAULT_INTERVAL_TYPE, -} from '../../common/constants'; +} from '../../../common/constants'; import { KibanaServices } from '../lib/kibana'; import { Policy } from '../store/inputs/model'; @@ -30,7 +30,7 @@ import { Policy } from '../store/inputs/model'; // we have to repeat ourselves once const DEFAULT_FROM_DATE = '1983-05-31T13:03:54.234Z'; const DEFAULT_TO_DATE = '1990-05-31T13:03:54.234Z'; -jest.mock('../../common/constants', () => ({ +jest.mock('../../../common/constants', () => ({ DEFAULT_FROM: '1983-05-31T13:03:54.234Z', DEFAULT_TO: '1990-05-31T13:03:54.234Z', DEFAULT_INTERVAL_PAUSE: true, diff --git a/x-pack/plugins/siem/public/utils/default_date_settings.ts b/x-pack/plugins/siem/public/common/utils/default_date_settings.ts similarity index 98% rename from x-pack/plugins/siem/public/utils/default_date_settings.ts rename to x-pack/plugins/siem/public/common/utils/default_date_settings.ts index c4869a4851ae50..3523a02ea44f50 100644 --- a/x-pack/plugins/siem/public/utils/default_date_settings.ts +++ b/x-pack/plugins/siem/public/common/utils/default_date_settings.ts @@ -15,7 +15,7 @@ import { DEFAULT_TO, DEFAULT_INTERVAL_TYPE, DEFAULT_INTERVAL_VALUE, -} from '../../common/constants'; +} from '../../../common/constants'; import { KibanaServices } from '../lib/kibana'; import { Policy } from '../store/inputs/model'; diff --git a/x-pack/plugins/siem/public/utils/kql/use_update_kql.test.tsx b/x-pack/plugins/siem/public/common/utils/kql/use_update_kql.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/utils/kql/use_update_kql.test.tsx rename to x-pack/plugins/siem/public/common/utils/kql/use_update_kql.test.tsx index b70a5432e47f84..9b1a397deb17fb 100644 --- a/x-pack/plugins/siem/public/utils/kql/use_update_kql.test.tsx +++ b/x-pack/plugins/siem/public/common/utils/kql/use_update_kql.test.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { applyKqlFilterQuery as dispatchApplyTimelineFilterQuery } from '../../store/timeline/actions'; +import { applyKqlFilterQuery as dispatchApplyTimelineFilterQuery } from '../../../timelines/store/timeline/actions'; import { mockIndexPattern } from '../../mock/index_pattern'; import { useUpdateKql } from './use_update_kql'; @@ -14,7 +14,7 @@ mockDispatch.mockImplementation(fn => fn); const applyTimelineKqlMock: jest.Mock = (dispatchApplyTimelineFilterQuery as unknown) as jest.Mock; -jest.mock('../../store/timeline/actions', () => ({ +jest.mock('../../../timelines/store/timeline/actions', () => ({ applyKqlFilterQuery: jest.fn(), })); diff --git a/x-pack/plugins/siem/public/utils/kql/use_update_kql.tsx b/x-pack/plugins/siem/public/common/utils/kql/use_update_kql.tsx similarity index 96% rename from x-pack/plugins/siem/public/utils/kql/use_update_kql.tsx rename to x-pack/plugins/siem/public/common/utils/kql/use_update_kql.tsx index af993588f7e0dc..d1f5b40086ceaa 100644 --- a/x-pack/plugins/siem/public/utils/kql/use_update_kql.tsx +++ b/x-pack/plugins/siem/public/common/utils/kql/use_update_kql.tsx @@ -9,7 +9,7 @@ import { IIndexPattern } from 'src/plugins/data/public'; import deepEqual from 'fast-deep-equal'; import { KueryFilterQuery } from '../../store'; -import { applyKqlFilterQuery as dispatchApplyTimelineFilterQuery } from '../../store/timeline/actions'; +import { applyKqlFilterQuery as dispatchApplyTimelineFilterQuery } from '../../../timelines/store/timeline/actions'; import { convertKueryToElasticSearchQuery } from '../../lib/keury'; import { RefetchKql } from '../../store/inputs/model'; diff --git a/x-pack/plugins/siem/public/utils/logo_endpoint/64_color.svg b/x-pack/plugins/siem/public/common/utils/logo_endpoint/64_color.svg similarity index 100% rename from x-pack/plugins/siem/public/utils/logo_endpoint/64_color.svg rename to x-pack/plugins/siem/public/common/utils/logo_endpoint/64_color.svg diff --git a/x-pack/plugins/siem/public/utils/route/helpers.ts b/x-pack/plugins/siem/public/common/utils/route/helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/utils/route/helpers.ts rename to x-pack/plugins/siem/public/common/utils/route/helpers.ts diff --git a/x-pack/plugins/siem/public/utils/route/index.test.tsx b/x-pack/plugins/siem/public/common/utils/route/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/utils/route/index.test.tsx rename to x-pack/plugins/siem/public/common/utils/route/index.test.tsx index e777d281ed51ab..95e40b0f66301a 100644 --- a/x-pack/plugins/siem/public/utils/route/index.test.tsx +++ b/x-pack/plugins/siem/public/common/utils/route/index.test.tsx @@ -7,7 +7,7 @@ import { mount } from 'enzyme'; import React from 'react'; -import { HostsTableType } from '../../store/hosts/model'; +import { HostsTableType } from '../../../hosts/store/model'; import { RouteSpyState } from './types'; import { ManageRoutesSpy } from './manage_spy_routes'; import { SpyRouteComponent } from './spy_routes'; diff --git a/x-pack/plugins/siem/public/utils/route/manage_spy_routes.tsx b/x-pack/plugins/siem/public/common/utils/route/manage_spy_routes.tsx similarity index 100% rename from x-pack/plugins/siem/public/utils/route/manage_spy_routes.tsx rename to x-pack/plugins/siem/public/common/utils/route/manage_spy_routes.tsx diff --git a/x-pack/plugins/siem/public/utils/route/spy_routes.tsx b/x-pack/plugins/siem/public/common/utils/route/spy_routes.tsx similarity index 100% rename from x-pack/plugins/siem/public/utils/route/spy_routes.tsx rename to x-pack/plugins/siem/public/common/utils/route/spy_routes.tsx diff --git a/x-pack/plugins/siem/public/utils/route/types.ts b/x-pack/plugins/siem/public/common/utils/route/types.ts similarity index 86% rename from x-pack/plugins/siem/public/utils/route/types.ts rename to x-pack/plugins/siem/public/common/utils/route/types.ts index 17b312a427c435..912da545a66a3c 100644 --- a/x-pack/plugins/siem/public/utils/route/types.ts +++ b/x-pack/plugins/siem/public/common/utils/route/types.ts @@ -8,11 +8,11 @@ import * as H from 'history'; import React from 'react'; import { RouteComponentProps } from 'react-router-dom'; -import { TimelineType } from '../../../common/types/timeline'; +import { TimelineType } from '../../../../common/types/timeline'; -import { HostsTableType } from '../../store/hosts/model'; -import { NetworkRouteType } from '../../pages/network/navigation/types'; -import { FlowTarget } from '../../graphql/types'; +import { HostsTableType } from '../../../hosts/store/model'; +import { NetworkRouteType } from '../../../network/pages/navigation/types'; +import { FlowTarget } from '../../../graphql/types'; export type SiemRouteType = HostsTableType | NetworkRouteType | TimelineType; export interface RouteSpyState { diff --git a/x-pack/plugins/siem/public/utils/route/use_route_spy.tsx b/x-pack/plugins/siem/public/common/utils/route/use_route_spy.tsx similarity index 100% rename from x-pack/plugins/siem/public/utils/route/use_route_spy.tsx rename to x-pack/plugins/siem/public/common/utils/route/use_route_spy.tsx diff --git a/x-pack/plugins/siem/public/utils/saved_query_services/index.tsx b/x-pack/plugins/siem/public/common/utils/saved_query_services/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/utils/saved_query_services/index.tsx rename to x-pack/plugins/siem/public/common/utils/saved_query_services/index.tsx index 335398177f0f43..a8ee10ba2b8014 100644 --- a/x-pack/plugins/siem/public/utils/saved_query_services/index.tsx +++ b/x-pack/plugins/siem/public/common/utils/saved_query_services/index.tsx @@ -8,7 +8,7 @@ import { useState, useEffect } from 'react'; import { SavedQueryService, createSavedQueryService, -} from '../../../../../../src/plugins/data/public'; +} from '../../../../../../../src/plugins/data/public'; import { useKibana } from '../../lib/kibana'; diff --git a/x-pack/plugins/siem/public/utils/timeline/use_show_timeline.tsx b/x-pack/plugins/siem/public/common/utils/timeline/use_show_timeline.tsx similarity index 94% rename from x-pack/plugins/siem/public/utils/timeline/use_show_timeline.tsx rename to x-pack/plugins/siem/public/common/utils/timeline/use_show_timeline.tsx index e969330b809ff1..78f22a86c1893f 100644 --- a/x-pack/plugins/siem/public/utils/timeline/use_show_timeline.tsx +++ b/x-pack/plugins/siem/public/common/utils/timeline/use_show_timeline.tsx @@ -7,7 +7,7 @@ import { useLocation } from 'react-router-dom'; import { useState, useEffect } from 'react'; -import { SiemPageName } from '../../pages/home/types'; +import { SiemPageName } from '../../../app/types'; const hideTimelineForRoutes = [`/${SiemPageName.case}/configure`]; diff --git a/x-pack/plugins/siem/public/utils/use_mount_appended.ts b/x-pack/plugins/siem/public/common/utils/use_mount_appended.ts similarity index 100% rename from x-pack/plugins/siem/public/utils/use_mount_appended.ts rename to x-pack/plugins/siem/public/common/utils/use_mount_appended.ts diff --git a/x-pack/plugins/siem/public/utils/validators/index.ts b/x-pack/plugins/siem/public/common/utils/validators/index.ts similarity index 100% rename from x-pack/plugins/siem/public/utils/validators/index.ts rename to x-pack/plugins/siem/public/common/utils/validators/index.ts diff --git a/x-pack/plugins/siem/public/components/page/network/index.tsx b/x-pack/plugins/siem/public/components/page/network/index.tsx deleted file mode 100644 index 1f502635a8de4c..00000000000000 --- a/x-pack/plugins/siem/public/components/page/network/index.tsx +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -export { IpOverview } from './ip_overview'; -export { KpiNetworkComponent } from './kpi_network'; -export { NetworkDnsTable } from './network_dns_table'; -export { NetworkTopCountriesTable } from './network_top_countries_table'; -export { NetworkTopNFlowTable } from './network_top_n_flow_table'; -export { NetworkHttpTable } from './network_http_table'; diff --git a/x-pack/plugins/siem/public/components/page/hosts/authentications_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/hosts/components/authentications_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/authentications_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/hosts/components/authentications_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx b/x-pack/plugins/siem/public/hosts/components/authentications_table/index.test.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx rename to x-pack/plugins/siem/public/hosts/components/authentications_table/index.test.tsx index d7c25e97b3838d..2c39db2ab7340e 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/authentications_table/index.test.tsx +++ b/x-pack/plugins/siem/public/hosts/components/authentications_table/index.test.tsx @@ -9,9 +9,9 @@ import { getOr } from 'lodash/fp'; import React from 'react'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { apolloClientObservable, mockGlobalState } from '../../../../mock'; -import { createStore, hostsModel, State } from '../../../../store'; - +import { apolloClientObservable, mockGlobalState, SUB_PLUGINS_REDUCER } from '../../../common/mock'; +import { createStore, State } from '../../../common/store'; +import { hostsModel } from '../../store'; import { mockData } from './mock'; import * as i18n from './translations'; import { AuthenticationTable, getAuthenticationColumnsCurated } from '.'; @@ -20,10 +20,10 @@ describe('Authentication Table Component', () => { const loadPage = jest.fn(); const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/hosts/authentications_table/index.tsx b/x-pack/plugins/siem/public/hosts/components/authentications_table/index.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/page/hosts/authentications_table/index.tsx rename to x-pack/plugins/siem/public/hosts/components/authentications_table/index.tsx index 678faff7654db8..ef28f268bb73a5 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/authentications_table/index.tsx +++ b/x-pack/plugins/siem/public/hosts/components/authentications_table/index.tsx @@ -10,20 +10,23 @@ import { has } from 'lodash/fp'; import React, { useCallback, useMemo } from 'react'; import { connect, ConnectedProps } from 'react-redux'; -import { hostsActions } from '../../../../store/hosts'; -import { AuthenticationsEdges } from '../../../../graphql/types'; -import { hostsModel, hostsSelectors, State } from '../../../../store'; -import { DragEffects, DraggableWrapper } from '../../../drag_and_drop/draggable_wrapper'; -import { escapeDataProviderId } from '../../../drag_and_drop/helpers'; -import { getEmptyTagValue } from '../../../empty_value'; -import { FormattedRelativePreferenceDate } from '../../../formatted_date'; -import { HostDetailsLink, IPDetailsLink } from '../../../links'; -import { Columns, ItemsPerRow, PaginatedTable } from '../../../paginated_table'; -import { IS_OPERATOR } from '../../../timeline/data_providers/data_provider'; -import { Provider } from '../../../timeline/data_providers/provider'; +import { hostsActions, hostsModel, hostsSelectors } from '../../store'; +import { AuthenticationsEdges } from '../../../graphql/types'; +import { State } from '../../../common/store'; +import { + DragEffects, + DraggableWrapper, +} from '../../../common/components/drag_and_drop/draggable_wrapper'; +import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { FormattedRelativePreferenceDate } from '../../../common/components/formatted_date'; +import { HostDetailsLink, IPDetailsLink } from '../../../common/components/links'; +import { Columns, ItemsPerRow, PaginatedTable } from '../../../common/components/paginated_table'; +import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Provider } from '../../../timelines/components/timeline/data_providers/provider'; import * as i18n from './translations'; -import { getRowItemDraggables } from '../../../tables/helpers'; +import { getRowItemDraggables } from '../../../common/components/tables/helpers'; const tableType = hostsModel.HostsTableType.authentications; diff --git a/x-pack/plugins/siem/public/components/page/hosts/authentications_table/mock.ts b/x-pack/plugins/siem/public/hosts/components/authentications_table/mock.ts similarity index 96% rename from x-pack/plugins/siem/public/components/page/hosts/authentications_table/mock.ts rename to x-pack/plugins/siem/public/hosts/components/authentications_table/mock.ts index 50a1fa8eb7d72e..84682fd14ac6ba 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/authentications_table/mock.ts +++ b/x-pack/plugins/siem/public/hosts/components/authentications_table/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { AuthenticationsData } from '../../../../graphql/types'; +import { AuthenticationsData } from '../../../graphql/types'; export const mockData: { Authentications: AuthenticationsData } = { Authentications: { diff --git a/x-pack/plugins/siem/public/components/page/hosts/authentications_table/translations.ts b/x-pack/plugins/siem/public/hosts/components/authentications_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/authentications_table/translations.ts rename to x-pack/plugins/siem/public/hosts/components/authentications_table/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx b/x-pack/plugins/siem/public/hosts/components/first_last_seen_host/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx rename to x-pack/plugins/siem/public/hosts/components/first_last_seen_host/index.test.tsx index 4a836333f3311c..9715c1cb5c8b45 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/first_last_seen_host/index.test.tsx +++ b/x-pack/plugins/siem/public/hosts/components/first_last_seen_host/index.test.tsx @@ -9,9 +9,9 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { render, act } from '@testing-library/react'; -import { mockFirstLastSeenHostQuery } from '../../../../containers/hosts/first_last_seen/mock'; -import { wait } from '../../../../lib/helpers'; -import { TestProviders } from '../../../../mock'; +import { mockFirstLastSeenHostQuery } from '../../containers/hosts/first_last_seen/mock'; +import { wait } from '../../../common/lib/helpers'; +import { TestProviders } from '../../../common/mock'; import { FirstLastSeenHost, FirstLastSeenHostType } from '.'; diff --git a/x-pack/plugins/siem/public/components/page/hosts/first_last_seen_host/index.tsx b/x-pack/plugins/siem/public/hosts/components/first_last_seen_host/index.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/page/hosts/first_last_seen_host/index.tsx rename to x-pack/plugins/siem/public/hosts/components/first_last_seen_host/index.tsx index 70dff5eda59395..05e65b496fae04 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/first_last_seen_host/index.tsx +++ b/x-pack/plugins/siem/public/hosts/components/first_last_seen_host/index.tsx @@ -8,9 +8,9 @@ import { EuiIcon, EuiLoadingSpinner, EuiText, EuiToolTip } from '@elastic/eui'; import React from 'react'; import { ApolloConsumer } from 'react-apollo'; -import { useFirstLastSeenHostQuery } from '../../../../containers/hosts/first_last_seen'; -import { getEmptyTagValue } from '../../../empty_value'; -import { FormattedRelativePreferenceDate } from '../../../formatted_date'; +import { useFirstLastSeenHostQuery } from '../../containers/hosts/first_last_seen'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { FormattedRelativePreferenceDate } from '../../../common/components/formatted_date'; export enum FirstLastSeenHostType { FIRST_SEEN = 'first-seen', diff --git a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/hosts/components/hosts_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/hosts_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/hosts/components/hosts_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx b/x-pack/plugins/siem/public/hosts/components/hosts_table/columns.tsx similarity index 79% rename from x-pack/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx rename to x-pack/plugins/siem/public/hosts/components/hosts_table/columns.tsx index 6bd82f3192f9be..6b3097e1feabb6 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/columns.tsx +++ b/x-pack/plugins/siem/public/hosts/components/hosts_table/columns.tsx @@ -6,14 +6,20 @@ import { EuiIcon, EuiToolTip } from '@elastic/eui'; import React from 'react'; -import { DragEffects, DraggableWrapper } from '../../../drag_and_drop/draggable_wrapper'; -import { escapeDataProviderId } from '../../../drag_and_drop/helpers'; -import { getEmptyTagValue } from '../../../empty_value'; -import { HostDetailsLink } from '../../../links'; -import { FormattedRelativePreferenceDate } from '../../../formatted_date'; -import { IS_OPERATOR } from '../../../timeline/data_providers/data_provider'; -import { Provider } from '../../../timeline/data_providers/provider'; -import { AddFilterToGlobalSearchBar, createFilter } from '../../add_filter_to_global_search_bar'; +import { + DragEffects, + DraggableWrapper, +} from '../../../common/components/drag_and_drop/draggable_wrapper'; +import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { HostDetailsLink } from '../../../common/components/links'; +import { FormattedRelativePreferenceDate } from '../../../common/components/formatted_date'; +import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Provider } from '../../../timelines/components/timeline/data_providers/provider'; +import { + AddFilterToGlobalSearchBar, + createFilter, +} from '../../../common/components/add_filter_to_global_search_bar'; import { HostsTableColumns } from './'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx b/x-pack/plugins/siem/public/hosts/components/hosts_table/index.test.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx rename to x-pack/plugins/siem/public/hosts/components/hosts_table/index.test.tsx index e561594013deaa..8c1429174bd78e 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/index.test.tsx +++ b/x-pack/plugins/siem/public/hosts/components/hosts_table/index.test.tsx @@ -14,19 +14,21 @@ import { mockIndexPattern, mockGlobalState, TestProviders, -} from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; -import { createStore, hostsModel, State } from '../../../../store'; -import { HostsTableType } from '../../../../store/hosts/model'; + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; +import { createStore, State } from '../../../common/store'; +import { hostsModel } from '../../../hosts/store'; +import { HostsTableType } from '../../../hosts/store/model'; import { HostsTable } from './index'; import { mockData } from './mock'; // Test will fail because we will to need to mock some core services to make the test work // For now let's forget about SiemSearchBar and QueryBar -jest.mock('../../../search_bar', () => ({ +jest.mock('../../../common/components/search_bar', () => ({ SiemSearchBar: () => null, })); -jest.mock('../../../query_bar', () => ({ +jest.mock('../../../common/components/query_bar', () => ({ QueryBar: () => null, })); @@ -34,11 +36,11 @@ describe('Hosts Table', () => { const loadPage = jest.fn(); const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); const mount = useMountAppended(); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/index.tsx b/x-pack/plugins/siem/public/hosts/components/hosts_table/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/page/hosts/hosts_table/index.tsx rename to x-pack/plugins/siem/public/hosts/components/hosts_table/index.tsx index f09834d87e423d..550ee24f609226 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/index.tsx +++ b/x-pack/plugins/siem/public/hosts/components/hosts_table/index.tsx @@ -8,7 +8,6 @@ import React, { useMemo, useCallback } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import { IIndexPattern } from 'src/plugins/data/public'; -import { hostsActions } from '../../../../store/actions'; import { Direction, HostFields, @@ -17,17 +16,17 @@ import { HostsFields, HostsSortField, OsFields, -} from '../../../../graphql/types'; -import { assertUnreachable } from '../../../../lib/helpers'; -import { hostsModel, hostsSelectors, State } from '../../../../store'; +} from '../../../graphql/types'; +import { assertUnreachable } from '../../../common/lib/helpers'; +import { State } from '../../../common/store'; import { Columns, Criteria, ItemsPerRow, PaginatedTable, SortingBasicTable, -} from '../../../paginated_table'; - +} from '../../../common/components/paginated_table'; +import { hostsActions, hostsModel, hostsSelectors } from '../../store'; import { getHostsColumns } from './columns'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/mock.ts b/x-pack/plugins/siem/public/hosts/components/hosts_table/mock.ts similarity index 96% rename from x-pack/plugins/siem/public/components/page/hosts/hosts_table/mock.ts rename to x-pack/plugins/siem/public/hosts/components/hosts_table/mock.ts index b5a9c925c599ad..a3dd69be75cc67 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/mock.ts +++ b/x-pack/plugins/siem/public/hosts/components/hosts_table/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { HostsData } from '../../../../graphql/types'; +import { HostsData } from '../../../graphql/types'; export const mockData: { Hosts: HostsData } = { Hosts: { diff --git a/x-pack/plugins/siem/public/components/page/hosts/hosts_table/translations.ts b/x-pack/plugins/siem/public/hosts/components/hosts_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/hosts_table/translations.ts rename to x-pack/plugins/siem/public/hosts/components/hosts_table/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/hosts/components/kpi_hosts/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx rename to x-pack/plugins/siem/public/hosts/components/kpi_hosts/index.test.tsx index dc2340d42ebd90..09e253ae56747d 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/index.test.tsx +++ b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/index.test.tsx @@ -8,7 +8,7 @@ import { mockKpiHostsData, mockKpiHostDetailsData } from './mock'; import React from 'react'; import { shallow, ShallowWrapper } from 'enzyme'; import { KpiHostsComponentBase } from '.'; -import * as statItems from '../../../stat_items'; +import * as statItems from '../../../common/components/stat_items'; import { kpiHostsMapping } from './kpi_hosts_mapping'; import { kpiHostDetailsMapping } from './kpi_host_details_mapping'; diff --git a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/index.tsx b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/index.tsx rename to x-pack/plugins/siem/public/hosts/components/kpi_hosts/index.tsx index 65d59248218447..ba70df7d361d45 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/index.tsx +++ b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/index.tsx @@ -8,11 +8,15 @@ import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { KpiHostsData, KpiHostDetailsData } from '../../../../graphql/types'; -import { StatItemsComponent, StatItemsProps, useKpiMatrixStatus } from '../../../stat_items'; +import { KpiHostsData, KpiHostDetailsData } from '../../../graphql/types'; +import { + StatItemsComponent, + StatItemsProps, + useKpiMatrixStatus, +} from '../../../common/components/stat_items'; import { kpiHostsMapping } from './kpi_hosts_mapping'; import { kpiHostDetailsMapping } from './kpi_host_details_mapping'; -import { UpdateDateRange } from '../../../charts/common'; +import { UpdateDateRange } from '../../../common/components/charts/common'; const kpiWidgetHeight = 247; diff --git a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_host_details_mapping.ts b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/kpi_host_details_mapping.ts similarity index 96% rename from x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_host_details_mapping.ts rename to x-pack/plugins/siem/public/hosts/components/kpi_hosts/kpi_host_details_mapping.ts index 59f8e55c461060..b3e98b70c4cb0e 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_host_details_mapping.ts +++ b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/kpi_host_details_mapping.ts @@ -5,7 +5,7 @@ */ import * as i18n from './translations'; -import { StatItems } from '../../../stat_items'; +import { StatItems } from '../../../common/components/stat_items'; import { KpiHostsChartColors } from './types'; export const kpiHostDetailsMapping: Readonly = [ diff --git a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_hosts_mapping.ts b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/kpi_hosts_mapping.ts similarity index 96% rename from x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_hosts_mapping.ts rename to x-pack/plugins/siem/public/hosts/components/kpi_hosts/kpi_hosts_mapping.ts index e2d6348d058409..78a9fd5b84d1fa 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/kpi_hosts_mapping.ts +++ b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/kpi_hosts_mapping.ts @@ -5,8 +5,8 @@ */ import * as i18n from './translations'; -import { StatItems } from '../../../stat_items'; import { KpiHostsChartColors } from './types'; +import { StatItems } from '../../../common/components/stat_items'; export const kpiHostsMapping: Readonly = [ { diff --git a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/mock.tsx b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/mock.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/mock.tsx rename to x-pack/plugins/siem/public/hosts/components/kpi_hosts/mock.tsx diff --git a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/translations.ts b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/translations.ts rename to x-pack/plugins/siem/public/hosts/components/kpi_hosts/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/types.ts b/x-pack/plugins/siem/public/hosts/components/kpi_hosts/types.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/kpi_hosts/types.ts rename to x-pack/plugins/siem/public/hosts/components/kpi_hosts/types.ts diff --git a/x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/hosts/components/uncommon_process_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/hosts/components/uncommon_process_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx b/x-pack/plugins/siem/public/hosts/components/uncommon_process_table/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx rename to x-pack/plugins/siem/public/hosts/components/uncommon_process_table/index.test.tsx index 76fc2a0c389c38..1fcb9b5ef621f5 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/index.test.tsx +++ b/x-pack/plugins/siem/public/hosts/components/uncommon_process_table/index.test.tsx @@ -8,14 +8,14 @@ import { shallow } from 'enzyme'; import { getOr } from 'lodash/fp'; import React from 'react'; -import { TestProviders } from '../../../../mock'; -import { hostsModel } from '../../../../store'; -import { getEmptyValue } from '../../../empty_value'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { TestProviders } from '../../../common/mock'; +import { hostsModel } from '../../store'; +import { getEmptyValue } from '../../../common/components/empty_value'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { getArgs, UncommonProcessTable, getUncommonColumnsCurated } from '.'; import { mockData } from './mock'; -import { HostsType } from '../../../../store/hosts/model'; +import { HostsType } from '../../store/model'; import * as i18n from './translations'; describe('Uncommon Process Table Component', () => { diff --git a/x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx b/x-pack/plugins/siem/public/hosts/components/uncommon_process_table/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx rename to x-pack/plugins/siem/public/hosts/components/uncommon_process_table/index.tsx index 2e59afcba4ac86..a34cfe3327a9d1 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/index.tsx +++ b/x-pack/plugins/siem/public/hosts/components/uncommon_process_table/index.tsx @@ -9,16 +9,16 @@ import React, { useCallback, useMemo } from 'react'; import { connect, ConnectedProps } from 'react-redux'; -import { hostsActions } from '../../../../store/actions'; -import { UncommonProcessesEdges, UncommonProcessItem } from '../../../../graphql/types'; -import { hostsModel, hostsSelectors, State } from '../../../../store'; -import { defaultToEmptyTag, getEmptyValue } from '../../../empty_value'; -import { HostDetailsLink } from '../../../links'; -import { Columns, ItemsPerRow, PaginatedTable } from '../../../paginated_table'; +import { UncommonProcessesEdges, UncommonProcessItem } from '../../../graphql/types'; +import { State } from '../../../common/store'; +import { hostsActions, hostsModel, hostsSelectors } from '../../store'; +import { defaultToEmptyTag, getEmptyValue } from '../../../common/components/empty_value'; +import { HostDetailsLink } from '../../../common/components/links'; +import { Columns, ItemsPerRow, PaginatedTable } from '../../../common/components/paginated_table'; import * as i18n from './translations'; -import { getRowItemDraggables } from '../../../tables/helpers'; -import { HostsType } from '../../../../store/hosts/model'; +import { getRowItemDraggables } from '../../../common/components/tables/helpers'; +import { HostsType } from '../../store/model'; const tableType = hostsModel.HostsTableType.uncommonProcesses; interface OwnProps { data: UncommonProcessesEdges[]; diff --git a/x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/mock.ts b/x-pack/plugins/siem/public/hosts/components/uncommon_process_table/mock.ts similarity index 97% rename from x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/mock.ts rename to x-pack/plugins/siem/public/hosts/components/uncommon_process_table/mock.ts index bcd76706e30354..52b835278634b0 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/mock.ts +++ b/x-pack/plugins/siem/public/hosts/components/uncommon_process_table/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { UncommonProcessesData } from '../../../../graphql/types'; +import { UncommonProcessesData } from '../../../graphql/types'; export const mockData: { UncommonProcess: UncommonProcessesData } = { UncommonProcess: { diff --git a/x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/translations.ts b/x-pack/plugins/siem/public/hosts/components/uncommon_process_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/uncommon_process_table/translations.ts rename to x-pack/plugins/siem/public/hosts/components/uncommon_process_table/translations.ts diff --git a/x-pack/plugins/siem/public/containers/authentications/index.gql_query.ts b/x-pack/plugins/siem/public/hosts/containers/authentications/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/authentications/index.gql_query.ts rename to x-pack/plugins/siem/public/hosts/containers/authentications/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/authentications/index.tsx b/x-pack/plugins/siem/public/hosts/containers/authentications/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/containers/authentications/index.tsx rename to x-pack/plugins/siem/public/hosts/containers/authentications/index.tsx index 6d4a88c45a7681..bfada0583f8e95 100644 --- a/x-pack/plugins/siem/public/containers/authentications/index.tsx +++ b/x-pack/plugins/siem/public/hosts/containers/authentications/index.tsx @@ -10,18 +10,21 @@ import { Query } from 'react-apollo'; import { connect } from 'react-redux'; import { compose } from 'redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { AuthenticationsEdges, GetAuthenticationsQuery, PageInfoPaginated, -} from '../../graphql/types'; -import { hostsModel, hostsSelectors, inputsModel, State, inputsSelectors } from '../../store'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { generateTablePaginationOptions } from '../../components/paginated_table/helpers'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; -import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated'; - +} from '../../../graphql/types'; +import { inputsModel, State, inputsSelectors } from '../../../common/store'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers'; +import { withKibana, WithKibanaProps } from '../../../common/lib/kibana'; +import { + QueryTemplatePaginated, + QueryTemplatePaginatedProps, +} from '../../../common/containers/query_template_paginated'; +import { hostsModel, hostsSelectors } from '../../store'; import { authenticationsQuery } from './index.gql_query'; const ID = 'authenticationQuery'; diff --git a/x-pack/plugins/siem/public/containers/hosts/first_last_seen/first_last_seen.gql_query.ts b/x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/first_last_seen.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/hosts/first_last_seen/first_last_seen.gql_query.ts rename to x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/first_last_seen.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/hosts/first_last_seen/index.ts b/x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/index.ts similarity index 87% rename from x-pack/plugins/siem/public/containers/hosts/first_last_seen/index.ts rename to x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/index.ts index a460fa8999b57b..54e9147be17c06 100644 --- a/x-pack/plugins/siem/public/containers/hosts/first_last_seen/index.ts +++ b/x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/index.ts @@ -8,11 +8,11 @@ import ApolloClient from 'apollo-client'; import { get } from 'lodash/fp'; import React, { useEffect, useState } from 'react'; -import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; -import { useUiSetting$ } from '../../../lib/kibana'; -import { GetHostFirstLastSeenQuery } from '../../../graphql/types'; -import { inputsModel } from '../../../store'; -import { QueryTemplateProps } from '../../query_template'; +import { DEFAULT_INDEX_KEY } from '../../../../../common/constants'; +import { useUiSetting$ } from '../../../../common/lib/kibana'; +import { GetHostFirstLastSeenQuery } from '../../../../graphql/types'; +import { inputsModel } from '../../../../common/store'; +import { QueryTemplateProps } from '../../../../common/containers/query_template'; import { HostFirstLastSeenGqlQuery } from './first_last_seen.gql_query'; diff --git a/x-pack/plugins/siem/public/containers/hosts/first_last_seen/mock.ts b/x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/mock.ts similarity index 89% rename from x-pack/plugins/siem/public/containers/hosts/first_last_seen/mock.ts rename to x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/mock.ts index f59df84dacc1b1..51e484ffbd8599 100644 --- a/x-pack/plugins/siem/public/containers/hosts/first_last_seen/mock.ts +++ b/x-pack/plugins/siem/public/hosts/containers/hosts/first_last_seen/mock.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { DEFAULT_INDEX_PATTERN } from '../../../../common/constants'; -import { GetHostFirstLastSeenQuery } from '../../../graphql/types'; +import { DEFAULT_INDEX_PATTERN } from '../../../../../common/constants'; +import { GetHostFirstLastSeenQuery } from '../../../../graphql/types'; import { HostFirstLastSeenGqlQuery } from './first_last_seen.gql_query'; diff --git a/x-pack/plugins/siem/public/containers/hosts/hosts_table.gql_query.ts b/x-pack/plugins/siem/public/hosts/containers/hosts/hosts_table.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/hosts/hosts_table.gql_query.ts rename to x-pack/plugins/siem/public/hosts/containers/hosts/hosts_table.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/hosts/index.tsx b/x-pack/plugins/siem/public/hosts/containers/hosts/index.tsx similarity index 88% rename from x-pack/plugins/siem/public/containers/hosts/index.tsx rename to x-pack/plugins/siem/public/hosts/containers/hosts/index.tsx index 733c2224d840a7..70f21b6f23cc0d 100644 --- a/x-pack/plugins/siem/public/containers/hosts/index.tsx +++ b/x-pack/plugins/siem/public/hosts/containers/hosts/index.tsx @@ -11,21 +11,24 @@ import { Query } from 'react-apollo'; import { connect } from 'react-redux'; import { compose } from 'redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { Direction, GetHostsTableQuery, HostsEdges, HostsFields, PageInfoPaginated, -} from '../../graphql/types'; -import { hostsModel, hostsSelectors, inputsModel, State, inputsSelectors } from '../../store'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; - +} from '../../../graphql/types'; +import { inputsModel, State, inputsSelectors } from '../../../common/store'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { + QueryTemplatePaginated, + QueryTemplatePaginatedProps, +} from '../../../common/containers/query_template_paginated'; +import { withKibana, WithKibanaProps } from '../../../common/lib/kibana'; +import { hostsModel, hostsSelectors } from '../../store'; import { HostsTableQuery } from './hosts_table.gql_query'; -import { generateTablePaginationOptions } from '../../components/paginated_table/helpers'; +import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers'; const ID = 'hostsQuery'; diff --git a/x-pack/plugins/siem/public/containers/hosts/overview/host_overview.gql_query.ts b/x-pack/plugins/siem/public/hosts/containers/hosts/overview/host_overview.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/hosts/overview/host_overview.gql_query.ts rename to x-pack/plugins/siem/public/hosts/containers/hosts/overview/host_overview.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/hosts/overview/index.tsx b/x-pack/plugins/siem/public/hosts/containers/hosts/overview/index.tsx similarity index 85% rename from x-pack/plugins/siem/public/containers/hosts/overview/index.tsx rename to x-pack/plugins/siem/public/hosts/containers/hosts/overview/index.tsx index 5057e872b53131..5267fff3a26d67 100644 --- a/x-pack/plugins/siem/public/containers/hosts/overview/index.tsx +++ b/x-pack/plugins/siem/public/hosts/containers/hosts/overview/index.tsx @@ -10,14 +10,14 @@ import { Query } from 'react-apollo'; import { connect } from 'react-redux'; import { compose } from 'redux'; -import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; -import { inputsModel, inputsSelectors, State } from '../../../store'; -import { getDefaultFetchPolicy } from '../../helpers'; -import { QueryTemplate, QueryTemplateProps } from '../../query_template'; -import { withKibana, WithKibanaProps } from '../../../lib/kibana'; +import { DEFAULT_INDEX_KEY } from '../../../../../common/constants'; +import { inputsModel, inputsSelectors, State } from '../../../../common/store'; +import { getDefaultFetchPolicy } from '../../../../common/containers/helpers'; +import { QueryTemplate, QueryTemplateProps } from '../../../../common/containers/query_template'; +import { withKibana, WithKibanaProps } from '../../../../common/lib/kibana'; import { HostOverviewQuery } from './host_overview.gql_query'; -import { GetHostOverviewQuery, HostItem } from '../../../graphql/types'; +import { GetHostOverviewQuery, HostItem } from '../../../../graphql/types'; const ID = 'hostOverviewQuery'; diff --git a/x-pack/plugins/siem/public/containers/kpi_host_details/index.gql_query.tsx b/x-pack/plugins/siem/public/hosts/containers/kpi_host_details/index.gql_query.tsx similarity index 100% rename from x-pack/plugins/siem/public/containers/kpi_host_details/index.gql_query.tsx rename to x-pack/plugins/siem/public/hosts/containers/kpi_host_details/index.gql_query.tsx diff --git a/x-pack/plugins/siem/public/containers/kpi_host_details/index.tsx b/x-pack/plugins/siem/public/hosts/containers/kpi_host_details/index.tsx similarity index 86% rename from x-pack/plugins/siem/public/containers/kpi_host_details/index.tsx rename to x-pack/plugins/siem/public/hosts/containers/kpi_host_details/index.tsx index de9d54b1a185c8..1551e7d7067146 100644 --- a/x-pack/plugins/siem/public/containers/kpi_host_details/index.tsx +++ b/x-pack/plugins/siem/public/hosts/containers/kpi_host_details/index.tsx @@ -9,12 +9,12 @@ import React from 'react'; import { Query } from 'react-apollo'; import { connect, ConnectedProps } from 'react-redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; -import { KpiHostDetailsData, GetKpiHostDetailsQuery } from '../../graphql/types'; -import { inputsModel, inputsSelectors, State } from '../../store'; -import { useUiSetting } from '../../lib/kibana'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplateProps } from '../query_template'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; +import { KpiHostDetailsData, GetKpiHostDetailsQuery } from '../../../graphql/types'; +import { inputsModel, inputsSelectors, State } from '../../../common/store'; +import { useUiSetting } from '../../../common/lib/kibana'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { QueryTemplateProps } from '../../../common/containers/query_template'; import { kpiHostDetailsQuery } from './index.gql_query'; diff --git a/x-pack/plugins/siem/public/containers/kpi_hosts/index.gql_query.ts b/x-pack/plugins/siem/public/hosts/containers/kpi_hosts/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/kpi_hosts/index.gql_query.ts rename to x-pack/plugins/siem/public/hosts/containers/kpi_hosts/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/kpi_hosts/index.tsx b/x-pack/plugins/siem/public/hosts/containers/kpi_hosts/index.tsx similarity index 83% rename from x-pack/plugins/siem/public/containers/kpi_hosts/index.tsx rename to x-pack/plugins/siem/public/hosts/containers/kpi_hosts/index.tsx index 5be2423e8a162a..1a6df58f045976 100644 --- a/x-pack/plugins/siem/public/containers/kpi_hosts/index.tsx +++ b/x-pack/plugins/siem/public/hosts/containers/kpi_hosts/index.tsx @@ -9,12 +9,12 @@ import React from 'react'; import { Query } from 'react-apollo'; import { connect, ConnectedProps } from 'react-redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; -import { GetKpiHostsQuery, KpiHostsData } from '../../graphql/types'; -import { inputsModel, inputsSelectors, State } from '../../store'; -import { useUiSetting } from '../../lib/kibana'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplateProps } from '../query_template'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; +import { GetKpiHostsQuery, KpiHostsData } from '../../../graphql/types'; +import { inputsModel, inputsSelectors, State } from '../../../common/store'; +import { useUiSetting } from '../../../common/lib/kibana'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { QueryTemplateProps } from '../../../common/containers/query_template'; import { kpiHostsQuery } from './index.gql_query'; diff --git a/x-pack/plugins/siem/public/containers/uncommon_processes/index.gql_query.ts b/x-pack/plugins/siem/public/hosts/containers/uncommon_processes/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/uncommon_processes/index.gql_query.ts rename to x-pack/plugins/siem/public/hosts/containers/uncommon_processes/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/uncommon_processes/index.tsx b/x-pack/plugins/siem/public/hosts/containers/uncommon_processes/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/containers/uncommon_processes/index.tsx rename to x-pack/plugins/siem/public/hosts/containers/uncommon_processes/index.tsx index 0a2ce67d9be805..f8e5b1bed73cd2 100644 --- a/x-pack/plugins/siem/public/containers/uncommon_processes/index.tsx +++ b/x-pack/plugins/siem/public/hosts/containers/uncommon_processes/index.tsx @@ -10,18 +10,21 @@ import { Query } from 'react-apollo'; import { connect, ConnectedProps } from 'react-redux'; import { compose } from 'redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { GetUncommonProcessesQuery, PageInfoPaginated, UncommonProcessesEdges, -} from '../../graphql/types'; -import { hostsModel, hostsSelectors, inputsModel, State, inputsSelectors } from '../../store'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; -import { generateTablePaginationOptions } from '../../components/paginated_table/helpers'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated'; - +} from '../../../graphql/types'; +import { inputsModel, State, inputsSelectors } from '../../../common/store'; +import { withKibana, WithKibanaProps } from '../../../common/lib/kibana'; +import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { + QueryTemplatePaginated, + QueryTemplatePaginatedProps, +} from '../../../common/containers/query_template_paginated'; +import { hostsModel, hostsSelectors } from '../../store'; import { uncommonProcessesQuery } from './index.gql_query'; const ID = 'uncommonProcessesQuery'; diff --git a/x-pack/plugins/siem/public/hosts/index.ts b/x-pack/plugins/siem/public/hosts/index.ts new file mode 100644 index 00000000000000..6f27428e71c27c --- /dev/null +++ b/x-pack/plugins/siem/public/hosts/index.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SecuritySubPluginWithStore } from '../app/types'; +import { getHostsRoutes } from './routes'; +import { initialHostsState, hostsReducer, HostsState } from './store'; + +export class Hosts { + public setup() {} + + public start(): SecuritySubPluginWithStore<'hosts', HostsState> { + return { + routes: getHostsRoutes(), + store: { + initialState: { hosts: initialHostsState }, + reducer: { hosts: hostsReducer }, + }, + }; + } +} diff --git a/x-pack/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx b/x-pack/plugins/siem/public/hosts/pages/details/details_tabs.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx rename to x-pack/plugins/siem/public/hosts/pages/details/details_tabs.test.tsx index 81c1b317d45965..fa76dc93375e01 100644 --- a/x-pack/plugins/siem/public/pages/hosts/details/details_tabs.test.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/details/details_tabs.test.tsx @@ -9,16 +9,16 @@ import { IIndexPattern } from 'src/plugins/data/public'; import { MemoryRouter } from 'react-router-dom'; import useResizeObserver from 'use-resize-observer/polyfilled'; -import { mockIndexPattern } from '../../../mock/index_pattern'; -import { TestProviders } from '../../../mock/test_providers'; +import { mockIndexPattern } from '../../../common/mock/index_pattern'; +import { TestProviders } from '../../../common/mock/test_providers'; import { HostDetailsTabs } from './details_tabs'; import { HostDetailsTabsProps, SetAbsoluteRangeDatePicker } from './types'; import { hostDetailsPagePath } from '../types'; import { type } from './utils'; -import { useMountAppended } from '../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { getHostDetailsPageFilters } from './helpers'; -jest.mock('../../../containers/source', () => ({ +jest.mock('../../../common/containers/source', () => ({ indicesExistOrDataTemporarilyUnavailable: () => true, WithSource: ({ children, @@ -29,10 +29,10 @@ jest.mock('../../../containers/source', () => ({ // Test will fail because we will to need to mock some core services to make the test work // For now let's forget about SiemSearchBar and QueryBar -jest.mock('../../../components/search_bar', () => ({ +jest.mock('../../../common/components/search_bar', () => ({ SiemSearchBar: () => null, })); -jest.mock('../../../components/query_bar', () => ({ +jest.mock('../../../common/components/query_bar', () => ({ QueryBar: () => null, })); diff --git a/x-pack/plugins/siem/public/pages/hosts/details/details_tabs.tsx b/x-pack/plugins/siem/public/hosts/pages/details/details_tabs.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/hosts/details/details_tabs.tsx rename to x-pack/plugins/siem/public/hosts/pages/details/details_tabs.tsx index d6c0211901ff05..505d0f37ca0392 100644 --- a/x-pack/plugins/siem/public/pages/hosts/details/details_tabs.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/details/details_tabs.tsx @@ -7,12 +7,12 @@ import React, { useCallback } from 'react'; import { Route, Switch } from 'react-router-dom'; -import { UpdateDateRange } from '../../../components/charts/common'; -import { scoreIntervalToDateTime } from '../../../components/ml/score/score_interval_to_datetime'; -import { Anomaly } from '../../../components/ml/types'; -import { HostsTableType } from '../../../store/hosts/model'; -import { AnomaliesQueryTabBody } from '../../../containers/anomalies/anomalies_query_tab_body'; -import { AnomaliesHostTable } from '../../../components/ml/tables/anomalies_host_table'; +import { UpdateDateRange } from '../../../common/components/charts/common'; +import { scoreIntervalToDateTime } from '../../../common/components/ml/score/score_interval_to_datetime'; +import { Anomaly } from '../../../common/components/ml/types'; +import { HostsTableType } from '../../store/model'; +import { AnomaliesQueryTabBody } from '../../../common/containers/anomalies/anomalies_query_tab_body'; +import { AnomaliesHostTable } from '../../../common/components/ml/tables/anomalies_host_table'; import { HostDetailsTabsProps } from './types'; import { type } from './utils'; diff --git a/x-pack/plugins/siem/public/pages/hosts/details/helpers.test.ts b/x-pack/plugins/siem/public/hosts/pages/details/helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/hosts/details/helpers.test.ts rename to x-pack/plugins/siem/public/hosts/pages/details/helpers.test.ts diff --git a/x-pack/plugins/siem/public/pages/hosts/details/helpers.ts b/x-pack/plugins/siem/public/hosts/pages/details/helpers.ts similarity index 95% rename from x-pack/plugins/siem/public/pages/hosts/details/helpers.ts rename to x-pack/plugins/siem/public/hosts/pages/details/helpers.ts index 6da76f2fb5cac9..9ec0084d708a02 100644 --- a/x-pack/plugins/siem/public/pages/hosts/details/helpers.ts +++ b/x-pack/plugins/siem/public/hosts/pages/details/helpers.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { escapeQueryValue } from '../../../lib/keury'; +import { escapeQueryValue } from '../../../common/lib/keury'; import { Filter } from '../../../../../../../src/plugins/data/public'; /** Returns the kqlQueryExpression for the `Events` widget on the `Host Details` page */ diff --git a/x-pack/plugins/siem/public/pages/hosts/details/index.tsx b/x-pack/plugins/siem/public/hosts/pages/details/index.tsx similarity index 81% rename from x-pack/plugins/siem/public/pages/hosts/details/index.tsx rename to x-pack/plugins/siem/public/hosts/pages/details/index.tsx index afed0fab0ade7c..a5fabf4d515f86 100644 --- a/x-pack/plugins/siem/public/pages/hosts/details/index.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/details/index.tsx @@ -9,31 +9,34 @@ import React, { useEffect, useCallback, useMemo } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import { StickyContainer } from 'react-sticky'; -import { UpdateDateRange } from '../../../components/charts/common'; -import { FiltersGlobal } from '../../../components/filters_global'; -import { HeaderPage } from '../../../components/header_page'; -import { LastEventTime } from '../../../components/last_event_time'; -import { AnomalyTableProvider } from '../../../components/ml/anomaly/anomaly_table_provider'; -import { hostToCriteria } from '../../../components/ml/criteria/host_to_criteria'; +import { UpdateDateRange } from '../../../common/components/charts/common'; +import { FiltersGlobal } from '../../../common/components/filters_global'; +import { HeaderPage } from '../../../common/components/header_page'; +import { LastEventTime } from '../../../common/components/last_event_time'; +import { AnomalyTableProvider } from '../../../common/components/ml/anomaly/anomaly_table_provider'; +import { hostToCriteria } from '../../../common/components/ml/criteria/host_to_criteria'; import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; -import { useMlCapabilities } from '../../../components/ml_popover/hooks/use_ml_capabilities'; -import { scoreIntervalToDateTime } from '../../../components/ml/score/score_interval_to_datetime'; -import { SiemNavigation } from '../../../components/navigation'; -import { KpiHostsComponent } from '../../../components/page/hosts'; -import { HostOverview } from '../../../components/page/hosts/host_overview'; -import { manageQuery } from '../../../components/page/manage_query'; -import { SiemSearchBar } from '../../../components/search_bar'; -import { WrapperPage } from '../../../components/wrapper_page'; -import { HostOverviewByNameQuery } from '../../../containers/hosts/overview'; -import { KpiHostDetailsQuery } from '../../../containers/kpi_host_details'; -import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../../containers/source'; +import { useMlCapabilities } from '../../../common/components/ml_popover/hooks/use_ml_capabilities'; +import { scoreIntervalToDateTime } from '../../../common/components/ml/score/score_interval_to_datetime'; +import { SiemNavigation } from '../../../common/components/navigation'; +import { KpiHostsComponent } from '../../components/kpi_hosts'; +import { HostOverview } from '../../../overview/components/host_overview'; +import { manageQuery } from '../../../common/components/page/manage_query'; +import { SiemSearchBar } from '../../../common/components/search_bar'; +import { WrapperPage } from '../../../common/components/wrapper_page'; +import { HostOverviewByNameQuery } from '../../containers/hosts/overview'; +import { KpiHostDetailsQuery } from '../../containers/kpi_host_details'; +import { + indicesExistOrDataTemporarilyUnavailable, + WithSource, +} from '../../../common/containers/source'; import { LastEventIndexKey } from '../../../graphql/types'; -import { useKibana } from '../../../lib/kibana'; -import { convertToBuildEsQuery } from '../../../lib/keury'; -import { inputsSelectors, State } from '../../../store'; -import { setHostDetailsTablesActivePageToZero as dispatchHostDetailsTablesActivePageToZero } from '../../../store/hosts/actions'; -import { setAbsoluteRangeDatePicker as dispatchAbsoluteRangeDatePicker } from '../../../store/inputs/actions'; -import { SpyRoute } from '../../../utils/route/spy_routes'; +import { useKibana } from '../../../common/lib/kibana'; +import { convertToBuildEsQuery } from '../../../common/lib/keury'; +import { inputsSelectors, State } from '../../../common/store'; +import { setHostDetailsTablesActivePageToZero as dispatchHostDetailsTablesActivePageToZero } from '../../store/actions'; +import { setAbsoluteRangeDatePicker as dispatchAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions'; +import { SpyRoute } from '../../../common/utils/route/spy_routes'; import { esQuery, Filter } from '../../../../../../../src/plugins/data/public'; import { HostsEmptyPage } from '../hosts_empty_page'; diff --git a/x-pack/plugins/siem/public/pages/hosts/details/nav_tabs.test.tsx b/x-pack/plugins/siem/public/hosts/pages/details/nav_tabs.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/hosts/details/nav_tabs.test.tsx rename to x-pack/plugins/siem/public/hosts/pages/details/nav_tabs.test.tsx index 6710edb7b20fae..0dd31dc9abce7f 100644 --- a/x-pack/plugins/siem/public/pages/hosts/details/nav_tabs.test.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/details/nav_tabs.test.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { HostsTableType } from '../../../store/hosts/model'; +import { HostsTableType } from '../../store/model'; import { navTabsHostDetails } from './nav_tabs'; describe('navTabsHostDetails', () => { diff --git a/x-pack/plugins/siem/public/pages/hosts/details/nav_tabs.tsx b/x-pack/plugins/siem/public/hosts/pages/details/nav_tabs.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/hosts/details/nav_tabs.tsx rename to x-pack/plugins/siem/public/hosts/pages/details/nav_tabs.tsx index f828dc250f0d30..4d04d16580a638 100644 --- a/x-pack/plugins/siem/public/pages/hosts/details/nav_tabs.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/details/nav_tabs.tsx @@ -5,10 +5,10 @@ */ import { omit } from 'lodash/fp'; -import * as i18n from './../translations'; +import * as i18n from '../translations'; import { HostDetailsNavTab } from './types'; -import { HostsTableType } from '../../../store/hosts/model'; -import { SiemPageName } from '../../home/types'; +import { HostsTableType } from '../../store/model'; +import { SiemPageName } from '../../../app/types'; const getTabsOnHostDetailsUrl = (hostName: string, tabName: HostsTableType) => `#/${SiemPageName.hosts}/${hostName}/${tabName}`; diff --git a/x-pack/plugins/siem/public/pages/hosts/details/types.ts b/x-pack/plugins/siem/public/hosts/pages/details/types.ts similarity index 85% rename from x-pack/plugins/siem/public/pages/hosts/details/types.ts rename to x-pack/plugins/siem/public/hosts/pages/details/types.ts index 03c8646bae1478..f145abed2d8ffc 100644 --- a/x-pack/plugins/siem/public/pages/hosts/details/types.ts +++ b/x-pack/plugins/siem/public/hosts/pages/details/types.ts @@ -6,13 +6,13 @@ import { ActionCreator } from 'typescript-fsa'; import { Query, IIndexPattern, Filter } from 'src/plugins/data/public'; -import { InputsModelId } from '../../../store/inputs/constants'; -import { HostComponentProps } from '../../../components/link_to/redirect_to_hosts'; -import { HostsTableType } from '../../../store/hosts/model'; +import { InputsModelId } from '../../../common/store/inputs/constants'; +import { HostComponentProps } from '../../../common/components/link_to/redirect_to_hosts'; +import { HostsTableType } from '../../store/model'; import { HostsQueryProps } from '../types'; -import { NavTab } from '../../../components/navigation/types'; +import { NavTab } from '../../../common/components/navigation/types'; import { KeyHostsNavTabWithoutMlPermission } from '../navigation/types'; -import { hostsModel } from '../../../store'; +import { hostsModel } from '../../store'; interface HostDetailsComponentReduxProps { query: Query; diff --git a/x-pack/plugins/siem/public/pages/hosts/details/utils.ts b/x-pack/plugins/siem/public/hosts/pages/details/utils.ts similarity index 83% rename from x-pack/plugins/siem/public/pages/hosts/details/utils.ts rename to x-pack/plugins/siem/public/hosts/pages/details/utils.ts index af4ba8eb091e20..d45cb3368b4e19 100644 --- a/x-pack/plugins/siem/public/pages/hosts/details/utils.ts +++ b/x-pack/plugins/siem/public/hosts/pages/details/utils.ts @@ -6,13 +6,17 @@ import { get, isEmpty } from 'lodash/fp'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths import { ChromeBreadcrumb } from '../../../../../../../src/core/public'; -import { hostsModel } from '../../../store'; -import { HostsTableType } from '../../../store/hosts/model'; -import { getHostsUrl, getHostDetailsUrl } from '../../../components/link_to/redirect_to_hosts'; +import { hostsModel } from '../../store'; +import { HostsTableType } from '../../store/model'; +import { + getHostsUrl, + getHostDetailsUrl, +} from '../../../common/components/link_to/redirect_to_hosts'; import * as i18n from '../translations'; -import { HostRouteSpyState } from '../../../utils/route/types'; +import { HostRouteSpyState } from '../../../common/utils/route/types'; export const type = hostsModel.HostsType.details; diff --git a/x-pack/plugins/siem/public/pages/hosts/hosts.test.tsx b/x-pack/plugins/siem/public/hosts/pages/hosts.test.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/hosts/hosts.test.tsx rename to x-pack/plugins/siem/public/hosts/pages/hosts.test.tsx index 6134c1dd6911a2..5cb35eaa775b6f 100644 --- a/x-pack/plugins/siem/public/pages/hosts/hosts.test.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/hosts.test.tsx @@ -11,23 +11,28 @@ import { Router } from 'react-router-dom'; import { MockedProvider } from 'react-apollo/test-utils'; import { Filter } from '../../../../../../src/plugins/data/common/es_query'; -import '../../mock/match_media'; -import { mocksSource } from '../../containers/source/mock'; -import { wait } from '../../lib/helpers'; -import { apolloClientObservable, TestProviders, mockGlobalState } from '../../mock'; -import { SiemNavigation } from '../../components/navigation'; -import { inputsActions } from '../../store/inputs'; -import { State, createStore } from '../../store'; +import '../../common/mock/match_media'; +import { mocksSource } from '../../common/containers/source/mock'; +import { wait } from '../../common/lib/helpers'; +import { + apolloClientObservable, + TestProviders, + mockGlobalState, + SUB_PLUGINS_REDUCER, +} from '../../common/mock'; +import { SiemNavigation } from '../../common/components/navigation'; +import { inputsActions } from '../../common/store/inputs'; +import { State, createStore } from '../../common/store'; import { HostsComponentProps } from './types'; import { Hosts } from './hosts'; import { HostsTabs } from './hosts_tabs'; // Test will fail because we will to need to mock some core services to make the test work // For now let's forget about SiemSearchBar and QueryBar -jest.mock('../../components/search_bar', () => ({ +jest.mock('../../common/components/search_bar', () => ({ SiemSearchBar: () => null, })); -jest.mock('../../components/query_bar', () => ({ +jest.mock('../../common/components/query_bar', () => ({ QueryBar: () => null, })); @@ -166,7 +171,7 @@ describe('Hosts - rendering', () => { ]; localSource[0].result.data.source.status.indicesExist = true; const myState: State = mockGlobalState; - const myStore = createStore(myState, apolloClientObservable); + const myStore = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable); const wrapper = mount( diff --git a/x-pack/plugins/siem/public/pages/hosts/hosts.tsx b/x-pack/plugins/siem/public/hosts/pages/hosts.tsx similarity index 81% rename from x-pack/plugins/siem/public/pages/hosts/hosts.tsx rename to x-pack/plugins/siem/public/hosts/pages/hosts.tsx index 0e29d634d07a62..f7583f65a4fcd4 100644 --- a/x-pack/plugins/siem/public/pages/hosts/hosts.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/hosts.tsx @@ -10,34 +10,38 @@ import { connect, ConnectedProps } from 'react-redux'; import { StickyContainer } from 'react-sticky'; import { useParams } from 'react-router-dom'; -import { UpdateDateRange } from '../../components/charts/common'; -import { FiltersGlobal } from '../../components/filters_global'; -import { HeaderPage } from '../../components/header_page'; -import { LastEventTime } from '../../components/last_event_time'; +import { UpdateDateRange } from '../../common/components/charts/common'; +import { FiltersGlobal } from '../../common/components/filters_global'; +import { HeaderPage } from '../../common/components/header_page'; +import { LastEventTime } from '../../common/components/last_event_time'; import { hasMlUserPermissions } from '../../../common/machine_learning/has_ml_user_permissions'; -import { SiemNavigation } from '../../components/navigation'; -import { KpiHostsComponent } from '../../components/page/hosts'; -import { manageQuery } from '../../components/page/manage_query'; -import { SiemSearchBar } from '../../components/search_bar'; -import { WrapperPage } from '../../components/wrapper_page'; -import { KpiHostsQuery } from '../../containers/kpi_hosts'; -import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source'; +import { SiemNavigation } from '../../common/components/navigation'; +import { KpiHostsComponent } from '../components/kpi_hosts'; +import { manageQuery } from '../../common/components/page/manage_query'; +import { SiemSearchBar } from '../../common/components/search_bar'; +import { WrapperPage } from '../../common/components/wrapper_page'; +import { KpiHostsQuery } from '../containers/kpi_hosts'; +import { + indicesExistOrDataTemporarilyUnavailable, + WithSource, +} from '../../common/containers/source'; import { LastEventIndexKey } from '../../graphql/types'; -import { useKibana } from '../../lib/kibana'; -import { convertToBuildEsQuery } from '../../lib/keury'; -import { inputsSelectors, State, hostsModel } from '../../store'; -import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions'; +import { useKibana } from '../../common/lib/kibana'; +import { convertToBuildEsQuery } from '../../common/lib/keury'; +import { inputsSelectors, State } from '../../common/store'; +import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../common/store/inputs/actions'; -import { SpyRoute } from '../../utils/route/spy_routes'; +import { SpyRoute } from '../../common/utils/route/spy_routes'; import { esQuery } from '../../../../../../src/plugins/data/public'; -import { useMlCapabilities } from '../../components/ml_popover/hooks/use_ml_capabilities'; +import { useMlCapabilities } from '../../common/components/ml_popover/hooks/use_ml_capabilities'; import { HostsEmptyPage } from './hosts_empty_page'; import { HostsTabs } from './hosts_tabs'; import { navTabsHosts } from './nav_tabs'; import * as i18n from './translations'; import { HostsComponentProps } from './types'; import { filterHostData } from './navigation'; -import { HostsTableType } from '../../store/hosts/model'; +import { hostsModel } from '../store'; +import { HostsTableType } from '../store/model'; const KpiHostsComponentManage = manageQuery(KpiHostsComponent); diff --git a/x-pack/plugins/siem/public/pages/hosts/hosts_empty_page.tsx b/x-pack/plugins/siem/public/hosts/pages/hosts_empty_page.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/hosts/hosts_empty_page.tsx rename to x-pack/plugins/siem/public/hosts/pages/hosts_empty_page.tsx index bded0b90e187be..e52fc89678038f 100644 --- a/x-pack/plugins/siem/public/pages/hosts/hosts_empty_page.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/hosts_empty_page.tsx @@ -6,10 +6,9 @@ import React from 'react'; -import { EmptyPage } from '../../components/empty_page'; -import { useKibana } from '../../lib/kibana'; - -import * as i18n from '../common/translations'; +import { EmptyPage } from '../../common/components/empty_page'; +import { useKibana } from '../../common/lib/kibana'; +import * as i18n from '../../common/translations'; export const HostsEmptyPage = React.memo(() => { const { http, docLinks } = useKibana().services; diff --git a/x-pack/plugins/siem/public/pages/hosts/hosts_tabs.tsx b/x-pack/plugins/siem/public/hosts/pages/hosts_tabs.tsx similarity index 84% rename from x-pack/plugins/siem/public/pages/hosts/hosts_tabs.tsx rename to x-pack/plugins/siem/public/hosts/pages/hosts_tabs.tsx index de25deeb5b477c..549c198a435263 100644 --- a/x-pack/plugins/siem/public/pages/hosts/hosts_tabs.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/hosts_tabs.tsx @@ -8,12 +8,12 @@ import React, { memo, useCallback } from 'react'; import { Route, Switch } from 'react-router-dom'; import { HostsTabsProps } from './types'; -import { scoreIntervalToDateTime } from '../../components/ml/score/score_interval_to_datetime'; -import { Anomaly } from '../../components/ml/types'; -import { HostsTableType } from '../../store/hosts/model'; -import { AnomaliesQueryTabBody } from '../../containers/anomalies/anomalies_query_tab_body'; -import { AnomaliesHostTable } from '../../components/ml/tables/anomalies_host_table'; -import { UpdateDateRange } from '../../components/charts/common'; +import { scoreIntervalToDateTime } from '../../common/components/ml/score/score_interval_to_datetime'; +import { Anomaly } from '../../common/components/ml/types'; +import { HostsTableType } from '../store/model'; +import { AnomaliesQueryTabBody } from '../../common/containers/anomalies/anomalies_query_tab_body'; +import { AnomaliesHostTable } from '../../common/components/ml/tables/anomalies_host_table'; +import { UpdateDateRange } from '../../common/components/charts/common'; import { HostsQueryTabBody, diff --git a/x-pack/plugins/siem/public/pages/hosts/index.tsx b/x-pack/plugins/siem/public/hosts/pages/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/pages/hosts/index.tsx rename to x-pack/plugins/siem/public/hosts/pages/index.tsx index 699b1441905c3a..336abc60e5ba16 100644 --- a/x-pack/plugins/siem/public/pages/hosts/index.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/index.tsx @@ -8,10 +8,10 @@ import React from 'react'; import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom'; import { HostDetails } from './details'; -import { HostsTableType } from '../../store/hosts/model'; +import { HostsTableType } from '../store/model'; -import { GlobalTime } from '../../containers/global_time'; -import { SiemPageName } from '../home/types'; +import { GlobalTime } from '../../common/containers/global_time'; +import { SiemPageName } from '../../app/types'; import { Hosts } from './hosts'; import { hostsPagePath, hostDetailsPagePath } from './types'; diff --git a/x-pack/plugins/siem/public/pages/hosts/nav_tabs.test.tsx b/x-pack/plugins/siem/public/hosts/pages/nav_tabs.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/hosts/nav_tabs.test.tsx rename to x-pack/plugins/siem/public/hosts/pages/nav_tabs.test.tsx index a42e83c835c61c..745c454e13f5aa 100644 --- a/x-pack/plugins/siem/public/pages/hosts/nav_tabs.test.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/nav_tabs.test.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { HostsTableType } from '../../store/hosts/model'; +import { HostsTableType } from '../store/model'; import { navTabsHosts } from './nav_tabs'; describe('navTabsHosts', () => { diff --git a/x-pack/plugins/siem/public/pages/hosts/nav_tabs.tsx b/x-pack/plugins/siem/public/hosts/pages/nav_tabs.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/hosts/nav_tabs.tsx rename to x-pack/plugins/siem/public/hosts/pages/nav_tabs.tsx index 4109feff099e06..9bab3f7efe74af 100644 --- a/x-pack/plugins/siem/public/pages/hosts/nav_tabs.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/nav_tabs.tsx @@ -6,9 +6,9 @@ import { omit } from 'lodash/fp'; import * as i18n from './translations'; -import { HostsTableType } from '../../store/hosts/model'; +import { HostsTableType } from '../store/model'; import { HostsNavTab } from './navigation/types'; -import { SiemPageName } from '../home/types'; +import { SiemPageName } from '../../app/types'; const getTabsOnHostsUrl = (tabName: HostsTableType) => `#/${SiemPageName.hosts}/${tabName}`; diff --git a/x-pack/plugins/siem/public/pages/hosts/navigation/alerts_query_tab_body.tsx b/x-pack/plugins/siem/public/hosts/pages/navigation/alerts_query_tab_body.tsx similarity index 95% rename from x-pack/plugins/siem/public/pages/hosts/navigation/alerts_query_tab_body.tsx rename to x-pack/plugins/siem/public/hosts/pages/navigation/alerts_query_tab_body.tsx index ec33834b1bf734..a0d8df6b87514b 100644 --- a/x-pack/plugins/siem/public/pages/hosts/navigation/alerts_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/navigation/alerts_query_tab_body.tsx @@ -7,7 +7,7 @@ import React, { useMemo } from 'react'; import { Filter } from '../../../../../../../src/plugins/data/public'; -import { AlertsView } from '../../../components/alerts_viewer'; +import { AlertsView } from '../../../common/components/alerts_viewer'; import { AlertsComponentQueryProps } from './types'; export const filterHostData: Filter[] = [ diff --git a/x-pack/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx b/x-pack/plugins/siem/public/hosts/pages/navigation/authentications_query_tab_body.tsx similarity index 86% rename from x-pack/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx rename to x-pack/plugins/siem/public/hosts/pages/navigation/authentications_query_tab_body.tsx index 5a6759fd072217..ae7c0205acf56a 100644 --- a/x-pack/plugins/siem/public/pages/hosts/navigation/authentications_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/navigation/authentications_query_tab_body.tsx @@ -6,18 +6,18 @@ import { getOr } from 'lodash/fp'; import React, { useEffect } from 'react'; -import { AuthenticationTable } from '../../../components/page/hosts/authentications_table'; -import { manageQuery } from '../../../components/page/manage_query'; -import { AuthenticationsQuery } from '../../../containers/authentications'; +import { AuthenticationTable } from '../../components/authentications_table'; +import { manageQuery } from '../../../common/components/page/manage_query'; +import { AuthenticationsQuery } from '../../containers/authentications'; import { HostsComponentsQueryProps } from './types'; -import { hostsModel } from '../../../store/hosts'; +import { hostsModel } from '../../store'; import { MatrixHistogramOption, MatrixHistogramMappingTypes, MatrixHisrogramConfigs, -} from '../../../components/matrix_histogram/types'; -import { MatrixHistogramContainer } from '../../../components/matrix_histogram'; -import { KpiHostsChartColors } from '../../../components/page/hosts/kpi_hosts/types'; +} from '../../../common/components/matrix_histogram/types'; +import { MatrixHistogramContainer } from '../../../common/components/matrix_histogram'; +import { KpiHostsChartColors } from '../../components/kpi_hosts/types'; import * as i18n from '../translations'; import { HistogramType } from '../../../graphql/types'; diff --git a/x-pack/plugins/siem/public/pages/hosts/navigation/events_query_tab_body.tsx b/x-pack/plugins/siem/public/hosts/pages/navigation/events_query_tab_body.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/hosts/navigation/events_query_tab_body.tsx rename to x-pack/plugins/siem/public/hosts/pages/navigation/events_query_tab_body.tsx index cb2c19c642bc45..6d2183a3a38d96 100644 --- a/x-pack/plugins/siem/public/pages/hosts/navigation/events_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/navigation/events_query_tab_body.tsx @@ -5,15 +5,15 @@ */ import React, { useEffect } from 'react'; -import { StatefulEventsViewer } from '../../../components/events_viewer'; +import { StatefulEventsViewer } from '../../../common/components/events_viewer'; import { HostsComponentsQueryProps } from './types'; -import { hostsModel } from '../../../store/hosts'; -import { eventsDefaultModel } from '../../../components/events_viewer/default_model'; +import { hostsModel } from '../../store'; +import { eventsDefaultModel } from '../../../common/components/events_viewer/default_model'; import { MatrixHistogramOption, MatrixHisrogramConfigs, -} from '../../../components/matrix_histogram/types'; -import { MatrixHistogramContainer } from '../../../components/matrix_histogram'; +} from '../../../common/components/matrix_histogram/types'; +import { MatrixHistogramContainer } from '../../../common/components/matrix_histogram'; import * as i18n from '../translations'; import { HistogramType } from '../../../graphql/types'; diff --git a/x-pack/plugins/siem/public/pages/hosts/navigation/hosts_query_tab_body.tsx b/x-pack/plugins/siem/public/hosts/pages/navigation/hosts_query_tab_body.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/hosts/navigation/hosts_query_tab_body.tsx rename to x-pack/plugins/siem/public/hosts/pages/navigation/hosts_query_tab_body.tsx index 6c301d692d0e17..95be25a6c4fecf 100644 --- a/x-pack/plugins/siem/public/pages/hosts/navigation/hosts_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/navigation/hosts_query_tab_body.tsx @@ -6,10 +6,10 @@ import { getOr } from 'lodash/fp'; import React from 'react'; -import { HostsQuery } from '../../../containers/hosts'; +import { HostsQuery } from '../../containers/hosts'; import { HostsComponentsQueryProps } from './types'; -import { HostsTable } from '../../../components/page/hosts'; -import { manageQuery } from '../../../components/page/manage_query'; +import { HostsTable } from '../../components/hosts_table'; +import { manageQuery } from '../../../common/components/page/manage_query'; const HostsTableManage = manageQuery(HostsTable); diff --git a/x-pack/plugins/siem/public/pages/hosts/navigation/index.ts b/x-pack/plugins/siem/public/hosts/pages/navigation/index.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/hosts/navigation/index.ts rename to x-pack/plugins/siem/public/hosts/pages/navigation/index.ts diff --git a/x-pack/plugins/siem/public/pages/hosts/navigation/types.ts b/x-pack/plugins/siem/public/hosts/pages/navigation/types.ts similarity index 81% rename from x-pack/plugins/siem/public/pages/hosts/navigation/types.ts rename to x-pack/plugins/siem/public/hosts/pages/navigation/types.ts index 20d4d4e463a7f0..76f56fe1718aa7 100644 --- a/x-pack/plugins/siem/public/pages/hosts/navigation/types.ts +++ b/x-pack/plugins/siem/public/hosts/pages/navigation/types.ts @@ -6,12 +6,12 @@ import { ESTermQuery } from '../../../../common/typed_json'; import { Filter, IIndexPattern } from '../../../../../../../src/plugins/data/public'; -import { NarrowDateRange } from '../../../components/ml/types'; -import { InspectQuery, Refetch } from '../../../store/inputs/model'; +import { NarrowDateRange } from '../../../common/components/ml/types'; +import { InspectQuery, Refetch } from '../../../common/store/inputs/model'; -import { HostsTableType, HostsType } from '../../../store/hosts/model'; -import { NavTab } from '../../../components/navigation/types'; -import { UpdateDateRange } from '../../../components/charts/common'; +import { HostsTableType, HostsType } from '../../store/model'; +import { NavTab } from '../../../common/components/navigation/types'; +import { UpdateDateRange } from '../../../common/components/charts/common'; export type KeyHostsNavTabWithoutMlPermission = HostsTableType.hosts & HostsTableType.authentications & diff --git a/x-pack/plugins/siem/public/pages/hosts/navigation/uncommon_process_query_tab_body.tsx b/x-pack/plugins/siem/public/hosts/pages/navigation/uncommon_process_query_tab_body.tsx similarity index 86% rename from x-pack/plugins/siem/public/pages/hosts/navigation/uncommon_process_query_tab_body.tsx rename to x-pack/plugins/siem/public/hosts/pages/navigation/uncommon_process_query_tab_body.tsx index 141e2e5a63684e..f1691dbaa04b45 100644 --- a/x-pack/plugins/siem/public/pages/hosts/navigation/uncommon_process_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/hosts/pages/navigation/uncommon_process_query_tab_body.tsx @@ -6,10 +6,10 @@ import { getOr } from 'lodash/fp'; import React from 'react'; -import { UncommonProcessesQuery } from '../../../containers/uncommon_processes'; +import { UncommonProcessesQuery } from '../../containers/uncommon_processes'; import { HostsComponentsQueryProps } from './types'; -import { UncommonProcessTable } from '../../../components/page/hosts'; -import { manageQuery } from '../../../components/page/manage_query'; +import { UncommonProcessTable } from '../../components/uncommon_process_table'; +import { manageQuery } from '../../../common/components/page/manage_query'; const UncommonProcessTableManage = manageQuery(UncommonProcessTable); diff --git a/x-pack/plugins/siem/public/pages/hosts/translations.ts b/x-pack/plugins/siem/public/hosts/pages/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/hosts/translations.ts rename to x-pack/plugins/siem/public/hosts/pages/translations.ts diff --git a/x-pack/plugins/siem/public/pages/hosts/types.ts b/x-pack/plugins/siem/public/hosts/pages/types.ts similarity index 79% rename from x-pack/plugins/siem/public/pages/hosts/types.ts rename to x-pack/plugins/siem/public/hosts/pages/types.ts index 408450aebebbdc..229349f390ecdb 100644 --- a/x-pack/plugins/siem/public/pages/hosts/types.ts +++ b/x-pack/plugins/siem/public/hosts/pages/types.ts @@ -7,10 +7,10 @@ import { IIndexPattern } from 'src/plugins/data/public'; import { ActionCreator } from 'typescript-fsa'; -import { SiemPageName } from '../home/types'; -import { hostsModel } from '../../store'; -import { GlobalTimeArgs } from '../../containers/global_time'; -import { InputsModelId } from '../../store/inputs/constants'; +import { SiemPageName } from '../../app/types'; +import { hostsModel } from '../store'; +import { GlobalTimeArgs } from '../../common/containers/global_time'; +import { InputsModelId } from '../../common/store/inputs/constants'; export const hostsPagePath = `/:pageName(${SiemPageName.hosts})`; export const hostDetailsPagePath = `${hostsPagePath}/:detailName`; diff --git a/x-pack/plugins/siem/public/hosts/routes.tsx b/x-pack/plugins/siem/public/hosts/routes.tsx new file mode 100644 index 00000000000000..93585fa0f83943 --- /dev/null +++ b/x-pack/plugins/siem/public/hosts/routes.tsx @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Route } from 'react-router-dom'; + +import { HostsContainer } from './pages'; +import { SiemPageName } from '../app/types'; + +export const getHostsRoutes = () => [ + } + />, +]; diff --git a/x-pack/plugins/siem/public/store/hosts/actions.ts b/x-pack/plugins/siem/public/hosts/store/actions.ts similarity index 100% rename from x-pack/plugins/siem/public/store/hosts/actions.ts rename to x-pack/plugins/siem/public/hosts/store/actions.ts diff --git a/x-pack/plugins/siem/public/store/hosts/helpers.test.ts b/x-pack/plugins/siem/public/hosts/store/helpers.test.ts similarity index 97% rename from x-pack/plugins/siem/public/store/hosts/helpers.test.ts rename to x-pack/plugins/siem/public/hosts/store/helpers.test.ts index a4eddb31b3e31e..4894e6d4c8c573 100644 --- a/x-pack/plugins/siem/public/store/hosts/helpers.test.ts +++ b/x-pack/plugins/siem/public/hosts/store/helpers.test.ts @@ -5,7 +5,7 @@ */ import { Direction, HostsFields } from '../../graphql/types'; -import { DEFAULT_TABLE_LIMIT } from '../constants'; +import { DEFAULT_TABLE_LIMIT } from '../../common/store/constants'; import { HostsModel, HostsTableType, HostsType } from './model'; import { setHostsQueriesActivePageToZero } from './helpers'; diff --git a/x-pack/plugins/siem/public/store/hosts/helpers.ts b/x-pack/plugins/siem/public/hosts/store/helpers.ts similarity index 96% rename from x-pack/plugins/siem/public/store/hosts/helpers.ts rename to x-pack/plugins/siem/public/hosts/store/helpers.ts index f6b5596b382f63..771c3b1061b6ce 100644 --- a/x-pack/plugins/siem/public/store/hosts/helpers.ts +++ b/x-pack/plugins/siem/public/hosts/store/helpers.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { DEFAULT_TABLE_ACTIVE_PAGE } from '../constants'; +import { DEFAULT_TABLE_ACTIVE_PAGE } from '../../common/store/constants'; import { HostsModel, HostsTableType, Queries, HostsType } from './model'; diff --git a/x-pack/plugins/siem/public/store/hosts/index.ts b/x-pack/plugins/siem/public/hosts/store/index.ts similarity index 68% rename from x-pack/plugins/siem/public/store/hosts/index.ts rename to x-pack/plugins/siem/public/hosts/store/index.ts index 93bdde791a7acf..89ad4a7602fe1c 100644 --- a/x-pack/plugins/siem/public/store/hosts/index.ts +++ b/x-pack/plugins/siem/public/hosts/store/index.ts @@ -4,9 +4,18 @@ * you may not use this file except in compliance with the Elastic License. */ +import { Reducer, AnyAction } from 'redux'; import * as hostsActions from './actions'; import * as hostsModel from './model'; import * as hostsSelectors from './selectors'; export { hostsActions, hostsModel, hostsSelectors }; export * from './reducer'; + +export interface HostsPluginState { + hosts: hostsModel.HostsModel; +} + +export interface HostsPluginReducer { + hosts: Reducer; +} diff --git a/x-pack/plugins/siem/public/store/hosts/model.ts b/x-pack/plugins/siem/public/hosts/store/model.ts similarity index 100% rename from x-pack/plugins/siem/public/store/hosts/model.ts rename to x-pack/plugins/siem/public/hosts/store/model.ts diff --git a/x-pack/plugins/siem/public/store/hosts/reducer.ts b/x-pack/plugins/siem/public/hosts/store/reducer.ts similarity index 99% rename from x-pack/plugins/siem/public/store/hosts/reducer.ts rename to x-pack/plugins/siem/public/hosts/store/reducer.ts index 53fe9a3ea6a2c2..59277f64650e68 100644 --- a/x-pack/plugins/siem/public/store/hosts/reducer.ts +++ b/x-pack/plugins/siem/public/hosts/store/reducer.ts @@ -7,7 +7,7 @@ import { reducerWithInitialState } from 'typescript-fsa-reducers'; import { Direction, HostsFields } from '../../graphql/types'; -import { DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from '../constants'; +import { DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from '../../common/store/constants'; import { setHostDetailsTablesActivePageToZero, diff --git a/x-pack/plugins/siem/public/store/hosts/selectors.ts b/x-pack/plugins/siem/public/hosts/store/selectors.ts similarity index 95% rename from x-pack/plugins/siem/public/store/hosts/selectors.ts rename to x-pack/plugins/siem/public/hosts/store/selectors.ts index e50968db31f604..96cae534bb352d 100644 --- a/x-pack/plugins/siem/public/store/hosts/selectors.ts +++ b/x-pack/plugins/siem/public/hosts/store/selectors.ts @@ -7,7 +7,7 @@ import { get } from 'lodash/fp'; import { createSelector } from 'reselect'; -import { State } from '../reducer'; +import { State } from '../../common/store/reducer'; import { GenericHostsModel, HostsType, HostsTableType } from './model'; diff --git a/x-pack/plugins/siem/public/components/arrows/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/arrows/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/arrows/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/arrows/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/arrows/helpers.test.ts b/x-pack/plugins/siem/public/network/components/arrows/helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/arrows/helpers.test.ts rename to x-pack/plugins/siem/public/network/components/arrows/helpers.test.ts diff --git a/x-pack/plugins/siem/public/components/arrows/helpers.ts b/x-pack/plugins/siem/public/network/components/arrows/helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/arrows/helpers.ts rename to x-pack/plugins/siem/public/network/components/arrows/helpers.ts diff --git a/x-pack/plugins/siem/public/components/arrows/index.test.tsx b/x-pack/plugins/siem/public/network/components/arrows/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/arrows/index.test.tsx rename to x-pack/plugins/siem/public/network/components/arrows/index.test.tsx index 5404a1ac43844f..e5fa1131c7c47c 100644 --- a/x-pack/plugins/siem/public/components/arrows/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/arrows/index.test.tsx @@ -7,7 +7,7 @@ import { mount } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../mock'; +import { TestProviders } from '../../../common/mock'; import { ArrowBody, ArrowHead } from '.'; diff --git a/x-pack/plugins/siem/public/components/arrows/index.tsx b/x-pack/plugins/siem/public/network/components/arrows/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/arrows/index.tsx rename to x-pack/plugins/siem/public/network/components/arrows/index.tsx diff --git a/x-pack/plugins/siem/public/components/direction/direction.test.tsx b/x-pack/plugins/siem/public/network/components/direction/direction.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/direction/direction.test.tsx rename to x-pack/plugins/siem/public/network/components/direction/direction.test.tsx diff --git a/x-pack/plugins/siem/public/components/direction/index.tsx b/x-pack/plugins/siem/public/network/components/direction/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/direction/index.tsx rename to x-pack/plugins/siem/public/network/components/direction/index.tsx index ad1e63dbd7e6a1..c8e8f009339c12 100644 --- a/x-pack/plugins/siem/public/components/direction/index.tsx +++ b/x-pack/plugins/siem/public/network/components/direction/index.tsx @@ -6,8 +6,8 @@ import React from 'react'; -import { NetworkDirectionEcs } from '../../graphql/types'; -import { DraggableBadge } from '../draggables'; +import { NetworkDirectionEcs } from '../../../graphql/types'; +import { DraggableBadge } from '../../../common/components/draggables'; import { NETWORK_DIRECTION_FIELD_NAME } from '../source_destination/field_names'; export const INBOUND = 'inbound'; diff --git a/x-pack/plugins/siem/public/components/embeddables/__mocks__/mock.ts b/x-pack/plugins/siem/public/network/components/embeddables/__mocks__/mock.ts similarity index 99% rename from x-pack/plugins/siem/public/components/embeddables/__mocks__/mock.ts rename to x-pack/plugins/siem/public/network/components/embeddables/__mocks__/mock.ts index 19ad0d452feb17..bc1de567b60ae7 100644 --- a/x-pack/plugins/siem/public/components/embeddables/__mocks__/mock.ts +++ b/x-pack/plugins/siem/public/network/components/embeddables/__mocks__/mock.ts @@ -5,7 +5,7 @@ */ import { IndexPatternMapping } from '../types'; -import { IndexPatternSavedObject } from '../../../hooks/types'; +import { IndexPatternSavedObject } from '../../../../common/hooks/types'; export const mockIndexPatternIds: IndexPatternMapping[] = [ { title: 'filebeat-*', id: '8c7323ac-97ad-4b53-ac0a-40f8f691a918' }, diff --git a/x-pack/plugins/siem/public/components/embeddables/__snapshots__/embeddable.test.tsx.snap b/x-pack/plugins/siem/public/network/components/embeddables/__snapshots__/embeddable.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/__snapshots__/embeddable.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/embeddables/__snapshots__/embeddable.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/embeddables/__snapshots__/embeddable_header.test.tsx.snap b/x-pack/plugins/siem/public/network/components/embeddables/__snapshots__/embeddable_header.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/__snapshots__/embeddable_header.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/embeddables/__snapshots__/embeddable_header.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/embeddables/__snapshots__/embedded_map.test.tsx.snap b/x-pack/plugins/siem/public/network/components/embeddables/__snapshots__/embedded_map.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/__snapshots__/embedded_map.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/embeddables/__snapshots__/embedded_map.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap b/x-pack/plugins/siem/public/network/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/embeddables/__snapshots__/index_patterns_missing_prompt.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/embeddables/embeddable.test.tsx b/x-pack/plugins/siem/public/network/components/embeddables/embeddable.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/embeddable.test.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/embeddable.test.tsx diff --git a/x-pack/plugins/siem/public/components/embeddables/embeddable.tsx b/x-pack/plugins/siem/public/network/components/embeddables/embeddable.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/embeddable.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/embeddable.tsx diff --git a/x-pack/plugins/siem/public/components/embeddables/embeddable_header.test.tsx b/x-pack/plugins/siem/public/network/components/embeddables/embeddable_header.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/embeddables/embeddable_header.test.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/embeddable_header.test.tsx index 3b8e137618ab0c..ecbff02353fef5 100644 --- a/x-pack/plugins/siem/public/components/embeddables/embeddable_header.test.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/embeddable_header.test.tsx @@ -7,7 +7,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../mock'; +import { TestProviders } from '../../../common/mock'; import { EmbeddableHeader } from './embeddable_header'; describe('EmbeddableHeader', () => { diff --git a/x-pack/plugins/siem/public/components/embeddables/embeddable_header.tsx b/x-pack/plugins/siem/public/network/components/embeddables/embeddable_header.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/embeddable_header.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/embeddable_header.tsx diff --git a/x-pack/plugins/siem/public/components/embeddables/embedded_map.test.tsx b/x-pack/plugins/siem/public/network/components/embeddables/embedded_map.test.tsx similarity index 85% rename from x-pack/plugins/siem/public/components/embeddables/embedded_map.test.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/embedded_map.test.tsx index a807b4d6a838bd..33eadad9aa774b 100644 --- a/x-pack/plugins/siem/public/components/embeddables/embedded_map.test.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/embedded_map.test.tsx @@ -7,15 +7,15 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { useIndexPatterns } from '../../hooks/use_index_patterns'; +import { useIndexPatterns } from '../../../common/hooks/use_index_patterns'; import { EmbeddedMapComponent } from './embedded_map'; import { SetQuery } from './types'; const mockUseIndexPatterns = useIndexPatterns as jest.Mock; -jest.mock('../../hooks/use_index_patterns'); +jest.mock('../../../common/hooks/use_index_patterns'); mockUseIndexPatterns.mockImplementation(() => [true, []]); -jest.mock('../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); describe('EmbeddedMapComponent', () => { let setQuery: SetQuery; diff --git a/x-pack/plugins/siem/public/components/embeddables/embedded_map.tsx b/x-pack/plugins/siem/public/network/components/embeddables/embedded_map.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/embeddables/embedded_map.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/embedded_map.tsx index d2dd3e54293414..2e9e13839d769a 100644 --- a/x-pack/plugins/siem/public/components/embeddables/embedded_map.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/embedded_map.tsx @@ -9,12 +9,15 @@ import React, { useEffect, useState } from 'react'; import { createPortalNode, InPortal } from 'react-reverse-portal'; import styled, { css } from 'styled-components'; -import { EmbeddablePanel, ErrorEmbeddable } from '../../../../../../src/plugins/embeddable/public'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; -import { getIndexPatternTitleIdMapping } from '../../hooks/api/helpers'; -import { useIndexPatterns } from '../../hooks/use_index_patterns'; -import { Loader } from '../loader'; -import { displayErrorToast, useStateToaster } from '../toasters'; +import { + EmbeddablePanel, + ErrorEmbeddable, +} from '../../../../../../../src/plugins/embeddable/public'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; +import { getIndexPatternTitleIdMapping } from '../../../common/hooks/api/helpers'; +import { useIndexPatterns } from '../../../common/hooks/use_index_patterns'; +import { Loader } from '../../../common/components/loader'; +import { displayErrorToast, useStateToaster } from '../../../common/components/toasters'; import { Embeddable } from './embeddable'; import { EmbeddableHeader } from './embeddable_header'; import { createEmbeddable, findMatchingIndexPatterns } from './embedded_map_helpers'; @@ -22,10 +25,10 @@ import { IndexPatternsMissingPrompt } from './index_patterns_missing_prompt'; import { MapToolTip } from './map_tool_tip/map_tool_tip'; import * as i18n from './translations'; import { SetQuery } from './types'; -import { MapEmbeddable } from '../../../../../legacy/plugins/maps/public'; -import { Query, Filter } from '../../../../../../src/plugins/data/public'; -import { useKibana, useUiSetting$ } from '../../lib/kibana'; -import { getSavedObjectFinder } from '../../../../../../src/plugins/saved_objects/public'; +import { MapEmbeddable } from '../../../../../../legacy/plugins/maps/public'; +import { Query, Filter } from '../../../../../../../src/plugins/data/public'; +import { useKibana, useUiSetting$ } from '../../../common/lib/kibana'; +import { getSavedObjectFinder } from '../../../../../../../src/plugins/saved_objects/public'; interface EmbeddableMapProps { maintainRatio?: boolean; diff --git a/x-pack/plugins/siem/public/components/embeddables/embedded_map_helpers.test.tsx b/x-pack/plugins/siem/public/network/components/embeddables/embedded_map_helpers.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/embeddables/embedded_map_helpers.test.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/embedded_map_helpers.test.tsx index aaae43d9684af0..d42ac919e9af07 100644 --- a/x-pack/plugins/siem/public/components/embeddables/embedded_map_helpers.test.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/embedded_map_helpers.test.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { embeddablePluginMock } from '../../../../../../src/plugins/embeddable/public/mocks'; +import { embeddablePluginMock } from '../../../../../../../src/plugins/embeddable/public/mocks'; import { createEmbeddable, findMatchingIndexPatterns } from './embedded_map_helpers'; import { createPortalNode } from 'react-reverse-portal'; import { diff --git a/x-pack/plugins/siem/public/components/embeddables/embedded_map_helpers.tsx b/x-pack/plugins/siem/public/network/components/embeddables/embedded_map_helpers.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/embeddables/embedded_map_helpers.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/embedded_map_helpers.tsx index dd7e1cd6ea9bac..37da8abc029b11 100644 --- a/x-pack/plugins/siem/public/components/embeddables/embedded_map_helpers.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/embedded_map_helpers.tsx @@ -10,22 +10,22 @@ import { OutPortal, PortalNode } from 'react-reverse-portal'; import minimatch from 'minimatch'; import { IndexPatternMapping, SetQuery } from './types'; import { getLayerList } from './map_config'; -import { MAP_SAVED_OBJECT_TYPE } from '../../../../maps/public'; +import { MAP_SAVED_OBJECT_TYPE } from '../../../../../maps/public'; import { MapEmbeddable, RenderTooltipContentParams, MapEmbeddableInput, -} from '../../../../../legacy/plugins/maps/public'; +} from '../../../../../../legacy/plugins/maps/public'; import * as i18n from './translations'; -import { Query, Filter } from '../../../../../../src/plugins/data/public'; +import { Query, Filter } from '../../../../../../../src/plugins/data/public'; import { EmbeddableStart, isErrorEmbeddable, EmbeddableOutput, ViewMode, ErrorEmbeddable, -} from '../../../../../../src/plugins/embeddable/public'; -import { IndexPatternSavedObject } from '../../hooks/types'; +} from '../../../../../../../src/plugins/embeddable/public'; +import { IndexPatternSavedObject } from '../../../common/hooks/types'; /** * Creates MapEmbeddable with provided initial configuration diff --git a/x-pack/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx b/x-pack/plugins/siem/public/network/components/embeddables/index_patterns_missing_prompt.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/index_patterns_missing_prompt.test.tsx index 4f617644a1fe14..af31cf64df84e6 100644 --- a/x-pack/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.test.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/index_patterns_missing_prompt.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { IndexPatternsMissingPromptComponent } from './index_patterns_missing_prompt'; -jest.mock('../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); describe('IndexPatternsMissingPrompt', () => { test('renders correctly against snapshot', () => { diff --git a/x-pack/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx b/x-pack/plugins/siem/public/network/components/embeddables/index_patterns_missing_prompt.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/index_patterns_missing_prompt.tsx index abd33505b67b99..aeed6fb2fe20e6 100644 --- a/x-pack/plugins/siem/public/components/embeddables/index_patterns_missing_prompt.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/index_patterns_missing_prompt.tsx @@ -8,7 +8,7 @@ import { EuiButton, EuiCode, EuiEmptyPrompt } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import React from 'react'; -import { useKibana, useBasePath } from '../../lib/kibana'; +import { useKibana, useBasePath } from '../../../common/lib/kibana'; import * as i18n from './translations'; export const IndexPatternsMissingPromptComponent = () => { diff --git a/x-pack/plugins/siem/public/components/embeddables/map_config.test.ts b/x-pack/plugins/siem/public/network/components/embeddables/map_config.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_config.test.ts rename to x-pack/plugins/siem/public/network/components/embeddables/map_config.test.ts diff --git a/x-pack/plugins/siem/public/components/embeddables/map_config.ts b/x-pack/plugins/siem/public/network/components/embeddables/map_config.ts similarity index 99% rename from x-pack/plugins/siem/public/components/embeddables/map_config.ts rename to x-pack/plugins/siem/public/network/components/embeddables/map_config.ts index 0d1cd515820c58..88bc6e69949841 100644 --- a/x-pack/plugins/siem/public/components/embeddables/map_config.ts +++ b/x-pack/plugins/siem/public/network/components/embeddables/map_config.ts @@ -13,7 +13,7 @@ import { LayerMappingDetails, } from './types'; import * as i18n from './translations'; -import { SOURCE_TYPES } from '../../../../maps/common/constants'; +import { SOURCE_TYPES } from '../../../../../maps/common/constants'; const euiVisColorPalette = euiPaletteColorBlind(); // Update field mappings to modify what fields will be returned to map tooltip diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/line_tool_tip_content.test.tsx.snap b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/__snapshots__/line_tool_tip_content.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/line_tool_tip_content.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/__snapshots__/line_tool_tip_content.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/map_tool_tip.test.tsx.snap b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/__snapshots__/map_tool_tip.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/map_tool_tip.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/__snapshots__/map_tool_tip.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/point_tool_tip_content.test.tsx.snap b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/__snapshots__/point_tool_tip_content.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/point_tool_tip_content.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/__snapshots__/point_tool_tip_content.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/tooltip_footer.test.tsx.snap b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/__snapshots__/tooltip_footer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/__snapshots__/tooltip_footer.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/__snapshots__/tooltip_footer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.test.tsx diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.tsx b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/line_tool_tip_content.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/line_tool_tip_content.tsx diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.test.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/map_tool_tip.test.tsx diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.tsx b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx index fc55e3437dc218..0f38c350986b40 100644 --- a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/map_tool_tip.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/map_tool_tip.tsx @@ -15,7 +15,7 @@ import { FeatureGeometry, FeatureProperty, MapToolTipProps } from '../types'; import { ToolTipFooter } from './tooltip_footer'; import { LineToolTipContent } from './line_tool_tip_content'; import { PointToolTipContent } from './point_tool_tip_content'; -import { Loader } from '../../loader'; +import { Loader } from '../../../../common/components/loader'; import * as i18n from '../translations'; export const MapToolTipComponent = ({ diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx index c90af16b0d99a6..d5a7c51ccdeb8d 100644 --- a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.test.tsx @@ -8,11 +8,11 @@ import { shallow } from 'enzyme'; import React from 'react'; import { FeatureProperty } from '../types'; import { getRenderedFieldValue, PointToolTipContentComponent } from './point_tool_tip_content'; -import { TestProviders } from '../../../mock'; -import { getEmptyStringTag } from '../../empty_value'; -import { HostDetailsLink, IPDetailsLink } from '../../links'; -import { useMountAppended } from '../../../utils/use_mount_appended'; -import { FlowTarget } from '../../../graphql/types'; +import { TestProviders } from '../../../../common/mock'; +import { getEmptyStringTag } from '../../../../common/components/empty_value'; +import { HostDetailsLink, IPDetailsLink } from '../../../../common/components/links'; +import { useMountAppended } from '../../../../common/utils/use_mount_appended'; +import { FlowTarget } from '../../../../graphql/types'; describe('PointToolTipContent', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.tsx b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx similarity index 81% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx index c635061ca7b7a8..c691407f6166ec 100644 --- a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/point_tool_tip_content.tsx +++ b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/point_tool_tip_content.tsx @@ -9,13 +9,16 @@ import { sourceDestinationFieldMappings } from '../map_config'; import { AddFilterToGlobalSearchBar, createFilter, -} from '../../page/add_filter_to_global_search_bar'; -import { getEmptyTagValue, getOrEmptyTagFromValue } from '../../empty_value'; -import { DescriptionListStyled } from '../../page'; +} from '../../../../common/components/add_filter_to_global_search_bar'; +import { + getEmptyTagValue, + getOrEmptyTagFromValue, +} from '../../../../common/components/empty_value'; +import { DescriptionListStyled } from '../../../../common/components/page'; import { FeatureProperty } from '../types'; -import { HostDetailsLink, IPDetailsLink } from '../../links'; -import { DefaultFieldRenderer } from '../../field_renderers/field_renderers'; -import { FlowTarget } from '../../../graphql/types'; +import { HostDetailsLink, IPDetailsLink } from '../../../../common/components/links'; +import { DefaultFieldRenderer } from '../../../../timelines/components/field_renderers/field_renderers'; +import { FlowTarget } from '../../../../graphql/types'; interface PointToolTipContentProps { contextId: string; diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/tooltip_footer.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.test.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/tooltip_footer.test.tsx diff --git a/x-pack/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.tsx b/x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/tooltip_footer.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/map_tool_tip/tooltip_footer.tsx rename to x-pack/plugins/siem/public/network/components/embeddables/map_tool_tip/tooltip_footer.tsx diff --git a/x-pack/plugins/siem/public/components/embeddables/translations.ts b/x-pack/plugins/siem/public/network/components/embeddables/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/embeddables/translations.ts rename to x-pack/plugins/siem/public/network/components/embeddables/translations.ts diff --git a/x-pack/plugins/siem/public/components/embeddables/types.ts b/x-pack/plugins/siem/public/network/components/embeddables/types.ts similarity index 88% rename from x-pack/plugins/siem/public/components/embeddables/types.ts rename to x-pack/plugins/siem/public/network/components/embeddables/types.ts index d8e20c7f47b4ed..e111c2728ba7ea 100644 --- a/x-pack/plugins/siem/public/components/embeddables/types.ts +++ b/x-pack/plugins/siem/public/network/components/embeddables/types.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { RenderTooltipContentParams } from '../../../../../legacy/plugins/maps/public'; -import { inputsModel } from '../../store/inputs'; +import { RenderTooltipContentParams } from '../../../../../../legacy/plugins/maps/public'; +import { inputsModel } from '../../../common/store/inputs'; export interface IndexPatternMapping { title: string; diff --git a/x-pack/plugins/siem/public/components/flow_controls/__snapshots__/flow_direction_select.test.tsx.snap b/x-pack/plugins/siem/public/network/components/flow_controls/__snapshots__/flow_direction_select.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/flow_controls/__snapshots__/flow_direction_select.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/flow_controls/__snapshots__/flow_direction_select.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/flow_controls/__snapshots__/flow_target_select.test.tsx.snap b/x-pack/plugins/siem/public/network/components/flow_controls/__snapshots__/flow_target_select.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/flow_controls/__snapshots__/flow_target_select.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/flow_controls/__snapshots__/flow_target_select.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx b/x-pack/plugins/siem/public/network/components/flow_controls/flow_direction_select.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx rename to x-pack/plugins/siem/public/network/components/flow_controls/flow_direction_select.test.tsx index f984b534c188d7..0a35b28db8ce4e 100644 --- a/x-pack/plugins/siem/public/components/flow_controls/flow_direction_select.test.tsx +++ b/x-pack/plugins/siem/public/network/components/flow_controls/flow_direction_select.test.tsx @@ -7,7 +7,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { FlowDirection } from '../../graphql/types'; +import { FlowDirection } from '../../../graphql/types'; import { FlowDirectionSelect } from './flow_direction_select'; diff --git a/x-pack/plugins/siem/public/components/flow_controls/flow_direction_select.tsx b/x-pack/plugins/siem/public/network/components/flow_controls/flow_direction_select.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/flow_controls/flow_direction_select.tsx rename to x-pack/plugins/siem/public/network/components/flow_controls/flow_direction_select.tsx index 2b826164063be1..d3698a772300bf 100644 --- a/x-pack/plugins/siem/public/components/flow_controls/flow_direction_select.tsx +++ b/x-pack/plugins/siem/public/network/components/flow_controls/flow_direction_select.tsx @@ -7,7 +7,7 @@ import { EuiFilterButton, EuiFilterGroup } from '@elastic/eui'; import React from 'react'; -import { FlowDirection } from '../../graphql/types'; +import { FlowDirection } from '../../../graphql/types'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx b/x-pack/plugins/siem/public/network/components/flow_controls/flow_target_select.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx rename to x-pack/plugins/siem/public/network/components/flow_controls/flow_target_select.test.tsx index 67006d8a7a121a..d033ffc09a82db 100644 --- a/x-pack/plugins/siem/public/components/flow_controls/flow_target_select.test.tsx +++ b/x-pack/plugins/siem/public/network/components/flow_controls/flow_target_select.test.tsx @@ -8,7 +8,7 @@ import { mount, shallow } from 'enzyme'; import { clone } from 'lodash/fp'; import React from 'react'; -import { FlowDirection, FlowTarget } from '../../graphql/types'; +import { FlowDirection, FlowTarget } from '../../../graphql/types'; import { FlowTargetSelect } from './flow_target_select'; diff --git a/x-pack/plugins/siem/public/components/flow_controls/flow_target_select.tsx b/x-pack/plugins/siem/public/network/components/flow_controls/flow_target_select.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/flow_controls/flow_target_select.tsx rename to x-pack/plugins/siem/public/network/components/flow_controls/flow_target_select.tsx index 15d1c663638374..6d6dcfd33b870f 100644 --- a/x-pack/plugins/siem/public/components/flow_controls/flow_target_select.tsx +++ b/x-pack/plugins/siem/public/network/components/flow_controls/flow_target_select.tsx @@ -7,7 +7,7 @@ import { EuiSuperSelect } from '@elastic/eui'; import React from 'react'; -import { FlowDirection, FlowTarget } from '../../graphql/types'; +import { FlowDirection, FlowTarget } from '../../../graphql/types'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/flow_controls/translations.ts b/x-pack/plugins/siem/public/network/components/flow_controls/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/flow_controls/translations.ts rename to x-pack/plugins/siem/public/network/components/flow_controls/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx b/x-pack/plugins/siem/public/network/components/flow_target_select_connected/index.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx rename to x-pack/plugins/siem/public/network/components/flow_target_select_connected/index.test.tsx index e71be5a51e5053..edf9e69eeed563 100644 --- a/x-pack/plugins/siem/public/components/page/network/flow_target_select_connected/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/flow_target_select_connected/index.test.tsx @@ -8,9 +8,9 @@ import { mount } from 'enzyme'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; import { FlowTargetSelectConnectedComponent } from './index'; -import { FlowTarget } from '../../../../graphql/types'; +import { FlowTarget } from '../../../graphql/types'; describe('Flow Target Select Connected', () => { test('renders correctly against snapshot flowTarget source', () => { diff --git a/x-pack/plugins/siem/public/components/page/network/flow_target_select_connected/index.tsx b/x-pack/plugins/siem/public/network/components/flow_target_select_connected/index.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/page/network/flow_target_select_connected/index.tsx rename to x-pack/plugins/siem/public/network/components/flow_target_select_connected/index.tsx index 2651c31e0a2c9e..3ce623cfc97b8f 100644 --- a/x-pack/plugins/siem/public/components/page/network/flow_target_select_connected/index.tsx +++ b/x-pack/plugins/siem/public/network/components/flow_target_select_connected/index.tsx @@ -10,11 +10,11 @@ import React, { useCallback } from 'react'; import { useHistory, useLocation } from 'react-router-dom'; import styled from 'styled-components'; -import { FlowDirection, FlowTarget } from '../../../../graphql/types'; +import { FlowDirection, FlowTarget } from '../../../graphql/types'; import * as i18nIp from '../ip_overview/translations'; -import { FlowTargetSelect } from '../../../flow_controls/flow_target_select'; -import { IpOverviewId } from '../../../field_renderers/field_renderers'; +import { FlowTargetSelect } from '../flow_controls/flow_target_select'; +import { IpOverviewId } from '../../../timelines/components/field_renderers/field_renderers'; const SelectTypeItem = styled(EuiFlexItem)` min-width: 180px; diff --git a/x-pack/plugins/siem/public/components/ip/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/ip/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/ip/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/ip/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/ip/index.test.tsx b/x-pack/plugins/siem/public/network/components/ip/index.test.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/ip/index.test.tsx rename to x-pack/plugins/siem/public/network/components/ip/index.test.tsx index 209fc63c7355c6..78ba0bb530c9d0 100644 --- a/x-pack/plugins/siem/public/components/ip/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/ip/index.test.tsx @@ -7,8 +7,8 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../mock/test_providers'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { TestProviders } from '../../../common/mock/test_providers'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { Ip } from '.'; diff --git a/x-pack/plugins/siem/public/components/ip/index.tsx b/x-pack/plugins/siem/public/network/components/ip/index.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/ip/index.tsx rename to x-pack/plugins/siem/public/network/components/ip/index.tsx index 49237c3bb1bb96..21e2dd3ebc04dc 100644 --- a/x-pack/plugins/siem/public/components/ip/index.tsx +++ b/x-pack/plugins/siem/public/network/components/ip/index.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { FormattedFieldValue } from '../timeline/body/renderers/formatted_field'; +import { FormattedFieldValue } from '../../../timelines/components/timeline/body/renderers/formatted_field'; export const SOURCE_IP_FIELD_NAME = 'source.ip'; export const DESTINATION_IP_FIELD_NAME = 'destination.ip'; diff --git a/x-pack/plugins/siem/public/components/page/network/ip_overview/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/ip_overview/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/ip_overview/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/ip_overview/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/network/ip_overview/index.test.tsx b/x-pack/plugins/siem/public/network/components/ip_overview/index.test.tsx similarity index 71% rename from x-pack/plugins/siem/public/components/page/network/ip_overview/index.test.tsx rename to x-pack/plugins/siem/public/network/components/ip_overview/index.test.tsx index 3038d7f41c632e..bce811c58e4367 100644 --- a/x-pack/plugins/siem/public/components/page/network/ip_overview/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/ip_overview/index.test.tsx @@ -8,22 +8,28 @@ import { shallow } from 'enzyme'; import React from 'react'; import { ActionCreator } from 'typescript-fsa'; -import { FlowTarget } from '../../../../graphql/types'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock'; -import { createStore, networkModel, State } from '../../../../store'; +import { FlowTarget } from '../../../graphql/types'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { createStore, State } from '../../../common/store'; +import { networkModel } from '../../store'; import { IpOverview } from './index'; import { mockData } from './mock'; -import { mockAnomalies } from '../../../ml/mock'; -import { NarrowDateRange } from '../../../ml/types'; +import { mockAnomalies } from '../../../common/components/ml/mock'; +import { NarrowDateRange } from '../../../common/components/ml/types'; describe('IP Overview Component', () => { const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/network/ip_overview/index.tsx b/x-pack/plugins/siem/public/network/components/ip_overview/index.tsx similarity index 80% rename from x-pack/plugins/siem/public/components/page/network/ip_overview/index.tsx rename to x-pack/plugins/siem/public/network/components/ip_overview/index.tsx index 456deaac0fb154..56f6d27dc28ca4 100644 --- a/x-pack/plugins/siem/public/components/page/network/ip_overview/index.tsx +++ b/x-pack/plugins/siem/public/network/components/ip_overview/index.tsx @@ -9,12 +9,12 @@ import darkTheme from '@elastic/eui/dist/eui_theme_dark.json'; import lightTheme from '@elastic/eui/dist/eui_theme_light.json'; import React from 'react'; -import { DEFAULT_DARK_MODE } from '../../../../../common/constants'; -import { DescriptionList } from '../../../../../common/utility_types'; -import { useUiSetting$ } from '../../../../lib/kibana'; -import { FlowTarget, IpOverviewData, Overview } from '../../../../graphql/types'; -import { networkModel } from '../../../../store'; -import { getEmptyTagValue } from '../../../empty_value'; +import { DEFAULT_DARK_MODE } from '../../../../common/constants'; +import { DescriptionList } from '../../../../common/utility_types'; +import { useUiSetting$ } from '../../../common/lib/kibana'; +import { FlowTarget, IpOverviewData, Overview } from '../../../graphql/types'; +import { networkModel } from '../../store'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; import { autonomousSystemRenderer, @@ -24,15 +24,15 @@ import { locationRenderer, reputationRenderer, whoisRenderer, -} from '../../../field_renderers/field_renderers'; +} from '../../../timelines/components/field_renderers/field_renderers'; import * as i18n from './translations'; -import { DescriptionListStyled, OverviewWrapper } from '../../index'; -import { Loader } from '../../../loader'; -import { Anomalies, NarrowDateRange } from '../../../ml/types'; -import { AnomalyScores } from '../../../ml/score/anomaly_scores'; -import { useMlCapabilities } from '../../../ml_popover/hooks/use_ml_capabilities'; -import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions'; -import { InspectButton, InspectButtonContainer } from '../../../inspect'; +import { DescriptionListStyled, OverviewWrapper } from '../../../common/components/page'; +import { Loader } from '../../../common/components/loader'; +import { Anomalies, NarrowDateRange } from '../../../common/components/ml/types'; +import { AnomalyScores } from '../../../common/components/ml/score/anomaly_scores'; +import { useMlCapabilities } from '../../../common/components/ml_popover/hooks/use_ml_capabilities'; +import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; +import { InspectButton, InspectButtonContainer } from '../../../common/components/inspect'; interface OwnProps { data: IpOverviewData; diff --git a/x-pack/plugins/siem/public/components/page/network/ip_overview/mock.ts b/x-pack/plugins/siem/public/network/components/ip_overview/mock.ts similarity index 96% rename from x-pack/plugins/siem/public/components/page/network/ip_overview/mock.ts rename to x-pack/plugins/siem/public/network/components/ip_overview/mock.ts index aaacdae70aef79..aa86fb177b02ad 100644 --- a/x-pack/plugins/siem/public/components/page/network/ip_overview/mock.ts +++ b/x-pack/plugins/siem/public/network/components/ip_overview/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { IpOverviewData } from '../../../../graphql/types'; +import { IpOverviewData } from '../../../graphql/types'; export const mockData: Readonly> = { complete: { diff --git a/x-pack/plugins/siem/public/components/page/network/ip_overview/translations.ts b/x-pack/plugins/siem/public/network/components/ip_overview/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/ip_overview/translations.ts rename to x-pack/plugins/siem/public/network/components/ip_overview/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/network/kpi_network/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/kpi_network/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/kpi_network/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/kpi_network/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/network/kpi_network/index.test.tsx b/x-pack/plugins/siem/public/network/components/kpi_network/index.test.tsx similarity index 84% rename from x-pack/plugins/siem/public/components/page/network/kpi_network/index.test.tsx rename to x-pack/plugins/siem/public/network/components/kpi_network/index.test.tsx index 48d3b25f59e4a2..70c952b1107451 100644 --- a/x-pack/plugins/siem/public/components/page/network/kpi_network/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/kpi_network/index.test.tsx @@ -8,9 +8,8 @@ import { shallow } from 'enzyme'; import React from 'react'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { apolloClientObservable, mockGlobalState } from '../../../../mock'; -import { createStore, State } from '../../../../store'; - +import { apolloClientObservable, mockGlobalState, SUB_PLUGINS_REDUCER } from '../../../common/mock'; +import { createStore, State } from '../../../common/store'; import { KpiNetworkComponent } from '.'; import { mockData } from './mock'; @@ -20,10 +19,10 @@ describe('KpiNetwork Component', () => { const to = new Date('2019-06-18T06:00:00.000Z').valueOf(); const narrowDateRange = jest.fn(); - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/network/kpi_network/index.tsx b/x-pack/plugins/siem/public/network/components/kpi_network/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/page/network/kpi_network/index.tsx rename to x-pack/plugins/siem/public/network/components/kpi_network/index.tsx index e81c65fbc6afb7..ac7381160515d8 100644 --- a/x-pack/plugins/siem/public/components/page/network/kpi_network/index.tsx +++ b/x-pack/plugins/siem/public/network/components/kpi_network/index.tsx @@ -21,11 +21,11 @@ import { StatItemsProps, useKpiMatrixStatus, StatItems, -} from '../../../../components/stat_items'; -import { KpiNetworkData } from '../../../../graphql/types'; +} from '../../../common/components/stat_items'; +import { KpiNetworkData } from '../../../graphql/types'; import * as i18n from './translations'; -import { UpdateDateRange } from '../../../charts/common'; +import { UpdateDateRange } from '../../../common/components/charts/common'; const kipsPerRow = 2; const kpiWidgetHeight = 228; diff --git a/x-pack/plugins/siem/public/components/page/network/kpi_network/mock.ts b/x-pack/plugins/siem/public/network/components/kpi_network/mock.ts similarity index 97% rename from x-pack/plugins/siem/public/components/page/network/kpi_network/mock.ts rename to x-pack/plugins/siem/public/network/components/kpi_network/mock.ts index 4edaf76bb48202..a8b04ff29f4b67 100644 --- a/x-pack/plugins/siem/public/components/page/network/kpi_network/mock.ts +++ b/x-pack/plugins/siem/public/network/components/kpi_network/mock.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { KpiNetworkData } from '../../../../graphql/types'; -import { StatItems } from '../../../stat_items'; +import { KpiNetworkData } from '../../../graphql/types'; +import { StatItems } from '../../../common/components/stat_items'; export const mockNarrowDateRange = jest.fn(); diff --git a/x-pack/plugins/siem/public/components/page/network/kpi_network/translations.ts b/x-pack/plugins/siem/public/network/components/kpi_network/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/kpi_network/translations.ts rename to x-pack/plugins/siem/public/network/components/kpi_network/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/network/network_dns_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/network_dns_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_dns_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/network_dns_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/network/network_dns_table/__snapshots__/is_ptr_included.test.tsx.snap b/x-pack/plugins/siem/public/network/components/network_dns_table/__snapshots__/is_ptr_included.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_dns_table/__snapshots__/is_ptr_included.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/network_dns_table/__snapshots__/is_ptr_included.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/network/network_dns_table/columns.tsx b/x-pack/plugins/siem/public/network/components/network_dns_table/columns.tsx similarity index 81% rename from x-pack/plugins/siem/public/components/page/network/network_dns_table/columns.tsx rename to x-pack/plugins/siem/public/network/components/network_dns_table/columns.tsx index 83a902d7bbde4a..dbc09daaf0abc6 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_dns_table/columns.tsx +++ b/x-pack/plugins/siem/public/network/components/network_dns_table/columns.tsx @@ -7,14 +7,17 @@ import numeral from '@elastic/numeral'; import React from 'react'; -import { NetworkDnsFields, NetworkDnsItem } from '../../../../graphql/types'; -import { DragEffects, DraggableWrapper } from '../../../drag_and_drop/draggable_wrapper'; -import { escapeDataProviderId } from '../../../drag_and_drop/helpers'; -import { defaultToEmptyTag, getEmptyTagValue } from '../../../empty_value'; -import { Columns } from '../../../paginated_table'; -import { IS_OPERATOR } from '../../../timeline/data_providers/data_provider'; -import { PreferenceFormattedBytes } from '../../../formatted_bytes'; -import { Provider } from '../../../timeline/data_providers/provider'; +import { NetworkDnsFields, NetworkDnsItem } from '../../../graphql/types'; +import { + DragEffects, + DraggableWrapper, +} from '../../../common/components/drag_and_drop/draggable_wrapper'; +import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers'; +import { defaultToEmptyTag, getEmptyTagValue } from '../../../common/components/empty_value'; +import { Columns } from '../../../common/components/paginated_table'; +import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { PreferenceFormattedBytes } from '../../../common/components/formatted_bytes'; +import { Provider } from '../../../timelines/components/timeline/data_providers/provider'; import * as i18n from './translations'; export type NetworkDnsColumns = [ diff --git a/x-pack/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx b/x-pack/plugins/siem/public/network/components/network_dns_table/index.test.tsx similarity index 86% rename from x-pack/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx rename to x-pack/plugins/siem/public/network/components/network_dns_table/index.test.tsx index e425057dd0f75f..f2d8ce6cb6c448 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_dns_table/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/network_dns_table/index.test.tsx @@ -10,9 +10,15 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock'; -import { createStore, networkModel, State } from '../../../../store'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { State, createStore } from '../../../common/store'; +import { networkModel } from '../../store'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { NetworkDnsTable } from '.'; import { mockData } from './mock'; @@ -20,11 +26,11 @@ import { mockData } from './mock'; describe('NetworkTopNFlow Table Component', () => { const loadPage = jest.fn(); const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); const mount = useMountAppended(); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/network/network_dns_table/index.tsx b/x-pack/plugins/siem/public/network/components/network_dns_table/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/page/network/network_dns_table/index.tsx rename to x-pack/plugins/siem/public/network/components/network_dns_table/index.tsx index c1dd96c5c96f91..fc763298f08f47 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_dns_table/index.tsx +++ b/x-pack/plugins/siem/public/network/components/network_dns_table/index.tsx @@ -8,15 +8,15 @@ import React, { useCallback, useMemo } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import deepEqual from 'fast-deep-equal'; -import { networkActions } from '../../../../store/actions'; +import { networkActions, networkModel, networkSelectors } from '../../store'; import { Direction, NetworkDnsEdges, NetworkDnsFields, NetworkDnsSortField, -} from '../../../../graphql/types'; -import { networkModel, networkSelectors, State } from '../../../../store'; -import { Criteria, ItemsPerRow, PaginatedTable } from '../../../paginated_table'; +} from '../../../graphql/types'; +import { State } from '../../../common/store'; +import { Criteria, ItemsPerRow, PaginatedTable } from '../../../common/components/paginated_table'; import { getNetworkDnsColumns } from './columns'; import { IsPtrIncluded } from './is_ptr_included'; diff --git a/x-pack/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx b/x-pack/plugins/siem/public/network/components/network_dns_table/is_ptr_included.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx rename to x-pack/plugins/siem/public/network/components/network_dns_table/is_ptr_included.test.tsx index 31a1b1667087a7..36dca6981a7ae9 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.test.tsx +++ b/x-pack/plugins/siem/public/network/components/network_dns_table/is_ptr_included.test.tsx @@ -7,7 +7,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { FlowDirection } from '../../../../graphql/types'; +import { FlowDirection } from '../../../graphql/types'; import { IsPtrIncluded } from './is_ptr_included'; diff --git a/x-pack/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.tsx b/x-pack/plugins/siem/public/network/components/network_dns_table/is_ptr_included.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_dns_table/is_ptr_included.tsx rename to x-pack/plugins/siem/public/network/components/network_dns_table/is_ptr_included.tsx diff --git a/x-pack/plugins/siem/public/components/page/network/network_dns_table/mock.ts b/x-pack/plugins/siem/public/network/components/network_dns_table/mock.ts similarity index 98% rename from x-pack/plugins/siem/public/components/page/network/network_dns_table/mock.ts rename to x-pack/plugins/siem/public/network/components/network_dns_table/mock.ts index 281125edb9dc42..d094256fa40269 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_dns_table/mock.ts +++ b/x-pack/plugins/siem/public/network/components/network_dns_table/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { NetworkDnsData } from '../../../../graphql/types'; +import { NetworkDnsData } from '../../../graphql/types'; export const mockData: { NetworkDns: NetworkDnsData } = { NetworkDns: { diff --git a/x-pack/plugins/siem/public/components/page/network/network_dns_table/translations.ts b/x-pack/plugins/siem/public/network/components/network_dns_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_dns_table/translations.ts rename to x-pack/plugins/siem/public/network/components/network_dns_table/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/network/network_http_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/network_http_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_http_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/network_http_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/network/network_http_table/columns.tsx b/x-pack/plugins/siem/public/network/components/network_http_table/columns.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/page/network/network_http_table/columns.tsx rename to x-pack/plugins/siem/public/network/components/network_http_table/columns.tsx index bffc7235b6804c..4642fdd2f2c93f 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_http_table/columns.tsx +++ b/x-pack/plugins/siem/public/network/components/network_http_table/columns.tsx @@ -8,14 +8,17 @@ import React from 'react'; import numeral from '@elastic/numeral'; -import { NetworkHttpEdges, NetworkHttpFields, NetworkHttpItem } from '../../../../graphql/types'; -import { escapeDataProviderId } from '../../../drag_and_drop/helpers'; -import { getEmptyTagValue } from '../../../empty_value'; -import { IPDetailsLink } from '../../../links'; -import { Columns } from '../../../paginated_table'; +import { NetworkHttpEdges, NetworkHttpFields, NetworkHttpItem } from '../../../graphql/types'; +import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { IPDetailsLink } from '../../../common/components/links'; +import { Columns } from '../../../common/components/paginated_table'; import * as i18n from './translations'; -import { getRowItemDraggable, getRowItemDraggables } from '../../../tables/helpers'; +import { + getRowItemDraggable, + getRowItemDraggables, +} from '../../../common/components/tables/helpers'; export type NetworkHttpColumns = [ Columns, Columns, diff --git a/x-pack/plugins/siem/public/components/page/network/network_http_table/index.test.tsx b/x-pack/plugins/siem/public/network/components/network_http_table/index.test.tsx similarity index 86% rename from x-pack/plugins/siem/public/components/page/network/network_http_table/index.test.tsx rename to x-pack/plugins/siem/public/network/components/network_http_table/index.test.tsx index c4596ada5c74db..3c4e1559e9f7b2 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_http_table/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/network_http_table/index.test.tsx @@ -10,9 +10,15 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; -import { createStore, networkModel, State } from '../../../../store'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; +import { createStore, State } from '../../../common/store'; +import { networkModel } from '../../store'; import { NetworkHttpTable } from '.'; import { mockData } from './mock'; @@ -21,11 +27,11 @@ describe('NetworkHttp Table Component', () => { const loadPage = jest.fn(); const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); const mount = useMountAppended(); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/network/network_http_table/index.tsx b/x-pack/plugins/siem/public/network/components/network_http_table/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/page/network/network_http_table/index.tsx rename to x-pack/plugins/siem/public/network/components/network_http_table/index.tsx index 6a8b1308f1d36a..cab7106584e0f3 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_http_table/index.tsx +++ b/x-pack/plugins/siem/public/network/components/network_http_table/index.tsx @@ -7,10 +7,10 @@ import React, { useCallback, useMemo } from 'react'; import { connect, ConnectedProps } from 'react-redux'; -import { networkActions } from '../../../../store/actions'; -import { Direction, NetworkHttpEdges, NetworkHttpFields } from '../../../../graphql/types'; -import { networkModel, networkSelectors, State } from '../../../../store'; -import { Criteria, ItemsPerRow, PaginatedTable } from '../../../paginated_table'; +import { networkActions, networkModel, networkSelectors } from '../../store'; +import { Direction, NetworkHttpEdges, NetworkHttpFields } from '../../../graphql/types'; +import { State } from '../../../common/store'; +import { Criteria, ItemsPerRow, PaginatedTable } from '../../../common/components/paginated_table'; import { getNetworkHttpColumns } from './columns'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/page/network/network_http_table/mock.ts b/x-pack/plugins/siem/public/network/components/network_http_table/mock.ts similarity index 97% rename from x-pack/plugins/siem/public/components/page/network/network_http_table/mock.ts rename to x-pack/plugins/siem/public/network/components/network_http_table/mock.ts index ed9b00ba8e49e5..f82f911d601ffd 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_http_table/mock.ts +++ b/x-pack/plugins/siem/public/network/components/network_http_table/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { NetworkHttpData } from '../../../../graphql/types'; +import { NetworkHttpData } from '../../../graphql/types'; export const mockData: { NetworkHttp: NetworkHttpData } = { NetworkHttp: { diff --git a/x-pack/plugins/siem/public/components/page/network/network_http_table/translations.ts b/x-pack/plugins/siem/public/network/components/network_http_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_http_table/translations.ts rename to x-pack/plugins/siem/public/network/components/network_http_table/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/network_top_countries_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_top_countries_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/network_top_countries_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/columns.tsx b/x-pack/plugins/siem/public/network/components/network_top_countries_table/columns.tsx similarity index 85% rename from x-pack/plugins/siem/public/components/page/network/network_top_countries_table/columns.tsx rename to x-pack/plugins/siem/public/network/components/network_top_countries_table/columns.tsx index ae2723e0065091..60d691f48deb8c 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/columns.tsx +++ b/x-pack/plugins/siem/public/network/components/network_top_countries_table/columns.tsx @@ -9,21 +9,24 @@ import numeral from '@elastic/numeral'; import React from 'react'; import { IIndexPattern } from 'src/plugins/data/public'; -import { CountryFlagAndName } from '../../../source_destination/country_flag'; +import { CountryFlagAndName } from '../source_destination/country_flag'; import { FlowTargetSourceDest, NetworkTopCountriesEdges, TopNetworkTablesEcsField, -} from '../../../../graphql/types'; -import { networkModel } from '../../../../store'; -import { DragEffects, DraggableWrapper } from '../../../drag_and_drop/draggable_wrapper'; -import { escapeDataProviderId } from '../../../drag_and_drop/helpers'; -import { getEmptyTagValue } from '../../../empty_value'; -import { Columns } from '../../../paginated_table'; -import { IS_OPERATOR } from '../../../timeline/data_providers/data_provider'; -import { Provider } from '../../../timeline/data_providers/provider'; +} from '../../../graphql/types'; +import { networkModel } from '../../store'; +import { + DragEffects, + DraggableWrapper, +} from '../../../common/components/drag_and_drop/draggable_wrapper'; +import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { Columns } from '../../../common/components/paginated_table'; +import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Provider } from '../../../timelines/components/timeline/data_providers/provider'; import * as i18n from './translations'; -import { PreferenceFormattedBytes } from '../../../formatted_bytes'; +import { PreferenceFormattedBytes } from '../../../common/components/formatted_bytes'; export type NetworkTopCountriesColumns = [ Columns, diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx b/x-pack/plugins/siem/public/network/components/network_top_countries_table/index.test.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx rename to x-pack/plugins/siem/public/network/components/network_top_countries_table/index.test.tsx index 764e440a5a4be8..a449ed8dfa9ced 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/network_top_countries_table/index.test.tsx @@ -10,15 +10,17 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { FlowTargetSourceDest } from '../../../../graphql/types'; +import { FlowTargetSourceDest } from '../../../graphql/types'; import { apolloClientObservable, mockGlobalState, mockIndexPattern, TestProviders, -} from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; -import { createStore, networkModel, State } from '../../../../store'; + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; +import { createStore, State } from '../../../common/store'; +import { networkModel } from '../../store'; import { NetworkTopCountriesTable } from '.'; import { mockData } from './mock'; @@ -28,10 +30,10 @@ describe('NetworkTopCountries Table Component', () => { const state: State = mockGlobalState; const mount = useMountAppended(); - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/index.tsx b/x-pack/plugins/siem/public/network/components/network_top_countries_table/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/page/network/network_top_countries_table/index.tsx rename to x-pack/plugins/siem/public/network/components/network_top_countries_table/index.tsx index 30f7d5ad823909..c2a280d30d1063 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/index.tsx +++ b/x-pack/plugins/siem/public/network/components/network_top_countries_table/index.tsx @@ -10,16 +10,17 @@ import { connect, ConnectedProps } from 'react-redux'; import deepEqual from 'fast-deep-equal'; import { IIndexPattern } from 'src/plugins/data/public'; -import { networkActions } from '../../../../store/actions'; +import { networkActions, networkModel, networkSelectors } from '../../store'; import { Direction, FlowTargetSourceDest, NetworkTopCountriesEdges, NetworkTopTablesFields, NetworkTopTablesSortField, -} from '../../../../graphql/types'; -import { networkModel, networkSelectors, State } from '../../../../store'; -import { Criteria, ItemsPerRow, PaginatedTable } from '../../../paginated_table'; +} from '../../../graphql/types'; +import { State } from '../../../common/store'; + +import { Criteria, ItemsPerRow, PaginatedTable } from '../../../common/components/paginated_table'; import { getCountriesColumnsCurated } from './columns'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/mock.ts b/x-pack/plugins/siem/public/network/components/network_top_countries_table/mock.ts similarity index 94% rename from x-pack/plugins/siem/public/components/page/network/network_top_countries_table/mock.ts rename to x-pack/plugins/siem/public/network/components/network_top_countries_table/mock.ts index 42b933c7fba6d3..cee775c93d66fd 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/mock.ts +++ b/x-pack/plugins/siem/public/network/components/network_top_countries_table/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { NetworkTopCountriesData } from '../../../../graphql/types'; +import { NetworkTopCountriesData } from '../../../graphql/types'; export const mockData: { NetworkTopCountries: NetworkTopCountriesData } = { NetworkTopCountries: { diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_countries_table/translations.ts b/x-pack/plugins/siem/public/network/components/network_top_countries_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_top_countries_table/translations.ts rename to x-pack/plugins/siem/public/network/components/network_top_countries_table/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/network_top_n_flow_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/columns.tsx b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/columns.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/columns.tsx rename to x-pack/plugins/siem/public/network/components/network_top_n_flow_table/columns.tsx index 3ed377c7ba4b09..64626c450b9eca 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/columns.tsx +++ b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/columns.tsx @@ -8,24 +8,30 @@ import { get } from 'lodash/fp'; import numeral from '@elastic/numeral'; import React from 'react'; -import { CountryFlag } from '../../../source_destination/country_flag'; +import { CountryFlag } from '../source_destination/country_flag'; import { AutonomousSystemItem, FlowTargetSourceDest, NetworkTopNFlowEdges, TopNetworkTablesEcsField, -} from '../../../../graphql/types'; -import { networkModel } from '../../../../store'; -import { DragEffects, DraggableWrapper } from '../../../drag_and_drop/draggable_wrapper'; -import { escapeDataProviderId } from '../../../drag_and_drop/helpers'; -import { getEmptyTagValue } from '../../../empty_value'; -import { IPDetailsLink } from '../../../links'; -import { Columns } from '../../../paginated_table'; -import { IS_OPERATOR } from '../../../timeline/data_providers/data_provider'; -import { Provider } from '../../../timeline/data_providers/provider'; +} from '../../../graphql/types'; +import { networkModel } from '../../store'; +import { + DragEffects, + DraggableWrapper, +} from '../../../common/components/drag_and_drop/draggable_wrapper'; +import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { IPDetailsLink } from '../../../common/components/links'; +import { Columns } from '../../../common/components/paginated_table'; +import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Provider } from '../../../timelines/components/timeline/data_providers/provider'; import * as i18n from './translations'; -import { getRowItemDraggable, getRowItemDraggables } from '../../../tables/helpers'; -import { PreferenceFormattedBytes } from '../../../formatted_bytes'; +import { + getRowItemDraggable, + getRowItemDraggables, +} from '../../../common/components/tables/helpers'; +import { PreferenceFormattedBytes } from '../../../common/components/formatted_bytes'; export type NetworkTopNFlowColumns = [ Columns, diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/index.test.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx rename to x-pack/plugins/siem/public/network/components/network_top_n_flow_table/index.test.tsx index 78e8b15005f431..58a7ef744adeed 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/index.test.tsx @@ -10,11 +10,16 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { FlowTargetSourceDest } from '../../../../graphql/types'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; -import { createStore, networkModel, State } from '../../../../store'; - +import { FlowTargetSourceDest } from '../../../graphql/types'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; +import { createStore, State } from '../../../common/store'; +import { networkModel } from '../../store'; import { NetworkTopNFlowTable } from '.'; import { mockData } from './mock'; @@ -22,11 +27,11 @@ describe('NetworkTopNFlow Table Component', () => { const loadPage = jest.fn(); const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); const mount = useMountAppended(); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/index.tsx b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/index.tsx rename to x-pack/plugins/siem/public/network/components/network_top_n_flow_table/index.tsx index 8e49db04a546cd..617dd9d08a9db4 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/index.tsx +++ b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/index.tsx @@ -8,17 +8,16 @@ import React, { useCallback, useMemo } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import deepEqual from 'fast-deep-equal'; -import { networkActions } from '../../../../store/actions'; import { Direction, FlowTargetSourceDest, NetworkTopNFlowEdges, NetworkTopTablesFields, NetworkTopTablesSortField, -} from '../../../../graphql/types'; -import { networkModel, networkSelectors, State } from '../../../../store'; -import { Criteria, ItemsPerRow, PaginatedTable } from '../../../paginated_table'; - +} from '../../../graphql/types'; +import { State } from '../../../common/store'; +import { Criteria, ItemsPerRow, PaginatedTable } from '../../../common/components/paginated_table'; +import { networkActions, networkModel, networkSelectors } from '../../store'; import { getNFlowColumnsCurated } from './columns'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/mock.ts b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/mock.ts similarity index 99% rename from x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/mock.ts rename to x-pack/plugins/siem/public/network/components/network_top_n_flow_table/mock.ts index 9ef63bf6d31679..bd21d78ba77c5d 100644 --- a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/mock.ts +++ b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { NetworkTopNFlowData, FlowTargetSourceDest } from '../../../../graphql/types'; +import { NetworkTopNFlowData, FlowTargetSourceDest } from '../../../graphql/types'; export const mockData: { NetworkTopNFlow: NetworkTopNFlowData } = { NetworkTopNFlow: { diff --git a/x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/translations.ts b/x-pack/plugins/siem/public/network/components/network_top_n_flow_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/network_top_n_flow_table/translations.ts rename to x-pack/plugins/siem/public/network/components/network_top_n_flow_table/translations.ts diff --git a/x-pack/plugins/siem/public/components/port/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/port/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/port/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/port/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/port/index.test.tsx b/x-pack/plugins/siem/public/network/components/port/index.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/port/index.test.tsx rename to x-pack/plugins/siem/public/network/components/port/index.test.tsx index 6ab587f266a8a4..1f78f1d96cdaef 100644 --- a/x-pack/plugins/siem/public/components/port/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/port/index.test.tsx @@ -7,8 +7,8 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../mock/test_providers'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { TestProviders } from '../../../common/mock/test_providers'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { Port } from '.'; diff --git a/x-pack/plugins/siem/public/components/port/index.tsx b/x-pack/plugins/siem/public/network/components/port/index.tsx similarity index 80% rename from x-pack/plugins/siem/public/components/port/index.tsx rename to x-pack/plugins/siem/public/network/components/port/index.tsx index bd6289547d0dc8..6f54f11ccfbe14 100644 --- a/x-pack/plugins/siem/public/components/port/index.tsx +++ b/x-pack/plugins/siem/public/network/components/port/index.tsx @@ -6,10 +6,10 @@ import React from 'react'; -import { DefaultDraggable } from '../draggables'; -import { getEmptyValue } from '../empty_value'; -import { ExternalLinkIcon } from '../external_link_icon'; -import { PortOrServiceNameLink } from '../links'; +import { DefaultDraggable } from '../../../common/components/draggables'; +import { getEmptyValue } from '../../../common/components/empty_value'; +import { ExternalLinkIcon } from '../../../common/components/external_link_icon'; +import { PortOrServiceNameLink } from '../../../common/components/links'; export const CLIENT_PORT_FIELD_NAME = 'client.port'; export const DESTINATION_PORT_FIELD_NAME = 'destination.port'; diff --git a/x-pack/plugins/siem/public/components/source_destination/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/source_destination/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/source_destination/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/source_destination/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/source_destination/country_flag.tsx b/x-pack/plugins/siem/public/network/components/source_destination/country_flag.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/source_destination/country_flag.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/country_flag.tsx diff --git a/x-pack/plugins/siem/public/components/source_destination/field_names.ts b/x-pack/plugins/siem/public/network/components/source_destination/field_names.ts similarity index 100% rename from x-pack/plugins/siem/public/components/source_destination/field_names.ts rename to x-pack/plugins/siem/public/network/components/source_destination/field_names.ts diff --git a/x-pack/plugins/siem/public/components/source_destination/geo_fields.tsx b/x-pack/plugins/siem/public/network/components/source_destination/geo_fields.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/source_destination/geo_fields.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/geo_fields.tsx index baeca10ee0fae6..3618ee40dc8d59 100644 --- a/x-pack/plugins/siem/public/components/source_destination/geo_fields.tsx +++ b/x-pack/plugins/siem/public/network/components/source_destination/geo_fields.tsx @@ -9,7 +9,7 @@ import { get, uniq } from 'lodash/fp'; import React from 'react'; import styled from 'styled-components'; -import { DefaultDraggable } from '../draggables'; +import { DefaultDraggable } from '../../../common/components/draggables'; import { CountryFlag } from './country_flag'; import { GeoFieldsProps, SourceDestinationType } from './types'; diff --git a/x-pack/plugins/siem/public/components/source_destination/index.test.tsx b/x-pack/plugins/siem/public/network/components/source_destination/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/source_destination/index.test.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/index.test.tsx index 3dee668d66a707..96545813bbbab3 100644 --- a/x-pack/plugins/siem/public/components/source_destination/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/source_destination/index.test.tsx @@ -9,11 +9,11 @@ import { shallow } from 'enzyme'; import { get } from 'lodash/fp'; import React from 'react'; -import { asArrayIfExists } from '../../lib/helpers'; -import { getMockNetflowData } from '../../mock'; -import { TestProviders } from '../../mock/test_providers'; -import { ID_FIELD_NAME } from '../event_details/event_id'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { asArrayIfExists } from '../../../common/lib/helpers'; +import { getMockNetflowData } from '../../../common/mock'; +import { TestProviders } from '../../../common/mock/test_providers'; +import { ID_FIELD_NAME } from '../../../common/components/event_details/event_id'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip'; import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../port'; import { @@ -22,7 +22,7 @@ import { SOURCE_BYTES_FIELD_NAME, SOURCE_PACKETS_FIELD_NAME, } from '../source_destination/source_destination_arrows'; -import * as i18n from '../timeline/body/renderers/translations'; +import * as i18n from '../../../timelines/components/timeline/body/renderers/translations'; import { SourceDestination } from '.'; import { diff --git a/x-pack/plugins/siem/public/components/source_destination/index.tsx b/x-pack/plugins/siem/public/network/components/source_destination/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/source_destination/index.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/index.tsx diff --git a/x-pack/plugins/siem/public/components/source_destination/ip_with_port.tsx b/x-pack/plugins/siem/public/network/components/source_destination/ip_with_port.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/source_destination/ip_with_port.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/ip_with_port.tsx diff --git a/x-pack/plugins/siem/public/components/source_destination/label.tsx b/x-pack/plugins/siem/public/network/components/source_destination/label.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/source_destination/label.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/label.tsx diff --git a/x-pack/plugins/siem/public/components/source_destination/network.tsx b/x-pack/plugins/siem/public/network/components/source_destination/network.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/source_destination/network.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/network.tsx index a0b86b3e9a1338..cb1f72bca02c61 100644 --- a/x-pack/plugins/siem/public/components/source_destination/network.tsx +++ b/x-pack/plugins/siem/public/network/components/source_destination/network.tsx @@ -10,7 +10,7 @@ import React from 'react'; import styled from 'styled-components'; import { DirectionBadge } from '../direction'; -import { DefaultDraggable, DraggableBadge } from '../draggables'; +import { DefaultDraggable, DraggableBadge } from '../../../common/components/draggables'; import * as i18n from './translations'; import { @@ -20,7 +20,7 @@ import { NETWORK_PROTOCOL_FIELD_NAME, NETWORK_TRANSPORT_FIELD_NAME, } from './field_names'; -import { PreferenceFormattedBytes } from '../formatted_bytes'; +import { PreferenceFormattedBytes } from '../../../common/components/formatted_bytes'; const EuiFlexItemMarginRight = styled(EuiFlexItem)` margin-right: 3px; diff --git a/x-pack/plugins/siem/public/components/source_destination/source_destination_arrows.tsx b/x-pack/plugins/siem/public/network/components/source_destination/source_destination_arrows.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/source_destination/source_destination_arrows.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/source_destination_arrows.tsx index 005ebc14dcdcc6..95cc76a349c177 100644 --- a/x-pack/plugins/siem/public/components/source_destination/source_destination_arrows.tsx +++ b/x-pack/plugins/siem/public/network/components/source_destination/source_destination_arrows.tsx @@ -16,8 +16,8 @@ import { getPercent, hasOneValue, } from '../arrows/helpers'; -import { DefaultDraggable } from '../draggables'; -import { PreferenceFormattedBytes } from '../formatted_bytes'; +import { DefaultDraggable } from '../../../common/components/draggables'; +import { PreferenceFormattedBytes } from '../../../common/components/formatted_bytes'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx b/x-pack/plugins/siem/public/network/components/source_destination/source_destination_ip.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/source_destination_ip.test.tsx index 60ab59c3796ff0..18459352f89f05 100644 --- a/x-pack/plugins/siem/public/components/source_destination/source_destination_ip.test.tsx +++ b/x-pack/plugins/siem/public/network/components/source_destination/source_destination_ip.test.tsx @@ -7,14 +7,14 @@ import { get } from 'lodash/fp'; import React from 'react'; -import { asArrayIfExists } from '../../lib/helpers'; -import { getMockNetflowData } from '../../mock'; -import { TestProviders } from '../../mock/test_providers'; -import { ID_FIELD_NAME } from '../event_details/event_id'; +import { asArrayIfExists } from '../../../common/lib/helpers'; +import { getMockNetflowData } from '../../../common/mock'; +import { TestProviders } from '../../../common/mock/test_providers'; +import { ID_FIELD_NAME } from '../../../common/components/event_details/event_id'; import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip'; import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../port'; -import * as i18n from '../timeline/body/renderers/translations'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import * as i18n from '../../../timelines/components/timeline/body/renderers/translations'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { getPorts, diff --git a/x-pack/plugins/siem/public/components/source_destination/source_destination_ip.tsx b/x-pack/plugins/siem/public/network/components/source_destination/source_destination_ip.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/source_destination/source_destination_ip.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/source_destination_ip.tsx index 62f01dfc020f5a..4a242961d91fda 100644 --- a/x-pack/plugins/siem/public/components/source_destination/source_destination_ip.tsx +++ b/x-pack/plugins/siem/public/network/components/source_destination/source_destination_ip.tsx @@ -11,7 +11,7 @@ import deepEqual from 'fast-deep-equal'; import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip'; import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME, Port } from '../port'; -import * as i18n from '../timeline/body/renderers/translations'; +import * as i18n from '../../../timelines/components/timeline/body/renderers/translations'; import { GeoFields } from './geo_fields'; import { IpWithPort } from './ip_with_port'; diff --git a/x-pack/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx b/x-pack/plugins/siem/public/network/components/source_destination/source_destination_with_arrows.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/source_destination/source_destination_with_arrows.tsx rename to x-pack/plugins/siem/public/network/components/source_destination/source_destination_with_arrows.tsx diff --git a/x-pack/plugins/siem/public/components/source_destination/translations.ts b/x-pack/plugins/siem/public/network/components/source_destination/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/source_destination/translations.ts rename to x-pack/plugins/siem/public/network/components/source_destination/translations.ts diff --git a/x-pack/plugins/siem/public/components/source_destination/types.ts b/x-pack/plugins/siem/public/network/components/source_destination/types.ts similarity index 100% rename from x-pack/plugins/siem/public/components/source_destination/types.ts rename to x-pack/plugins/siem/public/network/components/source_destination/types.ts diff --git a/x-pack/plugins/siem/public/components/page/network/tls_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/tls_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/tls_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/tls_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/network/tls_table/columns.tsx b/x-pack/plugins/siem/public/network/components/tls_table/columns.tsx similarity index 85% rename from x-pack/plugins/siem/public/components/page/network/tls_table/columns.tsx rename to x-pack/plugins/siem/public/network/components/tls_table/columns.tsx index f95475819abc94..5a6317291430ec 100644 --- a/x-pack/plugins/siem/public/components/page/network/tls_table/columns.tsx +++ b/x-pack/plugins/siem/public/network/components/tls_table/columns.tsx @@ -8,12 +8,15 @@ import React from 'react'; import moment from 'moment'; -import { TlsNode } from '../../../../graphql/types'; -import { Columns } from '../../../paginated_table'; +import { TlsNode } from '../../../graphql/types'; +import { Columns } from '../../../common/components/paginated_table'; -import { getRowItemDraggables, getRowItemDraggable } from '../../../tables/helpers'; -import { LocalizedDateTooltip } from '../../../localized_date_tooltip'; -import { PreferenceFormattedDate } from '../../../formatted_date'; +import { + getRowItemDraggables, + getRowItemDraggable, +} from '../../../common/components/tables/helpers'; +import { LocalizedDateTooltip } from '../../../common/components/localized_date_tooltip'; +import { PreferenceFormattedDate } from '../../../common/components/formatted_date'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/page/network/tls_table/index.test.tsx b/x-pack/plugins/siem/public/network/components/tls_table/index.test.tsx similarity index 85% rename from x-pack/plugins/siem/public/components/page/network/tls_table/index.test.tsx rename to x-pack/plugins/siem/public/network/components/tls_table/index.test.tsx index 81a472f3175e51..7f2cfc8ba9ba4a 100644 --- a/x-pack/plugins/siem/public/components/page/network/tls_table/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/tls_table/index.test.tsx @@ -10,10 +10,15 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; -import { createStore, networkModel, State } from '../../../../store'; - +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; +import { createStore, State } from '../../../common/store'; +import { networkModel } from '../../store'; import { TlsTable } from '.'; import { mockTlsData } from './mock'; @@ -21,11 +26,11 @@ describe('Tls Table Component', () => { const loadPage = jest.fn(); const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); const mount = useMountAppended(); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('Rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/network/tls_table/index.tsx b/x-pack/plugins/siem/public/network/components/tls_table/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/page/network/tls_table/index.tsx rename to x-pack/plugins/siem/public/network/components/tls_table/index.tsx index d1512699cc709c..34bde8f42eaf90 100644 --- a/x-pack/plugins/siem/public/components/page/network/tls_table/index.tsx +++ b/x-pack/plugins/siem/public/network/components/tls_table/index.tsx @@ -8,10 +8,15 @@ import React, { useCallback, useMemo } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import deepEqual from 'fast-deep-equal'; -import { networkActions } from '../../../../store/network'; -import { TlsEdges, TlsSortField, TlsFields, Direction } from '../../../../graphql/types'; -import { networkModel, networkSelectors, State } from '../../../../store'; -import { Criteria, ItemsPerRow, PaginatedTable, SortingBasicTable } from '../../../paginated_table'; +import { networkActions, networkModel, networkSelectors } from '../../store'; +import { TlsEdges, TlsSortField, TlsFields, Direction } from '../../../graphql/types'; +import { State } from '../../../common/store'; +import { + Criteria, + ItemsPerRow, + PaginatedTable, + SortingBasicTable, +} from '../../../common/components/paginated_table'; import { getTlsColumns } from './columns'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/page/network/tls_table/mock.ts b/x-pack/plugins/siem/public/network/components/tls_table/mock.ts similarity index 96% rename from x-pack/plugins/siem/public/components/page/network/tls_table/mock.ts rename to x-pack/plugins/siem/public/network/components/tls_table/mock.ts index 453bd8fc84dfae..a90907eb388545 100644 --- a/x-pack/plugins/siem/public/components/page/network/tls_table/mock.ts +++ b/x-pack/plugins/siem/public/network/components/tls_table/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { TlsData } from '../../../../graphql/types'; +import { TlsData } from '../../../graphql/types'; export const mockTlsData: TlsData = { totalCount: 2, diff --git a/x-pack/plugins/siem/public/components/page/network/tls_table/translations.ts b/x-pack/plugins/siem/public/network/components/tls_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/tls_table/translations.ts rename to x-pack/plugins/siem/public/network/components/tls_table/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/network/users_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/components/users_table/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/users_table/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/components/users_table/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/network/users_table/columns.tsx b/x-pack/plugins/siem/public/network/components/users_table/columns.tsx similarity index 86% rename from x-pack/plugins/siem/public/components/page/network/users_table/columns.tsx rename to x-pack/plugins/siem/public/network/components/users_table/columns.tsx index b732ac5bfd5fae..d3ad2cd707ecdd 100644 --- a/x-pack/plugins/siem/public/components/page/network/users_table/columns.tsx +++ b/x-pack/plugins/siem/public/network/components/users_table/columns.tsx @@ -4,12 +4,15 @@ * you may not use this file except in compliance with the Elastic License. */ -import { FlowTarget, UsersItem } from '../../../../graphql/types'; -import { defaultToEmptyTag } from '../../../empty_value'; -import { Columns } from '../../../paginated_table'; +import { FlowTarget, UsersItem } from '../../../graphql/types'; +import { defaultToEmptyTag } from '../../../common/components/empty_value'; +import { Columns } from '../../../common/components/paginated_table'; import * as i18n from './translations'; -import { getRowItemDraggables, getRowItemDraggable } from '../../../tables/helpers'; +import { + getRowItemDraggables, + getRowItemDraggable, +} from '../../../common/components/tables/helpers'; export type UsersColumns = [ Columns, diff --git a/x-pack/plugins/siem/public/components/page/network/users_table/index.test.tsx b/x-pack/plugins/siem/public/network/components/users_table/index.test.tsx similarity index 85% rename from x-pack/plugins/siem/public/components/page/network/users_table/index.test.tsx rename to x-pack/plugins/siem/public/network/components/users_table/index.test.tsx index 8dc3704a089ea8..2597249797da58 100644 --- a/x-pack/plugins/siem/public/components/page/network/users_table/index.test.tsx +++ b/x-pack/plugins/siem/public/network/components/users_table/index.test.tsx @@ -10,10 +10,16 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { FlowTarget } from '../../../../graphql/types'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; -import { createStore, networkModel, State } from '../../../../store'; +import { FlowTarget } from '../../../graphql/types'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; +import { createStore, State } from '../../../common/store'; +import { networkModel } from '../../store'; import { UsersTable } from '.'; import { mockUsersData } from './mock'; @@ -22,11 +28,11 @@ describe('Users Table Component', () => { const loadPage = jest.fn(); const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); const mount = useMountAppended(); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); }); describe('Rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/network/users_table/index.tsx b/x-pack/plugins/siem/public/network/components/users_table/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/page/network/users_table/index.tsx rename to x-pack/plugins/siem/public/network/components/users_table/index.tsx index b585b835f31cde..5e5bac20141bcc 100644 --- a/x-pack/plugins/siem/public/components/page/network/users_table/index.tsx +++ b/x-pack/plugins/siem/public/network/components/users_table/index.tsx @@ -8,20 +8,25 @@ import React, { useCallback, useMemo } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import deepEqual from 'fast-deep-equal'; -import { networkActions } from '../../../../store/network'; +import { networkActions, networkModel, networkSelectors } from '../../store'; import { Direction, FlowTarget, UsersEdges, UsersFields, UsersSortField, -} from '../../../../graphql/types'; -import { networkModel, networkSelectors, State } from '../../../../store'; -import { Criteria, ItemsPerRow, PaginatedTable, SortingBasicTable } from '../../../paginated_table'; +} from '../../../graphql/types'; +import { State } from '../../../common/store'; +import { + Criteria, + ItemsPerRow, + PaginatedTable, + SortingBasicTable, +} from '../../../common/components/paginated_table'; import { getUsersColumns } from './columns'; import * as i18n from './translations'; -import { assertUnreachable } from '../../../../lib/helpers'; +import { assertUnreachable } from '../../../common/lib/helpers'; const tableType = networkModel.IpDetailsTableType.users; interface OwnProps { diff --git a/x-pack/plugins/siem/public/components/page/network/users_table/mock.ts b/x-pack/plugins/siem/public/network/components/users_table/mock.ts similarity index 95% rename from x-pack/plugins/siem/public/components/page/network/users_table/mock.ts rename to x-pack/plugins/siem/public/network/components/users_table/mock.ts index 9a5de66a91a3ec..50bef1867aa3b4 100644 --- a/x-pack/plugins/siem/public/components/page/network/users_table/mock.ts +++ b/x-pack/plugins/siem/public/network/components/users_table/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { UsersData } from '../../../../graphql/types'; +import { UsersData } from '../../../graphql/types'; export const mockUsersData: UsersData = { edges: [ diff --git a/x-pack/plugins/siem/public/components/page/network/users_table/translations.ts b/x-pack/plugins/siem/public/network/components/users_table/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/network/users_table/translations.ts rename to x-pack/plugins/siem/public/network/components/users_table/translations.ts diff --git a/x-pack/plugins/siem/public/containers/ip_overview/index.gql_query.ts b/x-pack/plugins/siem/public/network/containers/ip_overview/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/ip_overview/index.gql_query.ts rename to x-pack/plugins/siem/public/network/containers/ip_overview/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/ip_overview/index.tsx b/x-pack/plugins/siem/public/network/containers/ip_overview/index.tsx similarity index 82% rename from x-pack/plugins/siem/public/containers/ip_overview/index.tsx rename to x-pack/plugins/siem/public/network/containers/ip_overview/index.tsx index ade94c430c6efb..551ecebf2c05a7 100644 --- a/x-pack/plugins/siem/public/containers/ip_overview/index.tsx +++ b/x-pack/plugins/siem/public/network/containers/ip_overview/index.tsx @@ -9,13 +9,13 @@ import React from 'react'; import { Query } from 'react-apollo'; import { connect, ConnectedProps } from 'react-redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; -import { GetIpOverviewQuery, IpOverviewData } from '../../graphql/types'; -import { networkModel, inputsModel, inputsSelectors, State } from '../../store'; -import { useUiSetting } from '../../lib/kibana'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplateProps } from '../query_template'; - +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; +import { GetIpOverviewQuery, IpOverviewData } from '../../../graphql/types'; +import { inputsModel, inputsSelectors, State } from '../../../common/store'; +import { useUiSetting } from '../../../common/lib/kibana'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { QueryTemplateProps } from '../../../common/containers/query_template'; +import { networkModel } from '../../store'; import { ipOverviewQuery } from './index.gql_query'; const ID = 'ipOverviewQuery'; diff --git a/x-pack/plugins/siem/public/containers/kpi_network/index.gql_query.ts b/x-pack/plugins/siem/public/network/containers/kpi_network/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/kpi_network/index.gql_query.ts rename to x-pack/plugins/siem/public/network/containers/kpi_network/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/kpi_network/index.tsx b/x-pack/plugins/siem/public/network/containers/kpi_network/index.tsx similarity index 83% rename from x-pack/plugins/siem/public/containers/kpi_network/index.tsx rename to x-pack/plugins/siem/public/network/containers/kpi_network/index.tsx index 338cdc39b178c1..edba8b4c2e65ca 100644 --- a/x-pack/plugins/siem/public/containers/kpi_network/index.tsx +++ b/x-pack/plugins/siem/public/network/containers/kpi_network/index.tsx @@ -9,12 +9,12 @@ import React from 'react'; import { Query } from 'react-apollo'; import { connect, ConnectedProps } from 'react-redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; -import { GetKpiNetworkQuery, KpiNetworkData } from '../../graphql/types'; -import { inputsModel, inputsSelectors, State } from '../../store'; -import { useUiSetting } from '../../lib/kibana'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplateProps } from '../query_template'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; +import { GetKpiNetworkQuery, KpiNetworkData } from '../../../graphql/types'; +import { inputsModel, inputsSelectors, State } from '../../../common/store'; +import { useUiSetting } from '../../../common/lib/kibana'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { QueryTemplateProps } from '../../../common/containers/query_template'; import { kpiNetworkQuery } from './index.gql_query'; diff --git a/x-pack/plugins/siem/public/containers/network_dns/index.gql_query.ts b/x-pack/plugins/siem/public/network/containers/network_dns/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/network_dns/index.gql_query.ts rename to x-pack/plugins/siem/public/network/containers/network_dns/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/network_dns/index.tsx b/x-pack/plugins/siem/public/network/containers/network_dns/index.tsx similarity index 85% rename from x-pack/plugins/siem/public/containers/network_dns/index.tsx rename to x-pack/plugins/siem/public/network/containers/network_dns/index.tsx index 04c8783c30a0ff..2bae19ce89aec0 100644 --- a/x-pack/plugins/siem/public/containers/network_dns/index.tsx +++ b/x-pack/plugins/siem/public/network/containers/network_dns/index.tsx @@ -12,25 +12,32 @@ import { compose } from 'redux'; import { DocumentNode } from 'graphql'; import { ScaleType } from '@elastic/charts'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { GetNetworkDnsQuery, NetworkDnsEdges, NetworkDnsSortField, PageInfoPaginated, MatrixOverOrdinalHistogramData, -} from '../../graphql/types'; -import { inputsModel, networkModel, networkSelectors, State, inputsSelectors } from '../../store'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; -import { generateTablePaginationOptions } from '../../components/paginated_table/helpers'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated'; +} from '../../../graphql/types'; +import { inputsModel, State, inputsSelectors } from '../../../common/store'; +import { withKibana, WithKibanaProps } from '../../../common/lib/kibana'; +import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { + QueryTemplatePaginated, + QueryTemplatePaginatedProps, +} from '../../../common/containers/query_template_paginated'; import { networkDnsQuery } from './index.gql_query'; -import { DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from '../../store/constants'; -import { MatrixHistogram } from '../../components/matrix_histogram'; -import { MatrixHistogramOption, GetSubTitle } from '../../components/matrix_histogram/types'; -import { UpdateDateRange } from '../../components/charts/common'; -import { SetQuery } from '../../pages/hosts/navigation/types'; +import { DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from '../../../common/store/constants'; +import { MatrixHistogram } from '../../../common/components/matrix_histogram'; +import { + MatrixHistogramOption, + GetSubTitle, +} from '../../../common/components/matrix_histogram/types'; +import { UpdateDateRange } from '../../../common/components/charts/common'; +import { SetQuery } from '../../../hosts/pages/navigation/types'; +import { networkModel, networkSelectors } from '../../store'; const ID = 'networkDnsQuery'; export const HISTOGRAM_ID = 'networkDnsHistogramQuery'; diff --git a/x-pack/plugins/siem/public/containers/network_http/index.gql_query.ts b/x-pack/plugins/siem/public/network/containers/network_http/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/network_http/index.gql_query.ts rename to x-pack/plugins/siem/public/network/containers/network_http/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/network_http/index.tsx b/x-pack/plugins/siem/public/network/containers/network_http/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/containers/network_http/index.tsx rename to x-pack/plugins/siem/public/network/containers/network_http/index.tsx index bf4e64f63d5599..60845d452d69e4 100644 --- a/x-pack/plugins/siem/public/containers/network_http/index.tsx +++ b/x-pack/plugins/siem/public/network/containers/network_http/index.tsx @@ -10,18 +10,22 @@ import { Query } from 'react-apollo'; import { connect } from 'react-redux'; import { compose } from 'redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { GetNetworkHttpQuery, NetworkHttpEdges, NetworkHttpSortField, PageInfoPaginated, -} from '../../graphql/types'; -import { inputsModel, inputsSelectors, networkModel, networkSelectors, State } from '../../store'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; -import { generateTablePaginationOptions } from '../../components/paginated_table/helpers'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated'; +} from '../../../graphql/types'; +import { inputsModel, inputsSelectors, State } from '../../../common/store'; +import { withKibana, WithKibanaProps } from '../../../common/lib/kibana'; +import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { + QueryTemplatePaginated, + QueryTemplatePaginatedProps, +} from '../../../common/containers/query_template_paginated'; +import { networkModel, networkSelectors } from '../../store'; import { networkHttpQuery } from './index.gql_query'; const ID = 'networkHttpQuery'; diff --git a/x-pack/plugins/siem/public/containers/network_top_countries/index.gql_query.ts b/x-pack/plugins/siem/public/network/containers/network_top_countries/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/network_top_countries/index.gql_query.ts rename to x-pack/plugins/siem/public/network/containers/network_top_countries/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/network_top_countries/index.tsx b/x-pack/plugins/siem/public/network/containers/network_top_countries/index.tsx similarity index 88% rename from x-pack/plugins/siem/public/containers/network_top_countries/index.tsx rename to x-pack/plugins/siem/public/network/containers/network_top_countries/index.tsx index bd1e1a002bbcdc..b167cba460818f 100644 --- a/x-pack/plugins/siem/public/containers/network_top_countries/index.tsx +++ b/x-pack/plugins/siem/public/network/containers/network_top_countries/index.tsx @@ -10,20 +10,24 @@ import { Query } from 'react-apollo'; import { connect } from 'react-redux'; import { compose } from 'redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { FlowTargetSourceDest, GetNetworkTopCountriesQuery, NetworkTopCountriesEdges, NetworkTopTablesSortField, PageInfoPaginated, -} from '../../graphql/types'; -import { inputsModel, inputsSelectors, networkModel, networkSelectors, State } from '../../store'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; -import { generateTablePaginationOptions } from '../../components/paginated_table/helpers'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated'; +} from '../../../graphql/types'; +import { inputsModel, inputsSelectors, State } from '../../../common/store'; +import { withKibana, WithKibanaProps } from '../../../common/lib/kibana'; +import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { + QueryTemplatePaginated, + QueryTemplatePaginatedProps, +} from '../../../common/containers/query_template_paginated'; import { networkTopCountriesQuery } from './index.gql_query'; +import { networkModel, networkSelectors } from '../../store'; const ID = 'networkTopCountriesQuery'; diff --git a/x-pack/plugins/siem/public/containers/network_top_n_flow/index.gql_query.ts b/x-pack/plugins/siem/public/network/containers/network_top_n_flow/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/network_top_n_flow/index.gql_query.ts rename to x-pack/plugins/siem/public/network/containers/network_top_n_flow/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/network_top_n_flow/index.tsx b/x-pack/plugins/siem/public/network/containers/network_top_n_flow/index.tsx similarity index 88% rename from x-pack/plugins/siem/public/containers/network_top_n_flow/index.tsx rename to x-pack/plugins/siem/public/network/containers/network_top_n_flow/index.tsx index f0f1f8257f29f1..770574b0813c1c 100644 --- a/x-pack/plugins/siem/public/containers/network_top_n_flow/index.tsx +++ b/x-pack/plugins/siem/public/network/containers/network_top_n_flow/index.tsx @@ -10,20 +10,24 @@ import { Query } from 'react-apollo'; import { connect } from 'react-redux'; import { compose } from 'redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { FlowTargetSourceDest, GetNetworkTopNFlowQuery, NetworkTopNFlowEdges, NetworkTopTablesSortField, PageInfoPaginated, -} from '../../graphql/types'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; -import { inputsModel, inputsSelectors, networkModel, networkSelectors, State } from '../../store'; -import { generateTablePaginationOptions } from '../../components/paginated_table/helpers'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated'; +} from '../../../graphql/types'; +import { withKibana, WithKibanaProps } from '../../../common/lib/kibana'; +import { inputsModel, inputsSelectors, State } from '../../../common/store'; +import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { + QueryTemplatePaginated, + QueryTemplatePaginatedProps, +} from '../../../common/containers/query_template_paginated'; import { networkTopNFlowQuery } from './index.gql_query'; +import { networkModel, networkSelectors } from '../../store'; const ID = 'networkTopNFlowQuery'; diff --git a/x-pack/plugins/siem/public/containers/tls/index.gql_query.ts b/x-pack/plugins/siem/public/network/containers/tls/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/tls/index.gql_query.ts rename to x-pack/plugins/siem/public/network/containers/tls/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/tls/index.tsx b/x-pack/plugins/siem/public/network/containers/tls/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/containers/tls/index.tsx rename to x-pack/plugins/siem/public/network/containers/tls/index.tsx index 3738355c8846eb..a50f2a131b75b8 100644 --- a/x-pack/plugins/siem/public/containers/tls/index.tsx +++ b/x-pack/plugins/siem/public/network/containers/tls/index.tsx @@ -10,19 +10,23 @@ import { Query } from 'react-apollo'; import { connect } from 'react-redux'; import { compose } from 'redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { PageInfoPaginated, TlsEdges, TlsSortField, GetTlsQuery, FlowTargetSourceDest, -} from '../../graphql/types'; -import { inputsModel, networkModel, networkSelectors, State, inputsSelectors } from '../../store'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { generateTablePaginationOptions } from '../../components/paginated_table/helpers'; -import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated'; +} from '../../../graphql/types'; +import { inputsModel, State, inputsSelectors } from '../../../common/store'; +import { withKibana, WithKibanaProps } from '../../../common/lib/kibana'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers'; +import { + QueryTemplatePaginated, + QueryTemplatePaginatedProps, +} from '../../../common/containers/query_template_paginated'; +import { networkModel, networkSelectors } from '../../store'; import { tlsQuery } from './index.gql_query'; const ID = 'tlsQuery'; diff --git a/x-pack/plugins/siem/public/containers/users/index.gql_query.ts b/x-pack/plugins/siem/public/network/containers/users/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/users/index.gql_query.ts rename to x-pack/plugins/siem/public/network/containers/users/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/users/index.tsx b/x-pack/plugins/siem/public/network/containers/users/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/containers/users/index.tsx rename to x-pack/plugins/siem/public/network/containers/users/index.tsx index 5f71449c524606..efbeb3eb005426 100644 --- a/x-pack/plugins/siem/public/containers/users/index.tsx +++ b/x-pack/plugins/siem/public/network/containers/users/index.tsx @@ -10,13 +10,17 @@ import { Query } from 'react-apollo'; import { connect, ConnectedProps } from 'react-redux'; import { compose } from 'redux'; -import { DEFAULT_INDEX_KEY } from '../../../common/constants'; -import { GetUsersQuery, FlowTarget, PageInfoPaginated, UsersEdges } from '../../graphql/types'; -import { inputsModel, networkModel, networkSelectors, State, inputsSelectors } from '../../store'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; -import { createFilter, getDefaultFetchPolicy } from '../helpers'; -import { generateTablePaginationOptions } from '../../components/paginated_table/helpers'; -import { QueryTemplatePaginated, QueryTemplatePaginatedProps } from '../query_template_paginated'; +import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; +import { GetUsersQuery, FlowTarget, PageInfoPaginated, UsersEdges } from '../../../graphql/types'; +import { inputsModel, State, inputsSelectors } from '../../../common/store'; +import { withKibana, WithKibanaProps } from '../../../common/lib/kibana'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers'; +import { + QueryTemplatePaginated, + QueryTemplatePaginatedProps, +} from '../../../common/containers/query_template_paginated'; +import { networkModel, networkSelectors } from '../../store'; import { usersQuery } from './index.gql_query'; diff --git a/x-pack/plugins/siem/public/network/index.ts b/x-pack/plugins/siem/public/network/index.ts new file mode 100644 index 00000000000000..6590e5ee5161c1 --- /dev/null +++ b/x-pack/plugins/siem/public/network/index.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SecuritySubPluginWithStore } from '../app/types'; +import { getNetworkRoutes } from './routes'; +import { initialNetworkState, networkReducer, NetworkState } from './store'; + +export class Network { + public setup() {} + + public start(): SecuritySubPluginWithStore<'network', NetworkState> { + return { + routes: getNetworkRoutes(), + store: { + initialState: { network: initialNetworkState }, + reducer: { network: networkReducer }, + }, + }; + } +} diff --git a/x-pack/plugins/siem/public/pages/network/index.tsx b/x-pack/plugins/siem/public/network/pages/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/pages/network/index.tsx rename to x-pack/plugins/siem/public/network/pages/index.tsx index 412e51e74059e0..c6f13c118c3093 100644 --- a/x-pack/plugins/siem/public/pages/network/index.tsx +++ b/x-pack/plugins/siem/public/network/pages/index.tsx @@ -7,14 +7,14 @@ import React, { useMemo } from 'react'; import { Redirect, Route, Switch, RouteComponentProps } from 'react-router-dom'; -import { useMlCapabilities } from '../../components/ml_popover/hooks/use_ml_capabilities'; +import { useMlCapabilities } from '../../common/components/ml_popover/hooks/use_ml_capabilities'; import { hasMlUserPermissions } from '../../../common/machine_learning/has_ml_user_permissions'; import { FlowTarget } from '../../graphql/types'; import { IPDetails } from './ip_details'; import { Network } from './network'; -import { GlobalTime } from '../../containers/global_time'; -import { SiemPageName } from '../home/types'; +import { GlobalTime } from '../../common/containers/global_time'; +import { SiemPageName } from '../../app/types'; import { getNetworkRoutePath } from './navigation'; import { NetworkRouteType } from './navigation/types'; diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/network/pages/ip_details/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/pages/network/ip_details/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/network/pages/ip_details/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/index.test.tsx b/x-pack/plugins/siem/public/network/pages/ip_details/index.test.tsx similarity index 84% rename from x-pack/plugins/siem/public/pages/network/ip_details/index.test.tsx rename to x-pack/plugins/siem/public/network/pages/ip_details/index.test.tsx index 02132d790796c5..79af38f0cf8873 100644 --- a/x-pack/plugins/siem/public/pages/network/ip_details/index.test.tsx +++ b/x-pack/plugins/siem/public/network/pages/ip_details/index.test.tsx @@ -11,15 +11,19 @@ import { Router } from 'react-router-dom'; import { MockedProvider } from 'react-apollo/test-utils'; import { ActionCreator } from 'typescript-fsa'; -import '../../../mock/match_media'; +import '../../../common/mock/match_media'; -import { mocksSource } from '../../../containers/source/mock'; +import { mocksSource } from '../../../common/containers/source/mock'; import { FlowTarget } from '../../../graphql/types'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../mock'; -import { useMountAppended } from '../../../utils/use_mount_appended'; -import { createStore, State } from '../../../store'; -import { InputsModelId } from '../../../store/inputs/constants'; - +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; +import { createStore, State } from '../../../common/store'; +import { InputsModelId } from '../../../common/store/inputs/constants'; import { IPDetailsComponent, IPDetails } from './index'; type Action = 'PUSH' | 'POP' | 'REPLACE'; @@ -29,10 +33,10 @@ type GlobalWithFetch = NodeJS.Global & { fetch: jest.Mock }; // Test will fail because we will to need to mock some core services to make the test work // For now let's forget about SiemSearchBar and QueryBar -jest.mock('../../../components/search_bar', () => ({ +jest.mock('../../../common/components/search_bar', () => ({ SiemSearchBar: () => null, })); -jest.mock('../../../components/query_bar', () => ({ +jest.mock('../../../common/components/query_bar', () => ({ QueryBar: () => null, })); @@ -114,10 +118,10 @@ describe('Ip Details', () => { }); const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); localSource = cloneDeep(mocksSource); }); diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/index.tsx b/x-pack/plugins/siem/public/network/pages/ip_details/index.tsx similarity index 84% rename from x-pack/plugins/siem/public/pages/network/ip_details/index.tsx rename to x-pack/plugins/siem/public/network/pages/ip_details/index.tsx index 350d6e34c1c0f7..9ae09d6c6cec74 100644 --- a/x-pack/plugins/siem/public/pages/network/ip_details/index.tsx +++ b/x-pack/plugins/siem/public/network/pages/ip_details/index.tsx @@ -9,29 +9,32 @@ import React, { useCallback, useEffect } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import { StickyContainer } from 'react-sticky'; -import { FiltersGlobal } from '../../../components/filters_global'; -import { HeaderPage } from '../../../components/header_page'; -import { LastEventTime } from '../../../components/last_event_time'; -import { AnomalyTableProvider } from '../../../components/ml/anomaly/anomaly_table_provider'; -import { networkToCriteria } from '../../../components/ml/criteria/network_to_criteria'; -import { scoreIntervalToDateTime } from '../../../components/ml/score/score_interval_to_datetime'; -import { AnomaliesNetworkTable } from '../../../components/ml/tables/anomalies_network_table'; -import { manageQuery } from '../../../components/page/manage_query'; -import { FlowTargetSelectConnected } from '../../../components/page/network/flow_target_select_connected'; -import { IpOverview } from '../../../components/page/network/ip_overview'; -import { SiemSearchBar } from '../../../components/search_bar'; -import { WrapperPage } from '../../../components/wrapper_page'; -import { IpOverviewQuery } from '../../../containers/ip_overview'; -import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../../containers/source'; +import { FiltersGlobal } from '../../../common/components/filters_global'; +import { HeaderPage } from '../../../common/components/header_page'; +import { LastEventTime } from '../../../common/components/last_event_time'; +import { AnomalyTableProvider } from '../../../common/components/ml/anomaly/anomaly_table_provider'; +import { networkToCriteria } from '../../../common/components/ml/criteria/network_to_criteria'; +import { scoreIntervalToDateTime } from '../../../common/components/ml/score/score_interval_to_datetime'; +import { AnomaliesNetworkTable } from '../../../common/components/ml/tables/anomalies_network_table'; +import { manageQuery } from '../../../common/components/page/manage_query'; +import { FlowTargetSelectConnected } from '../../components/flow_target_select_connected'; +import { IpOverview } from '../../components/ip_overview'; +import { SiemSearchBar } from '../../../common/components/search_bar'; +import { WrapperPage } from '../../../common/components/wrapper_page'; +import { IpOverviewQuery } from '../../containers/ip_overview'; +import { + indicesExistOrDataTemporarilyUnavailable, + WithSource, +} from '../../../common/containers/source'; import { FlowTargetSourceDest, LastEventIndexKey } from '../../../graphql/types'; -import { useKibana } from '../../../lib/kibana'; -import { decodeIpv6 } from '../../../lib/helpers'; -import { convertToBuildEsQuery } from '../../../lib/keury'; -import { ConditionalFlexGroup } from '../../../pages/network/navigation/conditional_flex_group'; -import { networkModel, State, inputsSelectors } from '../../../store'; -import { setAbsoluteRangeDatePicker as dispatchAbsoluteRangeDatePicker } from '../../../store/inputs/actions'; -import { setIpDetailsTablesActivePageToZero as dispatchIpDetailsTablesActivePageToZero } from '../../../store/network/actions'; -import { SpyRoute } from '../../../utils/route/spy_routes'; +import { useKibana } from '../../../common/lib/kibana'; +import { decodeIpv6 } from '../../../common/lib/helpers'; +import { convertToBuildEsQuery } from '../../../common/lib/keury'; +import { ConditionalFlexGroup } from '../../pages/navigation/conditional_flex_group'; +import { State, inputsSelectors } from '../../../common/store'; +import { setAbsoluteRangeDatePicker as dispatchAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions'; +import { setIpDetailsTablesActivePageToZero as dispatchIpDetailsTablesActivePageToZero } from '../../store/actions'; +import { SpyRoute } from '../../../common/utils/route/spy_routes'; import { NetworkEmptyPage } from '../network_empty_page'; import { NetworkHttpQueryTable } from './network_http_query_table'; import { NetworkTopCountriesQueryTable } from './network_top_countries_query_table'; @@ -39,9 +42,9 @@ import { NetworkTopNFlowQueryTable } from './network_top_n_flow_query_table'; import { TlsQueryTable } from './tls_query_table'; import { IPDetailsComponentProps } from './types'; import { UsersQueryTable } from './users_query_table'; -import { AnomaliesQueryTabBody } from '../../../containers/anomalies/anomalies_query_tab_body'; +import { AnomaliesQueryTabBody } from '../../../common/containers/anomalies/anomalies_query_tab_body'; import { esQuery } from '../../../../../../../src/plugins/data/public'; - +import { networkModel } from '../../store'; export { getBreadcrumbs } from './utils'; const IpOverviewManage = manageQuery(IpOverview); diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/network_http_query_table.tsx b/x-pack/plugins/siem/public/network/pages/ip_details/network_http_query_table.tsx similarity index 86% rename from x-pack/plugins/siem/public/pages/network/ip_details/network_http_query_table.tsx rename to x-pack/plugins/siem/public/network/pages/ip_details/network_http_query_table.tsx index d071cc67414c9f..551de698cfa08d 100644 --- a/x-pack/plugins/siem/public/pages/network/ip_details/network_http_query_table.tsx +++ b/x-pack/plugins/siem/public/network/pages/ip_details/network_http_query_table.tsx @@ -6,10 +6,10 @@ import React from 'react'; import { getOr } from 'lodash/fp'; -import { manageQuery } from '../../../components/page/manage_query'; +import { manageQuery } from '../../../common/components/page/manage_query'; import { OwnProps } from './types'; -import { NetworkHttpQuery } from '../../../containers/network_http'; -import { NetworkHttpTable } from '../../../components/page/network/network_http_table'; +import { NetworkHttpQuery } from '../../containers/network_http'; +import { NetworkHttpTable } from '../../components/network_http_table'; const NetworkHttpTableManage = manageQuery(NetworkHttpTable); diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/network_top_countries_query_table.tsx b/x-pack/plugins/siem/public/network/pages/ip_details/network_top_countries_query_table.tsx similarity index 86% rename from x-pack/plugins/siem/public/pages/network/ip_details/network_top_countries_query_table.tsx rename to x-pack/plugins/siem/public/network/pages/ip_details/network_top_countries_query_table.tsx index 8f3505009b9a51..6bc80ef1a6aae4 100644 --- a/x-pack/plugins/siem/public/pages/network/ip_details/network_top_countries_query_table.tsx +++ b/x-pack/plugins/siem/public/network/pages/ip_details/network_top_countries_query_table.tsx @@ -6,10 +6,10 @@ import React from 'react'; import { getOr } from 'lodash/fp'; -import { manageQuery } from '../../../components/page/manage_query'; +import { manageQuery } from '../../../common/components/page/manage_query'; import { NetworkWithIndexComponentsQueryTableProps } from './types'; -import { NetworkTopCountriesQuery } from '../../../containers/network_top_countries'; -import { NetworkTopCountriesTable } from '../../../components/page/network/network_top_countries_table'; +import { NetworkTopCountriesQuery } from '../../containers/network_top_countries'; +import { NetworkTopCountriesTable } from '../../components/network_top_countries_table'; const NetworkTopCountriesTableManage = manageQuery(NetworkTopCountriesTable); diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/network_top_n_flow_query_table.tsx b/x-pack/plugins/siem/public/network/pages/ip_details/network_top_n_flow_query_table.tsx similarity index 86% rename from x-pack/plugins/siem/public/pages/network/ip_details/network_top_n_flow_query_table.tsx rename to x-pack/plugins/siem/public/network/pages/ip_details/network_top_n_flow_query_table.tsx index 06ae3160415d96..158b4057a7d5e3 100644 --- a/x-pack/plugins/siem/public/pages/network/ip_details/network_top_n_flow_query_table.tsx +++ b/x-pack/plugins/siem/public/network/pages/ip_details/network_top_n_flow_query_table.tsx @@ -6,9 +6,9 @@ import { getOr } from 'lodash/fp'; import React from 'react'; -import { manageQuery } from '../../../components/page/manage_query'; -import { NetworkTopNFlowTable } from '../../../components/page/network/network_top_n_flow_table'; -import { NetworkTopNFlowQuery } from '../../../containers/network_top_n_flow'; +import { manageQuery } from '../../../common/components/page/manage_query'; +import { NetworkTopNFlowTable } from '../../components/network_top_n_flow_table'; +import { NetworkTopNFlowQuery } from '../../containers/network_top_n_flow'; import { NetworkWithIndexComponentsQueryTableProps } from './types'; const NetworkTopNFlowTableManage = manageQuery(NetworkTopNFlowTable); diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/tls_query_table.tsx b/x-pack/plugins/siem/public/network/pages/ip_details/tls_query_table.tsx similarity index 87% rename from x-pack/plugins/siem/public/pages/network/ip_details/tls_query_table.tsx rename to x-pack/plugins/siem/public/network/pages/ip_details/tls_query_table.tsx index ad3ffb8cb0a578..f0c3628af78d85 100644 --- a/x-pack/plugins/siem/public/pages/network/ip_details/tls_query_table.tsx +++ b/x-pack/plugins/siem/public/network/pages/ip_details/tls_query_table.tsx @@ -6,9 +6,9 @@ import { getOr } from 'lodash/fp'; import React from 'react'; -import { manageQuery } from '../../../components/page/manage_query'; -import { TlsTable } from '../../../components/page/network/tls_table'; -import { TlsQuery } from '../../../containers/tls'; +import { manageQuery } from '../../../common/components/page/manage_query'; +import { TlsTable } from '../../components/tls_table'; +import { TlsQuery } from '../../containers/tls'; import { TlsQueryTableComponentProps } from './types'; const TlsTableManage = manageQuery(TlsTable); diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/types.ts b/x-pack/plugins/siem/public/network/pages/ip_details/types.ts similarity index 86% rename from x-pack/plugins/siem/public/pages/network/ip_details/types.ts rename to x-pack/plugins/siem/public/network/pages/ip_details/types.ts index 11c41fc74515e2..02d83208884b41 100644 --- a/x-pack/plugins/siem/public/pages/network/ip_details/types.ts +++ b/x-pack/plugins/siem/public/network/pages/ip_details/types.ts @@ -7,10 +7,10 @@ import { IIndexPattern } from 'src/plugins/data/public'; import { ESTermQuery } from '../../../../common/typed_json'; -import { NetworkType } from '../../../store/network/model'; -import { InspectQuery, Refetch } from '../../../store/inputs/model'; +import { NetworkType } from '../../store/model'; +import { InspectQuery, Refetch } from '../../../common/store/inputs/model'; import { FlowTarget, FlowTargetSourceDest } from '../../../graphql/types'; -import { GlobalTimeArgs } from '../../../containers/global_time'; +import { GlobalTimeArgs } from '../../../common/containers/global_time'; export const type = NetworkType.details; diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/users_query_table.tsx b/x-pack/plugins/siem/public/network/pages/ip_details/users_query_table.tsx similarity index 87% rename from x-pack/plugins/siem/public/pages/network/ip_details/users_query_table.tsx rename to x-pack/plugins/siem/public/network/pages/ip_details/users_query_table.tsx index d2f6102e86595b..4071790b4208ae 100644 --- a/x-pack/plugins/siem/public/pages/network/ip_details/users_query_table.tsx +++ b/x-pack/plugins/siem/public/network/pages/ip_details/users_query_table.tsx @@ -6,10 +6,10 @@ import React from 'react'; import { getOr } from 'lodash/fp'; -import { manageQuery } from '../../../components/page/manage_query'; -import { UsersQuery } from '../../../containers/users'; +import { manageQuery } from '../../../common/components/page/manage_query'; +import { UsersQuery } from '../../containers/users'; import { NetworkComponentsQueryProps } from './types'; -import { UsersTable } from '../../../components/page/network/users_table'; +import { UsersTable } from '../../components/users_table'; const UsersTableManage = manageQuery(UsersTable); diff --git a/x-pack/plugins/siem/public/pages/network/ip_details/utils.ts b/x-pack/plugins/siem/public/network/pages/ip_details/utils.ts similarity index 82% rename from x-pack/plugins/siem/public/pages/network/ip_details/utils.ts rename to x-pack/plugins/siem/public/network/pages/ip_details/utils.ts index 9d15d7ee250c99..b1f986f20778f2 100644 --- a/x-pack/plugins/siem/public/pages/network/ip_details/utils.ts +++ b/x-pack/plugins/siem/public/network/pages/ip_details/utils.ts @@ -6,13 +6,17 @@ import { get, isEmpty } from 'lodash/fp'; +// eslint-disable-next-line @kbn/eslint/no-restricted-paths import { ChromeBreadcrumb } from '../../../../../../../src/core/public'; -import { decodeIpv6 } from '../../../lib/helpers'; -import { getNetworkUrl, getIPDetailsUrl } from '../../../components/link_to/redirect_to_network'; -import { networkModel } from '../../../store/network'; +import { decodeIpv6 } from '../../../common/lib/helpers'; +import { + getNetworkUrl, + getIPDetailsUrl, +} from '../../../common/components/link_to/redirect_to_network'; +import { networkModel } from '../../store'; import * as i18n from '../translations'; import { NetworkRouteType } from '../navigation/types'; -import { NetworkRouteSpyState } from '../../../utils/route/types'; +import { NetworkRouteSpyState } from '../../../common/utils/route/types'; export const type = networkModel.NetworkType.details; const TabNameMappedToI18nKey: Record = { diff --git a/x-pack/plugins/siem/public/pages/network/navigation/alerts_query_tab_body.tsx b/x-pack/plugins/siem/public/network/pages/navigation/alerts_query_tab_body.tsx similarity index 96% rename from x-pack/plugins/siem/public/pages/network/navigation/alerts_query_tab_body.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/alerts_query_tab_body.tsx index 4c4f6c06ce1e1a..c5f59e751ca9ae 100644 --- a/x-pack/plugins/siem/public/pages/network/navigation/alerts_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/network/pages/navigation/alerts_query_tab_body.tsx @@ -7,7 +7,7 @@ import React from 'react'; import { Filter } from '../../../../../../../src/plugins/data/common/es_query'; -import { AlertsView } from '../../../components/alerts_viewer'; +import { AlertsView } from '../../../common/components/alerts_viewer'; import { NetworkComponentQueryProps } from './types'; export const filterNetworkData: Filter[] = [ diff --git a/x-pack/plugins/siem/public/pages/network/navigation/conditional_flex_group.tsx b/x-pack/plugins/siem/public/network/pages/navigation/conditional_flex_group.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/network/navigation/conditional_flex_group.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/conditional_flex_group.tsx diff --git a/x-pack/plugins/siem/public/pages/network/navigation/countries_query_tab_body.tsx b/x-pack/plugins/siem/public/network/pages/navigation/countries_query_tab_body.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/network/navigation/countries_query_tab_body.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/countries_query_tab_body.tsx index 6ddd3bbec3a322..0c569952458e47 100644 --- a/x-pack/plugins/siem/public/pages/network/navigation/countries_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/network/pages/navigation/countries_query_tab_body.tsx @@ -7,10 +7,10 @@ import React from 'react'; import { getOr } from 'lodash/fp'; -import { NetworkTopCountriesTable } from '../../../components/page/network'; -import { NetworkTopCountriesQuery } from '../../../containers/network_top_countries'; -import { networkModel } from '../../../store'; -import { manageQuery } from '../../../components/page/manage_query'; +import { NetworkTopCountriesTable } from '../../components/network_top_countries_table'; +import { NetworkTopCountriesQuery } from '../../containers/network_top_countries'; +import { networkModel } from '../../store'; +import { manageQuery } from '../../../common/components/page/manage_query'; import { IPsQueryTabBodyProps as CountriesQueryTabBodyProps } from './types'; diff --git a/x-pack/plugins/siem/public/pages/network/navigation/dns_query_tab_body.tsx b/x-pack/plugins/siem/public/network/pages/navigation/dns_query_tab_body.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/network/navigation/dns_query_tab_body.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/dns_query_tab_body.tsx index fe456afcc7189b..acabdd1d3608eb 100644 --- a/x-pack/plugins/siem/public/pages/network/navigation/dns_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/network/pages/navigation/dns_query_tab_body.tsx @@ -7,19 +7,19 @@ import React, { useEffect, useCallback, useMemo } from 'react'; import { getOr } from 'lodash/fp'; -import { NetworkDnsTable } from '../../../components/page/network/network_dns_table'; -import { NetworkDnsQuery, HISTOGRAM_ID } from '../../../containers/network_dns'; -import { manageQuery } from '../../../components/page/manage_query'; +import { NetworkDnsTable } from '../../components/network_dns_table'; +import { NetworkDnsQuery, HISTOGRAM_ID } from '../../containers/network_dns'; +import { manageQuery } from '../../../common/components/page/manage_query'; import { NetworkComponentQueryProps } from './types'; -import { networkModel } from '../../../store'; +import { networkModel } from '../../store'; import { MatrixHistogramOption, MatrixHisrogramConfigs, -} from '../../../components/matrix_histogram/types'; +} from '../../../common/components/matrix_histogram/types'; import * as i18n from '../translations'; -import { MatrixHistogramContainer } from '../../../components/matrix_histogram'; +import { MatrixHistogramContainer } from '../../../common/components/matrix_histogram'; import { HistogramType } from '../../../graphql/types'; const NetworkDnsTableManage = manageQuery(NetworkDnsTable); diff --git a/x-pack/plugins/siem/public/pages/network/navigation/http_query_tab_body.tsx b/x-pack/plugins/siem/public/network/pages/navigation/http_query_tab_body.tsx similarity index 84% rename from x-pack/plugins/siem/public/pages/network/navigation/http_query_tab_body.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/http_query_tab_body.tsx index 639a14d354ced4..7e0c4025d6cac1 100644 --- a/x-pack/plugins/siem/public/pages/network/navigation/http_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/network/pages/navigation/http_query_tab_body.tsx @@ -7,10 +7,10 @@ import React from 'react'; import { getOr } from 'lodash/fp'; -import { NetworkHttpTable } from '../../../components/page/network'; -import { NetworkHttpQuery } from '../../../containers/network_http'; -import { networkModel } from '../../../store'; -import { manageQuery } from '../../../components/page/manage_query'; +import { NetworkHttpTable } from '../../components/network_http_table'; +import { NetworkHttpQuery } from '../../containers/network_http'; +import { networkModel } from '../../store'; +import { manageQuery } from '../../../common/components/page/manage_query'; import { HttpQueryTabBodyProps } from './types'; diff --git a/x-pack/plugins/siem/public/pages/network/navigation/index.ts b/x-pack/plugins/siem/public/network/pages/navigation/index.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/network/navigation/index.ts rename to x-pack/plugins/siem/public/network/pages/navigation/index.ts diff --git a/x-pack/plugins/siem/public/pages/network/navigation/ips_query_tab_body.tsx b/x-pack/plugins/siem/public/network/pages/navigation/ips_query_tab_body.tsx similarity index 84% rename from x-pack/plugins/siem/public/pages/network/navigation/ips_query_tab_body.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/ips_query_tab_body.tsx index c4391ba2ec90ac..a9f4d504847a07 100644 --- a/x-pack/plugins/siem/public/pages/network/navigation/ips_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/network/pages/navigation/ips_query_tab_body.tsx @@ -7,10 +7,10 @@ import React from 'react'; import { getOr } from 'lodash/fp'; -import { NetworkTopNFlowTable } from '../../../components/page/network'; -import { NetworkTopNFlowQuery } from '../../../containers/network_top_n_flow'; -import { networkModel } from '../../../store'; -import { manageQuery } from '../../../components/page/manage_query'; +import { NetworkTopNFlowTable } from '../../components/network_top_n_flow_table'; +import { NetworkTopNFlowQuery } from '../../containers/network_top_n_flow'; +import { networkModel } from '../../store'; +import { manageQuery } from '../../../common/components/page/manage_query'; import { IPsQueryTabBodyProps } from './types'; diff --git a/x-pack/plugins/siem/public/pages/network/navigation/nav_tabs.tsx b/x-pack/plugins/siem/public/network/pages/navigation/nav_tabs.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/network/navigation/nav_tabs.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/nav_tabs.tsx diff --git a/x-pack/plugins/siem/public/pages/network/navigation/network_routes.tsx b/x-pack/plugins/siem/public/network/pages/navigation/network_routes.tsx similarity index 90% rename from x-pack/plugins/siem/public/pages/network/navigation/network_routes.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/network_routes.tsx index fc8b632f87c597..08ed0d9769be8a 100644 --- a/x-pack/plugins/siem/public/pages/network/navigation/network_routes.tsx +++ b/x-pack/plugins/siem/public/network/pages/navigation/network_routes.tsx @@ -9,20 +9,20 @@ import { Route, Switch } from 'react-router-dom'; import { EuiFlexItem, EuiSpacer } from '@elastic/eui'; import { FlowTargetSourceDest } from '../../../graphql/types'; -import { scoreIntervalToDateTime } from '../../../components/ml/score/score_interval_to_datetime'; +import { scoreIntervalToDateTime } from '../../../common/components/ml/score/score_interval_to_datetime'; import { IPsQueryTabBody } from './ips_query_tab_body'; import { CountriesQueryTabBody } from './countries_query_tab_body'; import { HttpQueryTabBody } from './http_query_tab_body'; -import { AnomaliesQueryTabBody } from '../../../containers/anomalies/anomalies_query_tab_body'; -import { AnomaliesNetworkTable } from '../../../components/ml/tables/anomalies_network_table'; +import { AnomaliesQueryTabBody } from '../../../common/containers/anomalies/anomalies_query_tab_body'; +import { AnomaliesNetworkTable } from '../../../common/components/ml/tables/anomalies_network_table'; import { DnsQueryTabBody } from './dns_query_tab_body'; import { ConditionalFlexGroup } from './conditional_flex_group'; import { NetworkRoutesProps, NetworkRouteType } from './types'; import { TlsQueryTabBody } from './tls_query_tab_body'; -import { Anomaly } from '../../../components/ml/types'; +import { Anomaly } from '../../../common/components/ml/types'; import { NetworkAlertsQueryTabBody } from './alerts_query_tab_body'; -import { UpdateDateRange } from '../../../components/charts/common'; +import { UpdateDateRange } from '../../../common/components/charts/common'; export const NetworkRoutes = React.memo( ({ diff --git a/x-pack/plugins/siem/public/pages/network/navigation/network_routes_loading.tsx b/x-pack/plugins/siem/public/network/pages/navigation/network_routes_loading.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/network/navigation/network_routes_loading.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/network_routes_loading.tsx diff --git a/x-pack/plugins/siem/public/pages/network/navigation/tls_query_tab_body.tsx b/x-pack/plugins/siem/public/network/pages/navigation/tls_query_tab_body.tsx similarity index 87% rename from x-pack/plugins/siem/public/pages/network/navigation/tls_query_tab_body.tsx rename to x-pack/plugins/siem/public/network/pages/navigation/tls_query_tab_body.tsx index 0adfec203e0a61..00da5496e54405 100644 --- a/x-pack/plugins/siem/public/pages/network/navigation/tls_query_tab_body.tsx +++ b/x-pack/plugins/siem/public/network/pages/navigation/tls_query_tab_body.tsx @@ -5,9 +5,9 @@ */ import React from 'react'; import { getOr } from 'lodash/fp'; -import { manageQuery } from '../../../components/page/manage_query'; -import { TlsQuery } from '../../../containers/tls'; -import { TlsTable } from '../../../components/page/network/tls_table'; +import { manageQuery } from '../../../common/components/page/manage_query'; +import { TlsQuery } from '../../../network/containers/tls'; +import { TlsTable } from '../../components/tls_table'; import { TlsQueryTabBodyProps } from './types'; const TlsTableManage = manageQuery(TlsTable); diff --git a/x-pack/plugins/siem/public/pages/network/navigation/types.ts b/x-pack/plugins/siem/public/network/pages/navigation/types.ts similarity index 89% rename from x-pack/plugins/siem/public/pages/network/navigation/types.ts rename to x-pack/plugins/siem/public/network/pages/navigation/types.ts index ee03bff99b9677..0f48aad57b3a84 100644 --- a/x-pack/plugins/siem/public/pages/network/navigation/types.ts +++ b/x-pack/plugins/siem/public/network/pages/navigation/types.ts @@ -7,13 +7,13 @@ import { ESTermQuery } from '../../../../common/typed_json'; import { IIndexPattern } from '../../../../../../../src/plugins/data/common'; -import { NavTab } from '../../../components/navigation/types'; +import { NavTab } from '../../../common/components/navigation/types'; import { FlowTargetSourceDest } from '../../../graphql/types'; -import { networkModel } from '../../../store'; -import { GlobalTimeArgs } from '../../../containers/global_time'; +import { networkModel } from '../../store'; +import { GlobalTimeArgs } from '../../../common/containers/global_time'; import { SetAbsoluteRangeDatePicker } from '../types'; -import { NarrowDateRange } from '../../../components/ml/types'; +import { NarrowDateRange } from '../../../common/components/ml/types'; interface QueryTabBodyProps extends Pick { skip: boolean; diff --git a/x-pack/plugins/siem/public/pages/network/navigation/utils.ts b/x-pack/plugins/siem/public/network/pages/navigation/utils.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/network/navigation/utils.ts rename to x-pack/plugins/siem/public/network/pages/navigation/utils.ts diff --git a/x-pack/plugins/siem/public/pages/network/network.test.tsx b/x-pack/plugins/siem/public/network/pages/network.test.tsx similarity index 89% rename from x-pack/plugins/siem/public/pages/network/network.test.tsx rename to x-pack/plugins/siem/public/network/pages/network.test.tsx index 300cb83c4ce753..1a8313db92b61d 100644 --- a/x-pack/plugins/siem/public/pages/network/network.test.tsx +++ b/x-pack/plugins/siem/public/network/pages/network.test.tsx @@ -10,21 +10,27 @@ import React from 'react'; import { Router } from 'react-router-dom'; import { MockedProvider } from 'react-apollo/test-utils'; -import '../../mock/match_media'; +import '../../common/mock/match_media'; import { Filter } from '../../../../../../src/plugins/data/common/es_query'; -import { mocksSource } from '../../containers/source/mock'; -import { TestProviders, mockGlobalState, apolloClientObservable } from '../../mock'; -import { State, createStore } from '../../store'; -import { inputsActions } from '../../store/inputs'; +import { mocksSource } from '../../common/containers/source/mock'; +import { + TestProviders, + mockGlobalState, + apolloClientObservable, + SUB_PLUGINS_REDUCER, +} from '../../common/mock'; +import { State, createStore } from '../../common/store'; +import { inputsActions } from '../../common/store/inputs'; + import { Network } from './network'; import { NetworkRoutes } from './navigation'; // Test will fail because we will to need to mock some core services to make the test work // For now let's forget about SiemSearchBar and QueryBar -jest.mock('../../components/search_bar', () => ({ +jest.mock('../../common/components/search_bar', () => ({ SiemSearchBar: () => null, })); -jest.mock('../../components/query_bar', () => ({ +jest.mock('../../common/components/query_bar', () => ({ QueryBar: () => null, })); @@ -149,7 +155,7 @@ describe('rendering - rendering', () => { ]; localSource[0].result.data.source.status.indicesExist = true; const myState: State = mockGlobalState; - const myStore = createStore(myState, apolloClientObservable); + const myStore = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable); const wrapper = mount( diff --git a/x-pack/plugins/siem/public/pages/network/network.tsx b/x-pack/plugins/siem/public/network/pages/network.tsx similarity index 83% rename from x-pack/plugins/siem/public/pages/network/network.tsx rename to x-pack/plugins/siem/public/network/pages/network.tsx index 698f51efbb451c..2f7a97ed3d19ef 100644 --- a/x-pack/plugins/siem/public/pages/network/network.tsx +++ b/x-pack/plugins/siem/public/network/pages/network.tsx @@ -11,24 +11,28 @@ import { useParams } from 'react-router-dom'; import { StickyContainer } from 'react-sticky'; import { esQuery } from '../../../../../../src/plugins/data/public'; -import { UpdateDateRange } from '../../components/charts/common'; -import { EmbeddedMap } from '../../components/embeddables/embedded_map'; -import { FiltersGlobal } from '../../components/filters_global'; -import { HeaderPage } from '../../components/header_page'; -import { LastEventTime } from '../../components/last_event_time'; -import { SiemNavigation } from '../../components/navigation'; -import { manageQuery } from '../../components/page/manage_query'; -import { KpiNetworkComponent } from '../../components/page/network'; -import { SiemSearchBar } from '../../components/search_bar'; -import { WrapperPage } from '../../components/wrapper_page'; -import { KpiNetworkQuery } from '../../containers/kpi_network'; -import { indicesExistOrDataTemporarilyUnavailable, WithSource } from '../../containers/source'; +import { UpdateDateRange } from '../../common/components/charts/common'; +import { EmbeddedMap } from '../components/embeddables/embedded_map'; +import { FiltersGlobal } from '../../common/components/filters_global'; +import { HeaderPage } from '../../common/components/header_page'; +import { LastEventTime } from '../../common/components/last_event_time'; +import { SiemNavigation } from '../../common/components/navigation'; +import { manageQuery } from '../../common/components/page/manage_query'; +import { KpiNetworkComponent } from '..//components/kpi_network'; +import { SiemSearchBar } from '../../common/components/search_bar'; +import { WrapperPage } from '../../common/components/wrapper_page'; +import { KpiNetworkQuery } from '../../network/containers/kpi_network'; +import { + indicesExistOrDataTemporarilyUnavailable, + WithSource, +} from '../../common/containers/source'; import { LastEventIndexKey } from '../../graphql/types'; -import { useKibana } from '../../lib/kibana'; -import { convertToBuildEsQuery } from '../../lib/keury'; -import { networkModel, State, inputsSelectors } from '../../store'; -import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions'; -import { SpyRoute } from '../../utils/route/spy_routes'; +import { useKibana } from '../../common/lib/kibana'; +import { convertToBuildEsQuery } from '../../common/lib/keury'; +import { State, inputsSelectors } from '../../common/store'; +import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../common/store/inputs/actions'; +import { SpyRoute } from '../../common/utils/route/spy_routes'; +import { networkModel } from '../store'; import { navTabsNetwork, NetworkRoutes, NetworkRoutesLoading } from './navigation'; import { filterNetworkData } from './navigation/alerts_query_tab_body'; import { NetworkEmptyPage } from './network_empty_page'; diff --git a/x-pack/plugins/siem/public/pages/network/network_empty_page.tsx b/x-pack/plugins/siem/public/network/pages/network_empty_page.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/network/network_empty_page.tsx rename to x-pack/plugins/siem/public/network/pages/network_empty_page.tsx index 22db00400bf8a2..0dbcddd5d28721 100644 --- a/x-pack/plugins/siem/public/pages/network/network_empty_page.tsx +++ b/x-pack/plugins/siem/public/network/pages/network_empty_page.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import { useKibana } from '../../lib/kibana'; -import { EmptyPage } from '../../components/empty_page'; -import * as i18n from '../common/translations'; +import { useKibana } from '../../common/lib/kibana'; +import { EmptyPage } from '../../common/components/empty_page'; +import * as i18n from '../../common/translations'; export const NetworkEmptyPage = React.memo(() => { const { http, docLinks } = useKibana().services; diff --git a/x-pack/plugins/siem/public/pages/network/translations.ts b/x-pack/plugins/siem/public/network/pages/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/network/translations.ts rename to x-pack/plugins/siem/public/network/pages/translations.ts diff --git a/x-pack/plugins/siem/public/pages/network/types.ts b/x-pack/plugins/siem/public/network/pages/types.ts similarity index 82% rename from x-pack/plugins/siem/public/pages/network/types.ts rename to x-pack/plugins/siem/public/network/pages/types.ts index 01d3fb6b48c631..e4170ee4b908b2 100644 --- a/x-pack/plugins/siem/public/pages/network/types.ts +++ b/x-pack/plugins/siem/public/network/pages/types.ts @@ -6,8 +6,8 @@ import { RouteComponentProps } from 'react-router-dom'; import { ActionCreator } from 'typescript-fsa'; -import { InputsModelId } from '../../store/inputs/constants'; -import { GlobalTimeArgs } from '../../containers/global_time'; +import { InputsModelId } from '../../common/store/inputs/constants'; +import { GlobalTimeArgs } from '../../common/containers/global_time'; export type SetAbsoluteRangeDatePicker = ActionCreator<{ id: InputsModelId; diff --git a/x-pack/plugins/siem/public/network/routes.tsx b/x-pack/plugins/siem/public/network/routes.tsx new file mode 100644 index 00000000000000..6f3fd28ec53b7b --- /dev/null +++ b/x-pack/plugins/siem/public/network/routes.tsx @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Route } from 'react-router-dom'; + +import { NetworkContainer } from './pages'; +import { SiemPageName } from '../app/types'; + +export const getNetworkRoutes = () => [ + } + />, +]; diff --git a/x-pack/plugins/siem/public/store/network/actions.ts b/x-pack/plugins/siem/public/network/store/actions.ts similarity index 95% rename from x-pack/plugins/siem/public/store/network/actions.ts rename to x-pack/plugins/siem/public/network/store/actions.ts index be7d9b1ad4518c..2a9766f9592224 100644 --- a/x-pack/plugins/siem/public/store/network/actions.ts +++ b/x-pack/plugins/siem/public/network/store/actions.ts @@ -5,8 +5,7 @@ */ import actionCreatorFactory from 'typescript-fsa'; - -import { networkModel } from '../model'; +import { networkModel } from '.'; const actionCreator = actionCreatorFactory('x-pack/siem/local/network'); diff --git a/x-pack/plugins/siem/public/store/network/helpers.test.ts b/x-pack/plugins/siem/public/network/store/helpers.test.ts similarity index 99% rename from x-pack/plugins/siem/public/store/network/helpers.test.ts rename to x-pack/plugins/siem/public/network/store/helpers.test.ts index 933c2f05a57ba6..a3a2a9b7f5393a 100644 --- a/x-pack/plugins/siem/public/store/network/helpers.test.ts +++ b/x-pack/plugins/siem/public/network/store/helpers.test.ts @@ -12,7 +12,7 @@ import { TlsFields, UsersFields, } from '../../graphql/types'; -import { DEFAULT_TABLE_LIMIT } from '../constants'; +import { DEFAULT_TABLE_LIMIT } from '../../common/store/constants'; import { NetworkModel, NetworkTableType, IpDetailsTableType, NetworkType } from './model'; import { setNetworkQueriesActivePageToZero } from './helpers'; diff --git a/x-pack/plugins/siem/public/store/network/helpers.ts b/x-pack/plugins/siem/public/network/store/helpers.ts similarity index 97% rename from x-pack/plugins/siem/public/store/network/helpers.ts rename to x-pack/plugins/siem/public/network/store/helpers.ts index 0b3a5e65346b8f..938de1dedf0b70 100644 --- a/x-pack/plugins/siem/public/store/network/helpers.ts +++ b/x-pack/plugins/siem/public/network/store/helpers.ts @@ -12,7 +12,7 @@ import { NetworkQueries, IpOverviewQueries, } from './model'; -import { DEFAULT_TABLE_ACTIVE_PAGE } from '../constants'; +import { DEFAULT_TABLE_ACTIVE_PAGE } from '../../common/store/constants'; export const setNetworkPageQueriesActivePageToZero = (state: NetworkModel): NetworkQueries => ({ ...state.page.queries, diff --git a/x-pack/plugins/siem/public/store/network/index.ts b/x-pack/plugins/siem/public/network/store/index.ts similarity index 64% rename from x-pack/plugins/siem/public/store/network/index.ts rename to x-pack/plugins/siem/public/network/store/index.ts index dcd32fe17ac97f..85268509ae9c58 100644 --- a/x-pack/plugins/siem/public/store/network/index.ts +++ b/x-pack/plugins/siem/public/network/store/index.ts @@ -4,9 +4,19 @@ * you may not use this file except in compliance with the Elastic License. */ +import { Reducer, AnyAction } from 'redux'; import * as networkActions from './actions'; import * as networkModel from './model'; import * as networkSelectors from './selectors'; +import { NetworkState } from './reducer'; export { networkActions, networkModel, networkSelectors }; export * from './reducer'; + +export interface NetworkPluginState { + network: NetworkState; +} + +export interface NetworkPluginReducer { + network: Reducer; +} diff --git a/x-pack/plugins/siem/public/store/network/model.ts b/x-pack/plugins/siem/public/network/store/model.ts similarity index 100% rename from x-pack/plugins/siem/public/store/network/model.ts rename to x-pack/plugins/siem/public/network/store/model.ts diff --git a/x-pack/plugins/siem/public/store/network/reducer.ts b/x-pack/plugins/siem/public/network/store/reducer.ts similarity index 99% rename from x-pack/plugins/siem/public/store/network/reducer.ts rename to x-pack/plugins/siem/public/network/store/reducer.ts index e6d7efc9cbb5f4..26458229da2968 100644 --- a/x-pack/plugins/siem/public/store/network/reducer.ts +++ b/x-pack/plugins/siem/public/network/store/reducer.ts @@ -14,7 +14,7 @@ import { TlsFields, UsersFields, } from '../../graphql/types'; -import { DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from '../constants'; +import { DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from '../../common/store/constants'; import { setIpDetailsTablesActivePageToZero, diff --git a/x-pack/plugins/siem/public/store/network/selectors.ts b/x-pack/plugins/siem/public/network/store/selectors.ts similarity index 98% rename from x-pack/plugins/siem/public/store/network/selectors.ts rename to x-pack/plugins/siem/public/network/store/selectors.ts index 273eaf7c0ee7fe..0b48fa2170535d 100644 --- a/x-pack/plugins/siem/public/store/network/selectors.ts +++ b/x-pack/plugins/siem/public/network/store/selectors.ts @@ -8,7 +8,7 @@ import { createSelector } from 'reselect'; import { get } from 'lodash/fp'; import { FlowTargetSourceDest } from '../../graphql/types'; -import { State } from '../reducer'; +import { State } from '../../common/store/reducer'; import { initialNetworkState } from './reducer'; import { IpDetailsTableType, diff --git a/x-pack/plugins/siem/public/pages/overview/alerts_by_category/index.test.tsx b/x-pack/plugins/siem/public/overview/components/alerts_by_category/index.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/overview/alerts_by_category/index.test.tsx rename to x-pack/plugins/siem/public/overview/components/alerts_by_category/index.test.tsx index bd9743bdccb4b6..c032b21f73290a 100644 --- a/x-pack/plugins/siem/public/pages/overview/alerts_by_category/index.test.tsx +++ b/x-pack/plugins/siem/public/overview/components/alerts_by_category/index.test.tsx @@ -11,15 +11,15 @@ import { mount, ReactWrapper } from 'enzyme'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { useQuery } from '../../../containers/matrix_histogram'; -import { wait } from '../../../lib/helpers'; -import { mockIndexPattern, TestProviders } from '../../../mock'; +import { useQuery } from '../../../common/containers/matrix_histogram'; +import { wait } from '../../../common/lib/helpers'; +import { mockIndexPattern, TestProviders } from '../../../common/mock'; import { AlertsByCategory } from '.'; -jest.mock('../../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); -jest.mock('../../../containers/matrix_histogram', () => { +jest.mock('../../../common/containers/matrix_histogram', () => { return { useQuery: jest.fn(), }; diff --git a/x-pack/plugins/siem/public/pages/overview/alerts_by_category/index.tsx b/x-pack/plugins/siem/public/overview/components/alerts_by_category/index.tsx similarity index 76% rename from x-pack/plugins/siem/public/pages/overview/alerts_by_category/index.tsx rename to x-pack/plugins/siem/public/overview/components/alerts_by_category/index.tsx index a1936cf9221f85..92f55aa1aa36d8 100644 --- a/x-pack/plugins/siem/public/pages/overview/alerts_by_category/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/alerts_by_category/index.tsx @@ -10,28 +10,28 @@ import React, { useEffect, useMemo } from 'react'; import { Position } from '@elastic/charts'; import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants'; -import { SHOWING, UNIT } from '../../../components/alerts_viewer/translations'; -import { getDetectionEngineAlertUrl } from '../../../components/link_to/redirect_to_detection_engine'; -import { MatrixHistogramContainer } from '../../../components/matrix_histogram'; -import { useKibana, useUiSetting$ } from '../../../lib/kibana'; -import { convertToBuildEsQuery } from '../../../lib/keury'; +import { SHOWING, UNIT } from '../../../common/components/alerts_viewer/translations'; +import { getDetectionEngineAlertUrl } from '../../../common/components/link_to/redirect_to_detection_engine'; +import { MatrixHistogramContainer } from '../../../common/components/matrix_histogram'; +import { useKibana, useUiSetting$ } from '../../../common/lib/kibana'; +import { convertToBuildEsQuery } from '../../../common/lib/keury'; import { Filter, esQuery, IIndexPattern, Query, } from '../../../../../../../src/plugins/data/public'; -import { inputsModel } from '../../../store'; -import { HostsType } from '../../../store/hosts/model'; +import { inputsModel } from '../../../common/store'; +import { HostsType } from '../../../hosts/store/model'; -import * as i18n from '../translations'; +import * as i18n from '../../pages/translations'; import { alertsStackByOptions, histogramConfigs, -} from '../../../components/alerts_viewer/histogram_configs'; -import { MatrixHisrogramConfigs } from '../../../components/matrix_histogram/types'; -import { useGetUrlSearch } from '../../../components/navigation/use_get_url_search'; -import { navTabs } from '../../home/home_navigations'; +} from '../../../common/components/alerts_viewer/histogram_configs'; +import { MatrixHisrogramConfigs } from '../../../common/components/matrix_histogram/types'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../app/home/home_navigations'; const ID = 'alertsByCategoryOverview'; diff --git a/x-pack/plugins/siem/public/pages/overview/event_counts/index.test.tsx b/x-pack/plugins/siem/public/overview/components/event_counts/index.test.tsx similarity index 87% rename from x-pack/plugins/siem/public/pages/overview/event_counts/index.test.tsx rename to x-pack/plugins/siem/public/overview/components/event_counts/index.test.tsx index f5419a3ff50e9e..628cd28979083e 100644 --- a/x-pack/plugins/siem/public/pages/overview/event_counts/index.test.tsx +++ b/x-pack/plugins/siem/public/overview/components/event_counts/index.test.tsx @@ -7,9 +7,9 @@ import { mount } from 'enzyme'; import React from 'react'; -import { OverviewHostProps } from '../../../components/page/overview/overview_host'; -import { OverviewNetworkProps } from '../../../components/page/overview/overview_network'; -import { mockIndexPattern, TestProviders } from '../../../mock'; +import { OverviewHostProps } from '../overview_host'; +import { OverviewNetworkProps } from '../overview_network'; +import { mockIndexPattern, TestProviders } from '../../../common/mock'; import { EventCounts } from '.'; diff --git a/x-pack/plugins/siem/public/pages/overview/event_counts/index.tsx b/x-pack/plugins/siem/public/overview/components/event_counts/index.tsx similarity index 81% rename from x-pack/plugins/siem/public/pages/overview/event_counts/index.tsx rename to x-pack/plugins/siem/public/overview/components/event_counts/index.tsx index f242b0d84d7c13..1773af86a382f6 100644 --- a/x-pack/plugins/siem/public/pages/overview/event_counts/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/event_counts/index.tsx @@ -8,19 +8,19 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { OverviewHost } from '../../../components/page/overview/overview_host'; -import { OverviewNetwork } from '../../../components/page/overview/overview_network'; -import { filterHostData } from '../../hosts/navigation/alerts_query_tab_body'; -import { useKibana } from '../../../lib/kibana'; -import { convertToBuildEsQuery } from '../../../lib/keury'; -import { filterNetworkData } from '../../network/navigation/alerts_query_tab_body'; +import { OverviewHost } from '../overview_host'; +import { OverviewNetwork } from '../overview_network'; +import { filterHostData } from '../../../hosts/pages/navigation/alerts_query_tab_body'; +import { useKibana } from '../../../common/lib/kibana'; +import { convertToBuildEsQuery } from '../../../common/lib/keury'; +import { filterNetworkData } from '../../../network/pages/navigation/alerts_query_tab_body'; import { Filter, esQuery, IIndexPattern, Query, } from '../../../../../../../src/plugins/data/public'; -import { inputsModel } from '../../../store'; +import { inputsModel } from '../../../common/store'; const HorizontalSpacer = styled(EuiFlexItem)` width: 24px; diff --git a/x-pack/plugins/siem/public/pages/overview/events_by_dataset/__mocks__/index.tsx b/x-pack/plugins/siem/public/overview/components/events_by_dataset/__mocks__/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/overview/events_by_dataset/__mocks__/index.tsx rename to x-pack/plugins/siem/public/overview/components/events_by_dataset/__mocks__/index.tsx diff --git a/x-pack/plugins/siem/public/pages/overview/events_by_dataset/index.tsx b/x-pack/plugins/siem/public/overview/components/events_by_dataset/index.tsx similarity index 82% rename from x-pack/plugins/siem/public/pages/overview/events_by_dataset/index.tsx rename to x-pack/plugins/siem/public/overview/components/events_by_dataset/index.tsx index 77d6da7a7efc4d..ebd005e7cb0b32 100644 --- a/x-pack/plugins/siem/public/pages/overview/events_by_dataset/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/events_by_dataset/index.tsx @@ -11,30 +11,30 @@ import React, { useEffect, useMemo } from 'react'; import uuid from 'uuid'; import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants'; -import { SHOWING, UNIT } from '../../../components/events_viewer/translations'; -import { getTabsOnHostsUrl } from '../../../components/link_to/redirect_to_hosts'; -import { MatrixHistogramContainer } from '../../../components/matrix_histogram'; +import { SHOWING, UNIT } from '../../../common/components/events_viewer/translations'; +import { getTabsOnHostsUrl } from '../../../common/components/link_to/redirect_to_hosts'; +import { MatrixHistogramContainer } from '../../../common/components/matrix_histogram'; import { MatrixHisrogramConfigs, MatrixHistogramOption, -} from '../../../components/matrix_histogram/types'; -import { useGetUrlSearch } from '../../../components/navigation/use_get_url_search'; -import { navTabs } from '../../home/home_navigations'; -import { eventsStackByOptions } from '../../hosts/navigation'; -import { convertToBuildEsQuery } from '../../../lib/keury'; -import { useKibana, useUiSetting$ } from '../../../lib/kibana'; -import { histogramConfigs } from '../../../pages/hosts/navigation/events_query_tab_body'; +} from '../../../common/components/matrix_histogram/types'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../app/home/home_navigations'; +import { eventsStackByOptions } from '../../../hosts/pages/navigation'; +import { convertToBuildEsQuery } from '../../../common/lib/keury'; +import { useKibana, useUiSetting$ } from '../../../common/lib/kibana'; +import { histogramConfigs } from '../../../hosts/pages/navigation/events_query_tab_body'; import { Filter, esQuery, IIndexPattern, Query, } from '../../../../../../../src/plugins/data/public'; -import { inputsModel } from '../../../store'; -import { HostsTableType, HostsType } from '../../../store/hosts/model'; -import { InputsModelId } from '../../../store/inputs/constants'; +import { inputsModel } from '../../../common/store'; +import { HostsTableType, HostsType } from '../../../hosts/store/model'; +import { InputsModelId } from '../../../common/store/inputs/constants'; -import * as i18n from '../translations'; +import * as i18n from '../../pages/translations'; const NO_FILTERS: Filter[] = []; const DEFAULT_QUERY: Query = { query: '', language: 'kuery' }; diff --git a/x-pack/plugins/siem/public/components/page/hosts/host_overview/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/overview/components/host_overview/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/host_overview/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/overview/components/host_overview/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx b/x-pack/plugins/siem/public/overview/components/host_overview/index.test.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx rename to x-pack/plugins/siem/public/overview/components/host_overview/index.test.tsx index 90cfe696610d94..56c232158ac02c 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/host_overview/index.test.tsx +++ b/x-pack/plugins/siem/public/overview/components/host_overview/index.test.tsx @@ -6,11 +6,11 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../common/mock'; import { HostOverview } from './index'; import { mockData } from './mock'; -import { mockAnomalies } from '../../../ml/mock'; +import { mockAnomalies } from '../../../common/components/ml/mock'; describe('Host Summary Component', () => { describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/hosts/host_overview/index.tsx b/x-pack/plugins/siem/public/overview/components/host_overview/index.tsx similarity index 81% rename from x-pack/plugins/siem/public/components/page/hosts/host_overview/index.tsx rename to x-pack/plugins/siem/public/overview/components/host_overview/index.tsx index 223a16fec77a0e..4440147c35f2f1 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/host_overview/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/host_overview/index.tsx @@ -10,21 +10,27 @@ import lightTheme from '@elastic/eui/dist/eui_theme_light.json'; import { getOr } from 'lodash/fp'; import React from 'react'; -import { DEFAULT_DARK_MODE } from '../../../../../common/constants'; -import { DescriptionList } from '../../../../../common/utility_types'; -import { useUiSetting$ } from '../../../../lib/kibana'; -import { getEmptyTagValue } from '../../../empty_value'; -import { DefaultFieldRenderer, hostIdRenderer } from '../../../field_renderers/field_renderers'; -import { InspectButton, InspectButtonContainer } from '../../../inspect'; -import { HostItem } from '../../../../graphql/types'; -import { Loader } from '../../../loader'; -import { IPDetailsLink } from '../../../links'; -import { hasMlUserPermissions } from '../../../../../common/machine_learning/has_ml_user_permissions'; -import { useMlCapabilities } from '../../../ml_popover/hooks/use_ml_capabilities'; -import { AnomalyScores } from '../../../ml/score/anomaly_scores'; -import { Anomalies, NarrowDateRange } from '../../../ml/types'; -import { DescriptionListStyled, OverviewWrapper } from '../../index'; -import { FirstLastSeenHost, FirstLastSeenHostType } from '../first_last_seen_host'; +import { DEFAULT_DARK_MODE } from '../../../../common/constants'; +import { DescriptionList } from '../../../../common/utility_types'; +import { useUiSetting$ } from '../../../common/lib/kibana'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { + DefaultFieldRenderer, + hostIdRenderer, +} from '../../../timelines/components/field_renderers/field_renderers'; +import { InspectButton, InspectButtonContainer } from '../../../common/components/inspect'; +import { HostItem } from '../../../graphql/types'; +import { Loader } from '../../../common/components/loader'; +import { IPDetailsLink } from '../../../common/components/links'; +import { hasMlUserPermissions } from '../../../../common/machine_learning/has_ml_user_permissions'; +import { useMlCapabilities } from '../../../common/components/ml_popover/hooks/use_ml_capabilities'; +import { AnomalyScores } from '../../../common/components/ml/score/anomaly_scores'; +import { Anomalies, NarrowDateRange } from '../../../common/components/ml/types'; +import { DescriptionListStyled, OverviewWrapper } from '../../../common/components/page'; +import { + FirstLastSeenHost, + FirstLastSeenHostType, +} from '../../../hosts/components/first_last_seen_host'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/page/hosts/host_overview/mock.ts b/x-pack/plugins/siem/public/overview/components/host_overview/mock.ts similarity index 96% rename from x-pack/plugins/siem/public/components/page/hosts/host_overview/mock.ts rename to x-pack/plugins/siem/public/overview/components/host_overview/mock.ts index d9a93272c09866..c24cb20e9087ca 100644 --- a/x-pack/plugins/siem/public/components/page/hosts/host_overview/mock.ts +++ b/x-pack/plugins/siem/public/overview/components/host_overview/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { HostsData } from '../../../../graphql/types'; +import { HostsData } from '../../../graphql/types'; export const mockData: { Hosts: HostsData; DateFields: string[] } = { Hosts: { diff --git a/x-pack/plugins/siem/public/components/page/hosts/host_overview/translations.ts b/x-pack/plugins/siem/public/overview/components/host_overview/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/hosts/host_overview/translations.ts rename to x-pack/plugins/siem/public/overview/components/host_overview/translations.ts diff --git a/x-pack/plugins/siem/public/components/page/overview/loading_placeholders/index.tsx b/x-pack/plugins/siem/public/overview/components/loading_placeholders/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/page/overview/loading_placeholders/index.tsx rename to x-pack/plugins/siem/public/overview/components/loading_placeholders/index.tsx diff --git a/x-pack/plugins/siem/public/pages/overview/overview_empty/index.tsx b/x-pack/plugins/siem/public/overview/components/overview_empty/index.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/overview/overview_empty/index.tsx rename to x-pack/plugins/siem/public/overview/components/overview_empty/index.tsx index 1325826f172c71..85a89882027749 100644 --- a/x-pack/plugins/siem/public/pages/overview/overview_empty/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/overview_empty/index.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import * as i18nCommon from '../../common/translations'; -import { EmptyPage } from '../../../components/empty_page'; -import { useKibana } from '../../../lib/kibana'; +import * as i18nCommon from '../../../common/translations'; +import { EmptyPage } from '../../../common/components/empty_page'; +import { useKibana } from '../../../common/lib/kibana'; const OverviewEmptyComponent: React.FC = () => { const { http, docLinks } = useKibana().services; diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_host/index.test.tsx b/x-pack/plugins/siem/public/overview/components/overview_host/index.test.tsx similarity index 85% rename from x-pack/plugins/siem/public/components/page/overview/overview_host/index.test.tsx rename to x-pack/plugins/siem/public/overview/components/overview_host/index.test.tsx index 568cf032fb01ce..137f5d1dc245de 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_host/index.test.tsx +++ b/x-pack/plugins/siem/public/overview/components/overview_host/index.test.tsx @@ -7,17 +7,23 @@ import { cloneDeep } from 'lodash/fp'; import { mount } from 'enzyme'; import React from 'react'; +import { MockedProvider } from 'react-apollo/test-utils'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; import { OverviewHost } from '.'; -import { createStore, State } from '../../../../store'; -import { overviewHostQuery } from '../../../../containers/overview/overview_host/index.gql_query'; -import { GetOverviewHostQuery } from '../../../../graphql/types'; -import { MockedProvider } from 'react-apollo/test-utils'; -import { wait } from '../../../../lib/helpers'; +import { createStore, State } from '../../../common/store'; +import { overviewHostQuery } from '../../containers/overview_host/index.gql_query'; +import { GetOverviewHostQuery } from '../../../graphql/types'; + +import { wait } from '../../../common/lib/helpers'; -jest.mock('../../../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); const startDate = 1579553397080; const endDate = 1579639797080; @@ -86,11 +92,11 @@ const mockOpenTimelineQueryResults: MockedProvidedQuery[] = [ describe('OverviewHost', () => { const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { const myState = cloneDeep(state); - store = createStore(myState, apolloClientObservable); + store = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable); }); test('it renders the expected widget title', () => { diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_host/index.tsx b/x-pack/plugins/siem/public/overview/components/overview_host/index.tsx similarity index 82% rename from x-pack/plugins/siem/public/components/page/overview/overview_host/index.tsx rename to x-pack/plugins/siem/public/overview/components/overview_host/index.tsx index 52c142ceff4805..111c1282931949 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_host/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/overview_host/index.tsx @@ -10,21 +10,18 @@ import numeral from '@elastic/numeral'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { useMemo } from 'react'; -import { DEFAULT_NUMBER_FORMAT } from '../../../../../common/constants'; -import { ESQuery } from '../../../../../common/typed_json'; -import { - ID as OverviewHostQueryId, - OverviewHostQuery, -} from '../../../../containers/overview/overview_host'; -import { HeaderSection } from '../../../header_section'; -import { useUiSetting$ } from '../../../../lib/kibana'; -import { getHostsUrl } from '../../../link_to'; +import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants'; +import { ESQuery } from '../../../../common/typed_json'; +import { ID as OverviewHostQueryId, OverviewHostQuery } from '../../containers/overview_host'; +import { HeaderSection } from '../../../common/components/header_section'; +import { useUiSetting$ } from '../../../common/lib/kibana'; +import { getHostsUrl } from '../../../common/components/link_to'; import { getOverviewHostStats, OverviewHostStats } from '../overview_host_stats'; -import { manageQuery } from '../../../page/manage_query'; -import { inputsModel } from '../../../../store/inputs'; -import { InspectButtonContainer } from '../../../inspect'; -import { useGetUrlSearch } from '../../../navigation/use_get_url_search'; -import { navTabs } from '../../../../pages/home/home_navigations'; +import { manageQuery } from '../../../common/components/page/manage_query'; +import { inputsModel } from '../../../common/store/inputs'; +import { InspectButtonContainer } from '../../../common/components/inspect'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../app/home/home_navigations'; export interface OwnProps { startDate: number; diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_host_stats/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/overview/overview_host_stats/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx b/x-pack/plugins/siem/public/overview/components/overview_host_stats/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx rename to x-pack/plugins/siem/public/overview/components/overview_host_stats/index.test.tsx index 4240ea441284cf..fcbe0c5272dae5 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_host_stats/index.test.tsx +++ b/x-pack/plugins/siem/public/overview/components/overview_host_stats/index.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { OverviewHostStats } from '.'; import { mockData } from './mock'; -import { TestProviders } from '../../../../mock/test_providers'; +import { TestProviders } from '../../../common/mock/test_providers'; describe('Overview Host Stat Data', () => { describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_host_stats/index.tsx b/x-pack/plugins/siem/public/overview/components/overview_host_stats/index.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/page/overview/overview_host_stats/index.tsx rename to x-pack/plugins/siem/public/overview/components/overview_host_stats/index.tsx index 4756e4c8265746..ab2e12f2110b8b 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_host_stats/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/overview_host_stats/index.tsx @@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React from 'react'; import styled from 'styled-components'; -import { OverviewHostData } from '../../../../graphql/types'; +import { OverviewHostData } from '../../../graphql/types'; import { FormattedStat, StatGroup } from '../types'; import { StatValue } from '../stat_value'; diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_host_stats/mock.ts b/x-pack/plugins/siem/public/overview/components/overview_host_stats/mock.ts similarity index 92% rename from x-pack/plugins/siem/public/components/page/overview/overview_host_stats/mock.ts rename to x-pack/plugins/siem/public/overview/components/overview_host_stats/mock.ts index 60e653caab8c10..63b3a484c1eaa9 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_host_stats/mock.ts +++ b/x-pack/plugins/siem/public/overview/components/overview_host_stats/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { OverviewHostData } from '../../../../graphql/types'; +import { OverviewHostData } from '../../../graphql/types'; export const mockData: { OverviewHost: OverviewHostData } = { OverviewHost: { diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_network/index.test.tsx b/x-pack/plugins/siem/public/overview/components/overview_network/index.test.tsx similarity index 84% rename from x-pack/plugins/siem/public/components/page/overview/overview_network/index.test.tsx rename to x-pack/plugins/siem/public/overview/components/overview_network/index.test.tsx index 151bb444cfe75c..e28681a3320f5e 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_network/index.test.tsx +++ b/x-pack/plugins/siem/public/overview/components/overview_network/index.test.tsx @@ -7,17 +7,21 @@ import { cloneDeep } from 'lodash/fp'; import { mount } from 'enzyme'; import React from 'react'; - -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../../../mock'; +import { MockedProvider } from 'react-apollo/test-utils'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; import { OverviewNetwork } from '.'; -import { createStore, State } from '../../../../store'; -import { overviewNetworkQuery } from '../../../../containers/overview/overview_network/index.gql_query'; -import { GetOverviewHostQuery } from '../../../../graphql/types'; -import { MockedProvider } from 'react-apollo/test-utils'; -import { wait } from '../../../../lib/helpers'; +import { createStore, State } from '../../../common/store'; +import { overviewNetworkQuery } from '../../containers/overview_network/index.gql_query'; +import { GetOverviewHostQuery } from '../../../graphql/types'; +import { wait } from '../../../common/lib/helpers'; -jest.mock('../../../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); const startDate = 1579553397080; const endDate = 1579639797080; @@ -79,11 +83,11 @@ const mockOpenTimelineQueryResults: MockedProvidedQuery[] = [ describe('OverviewNetwork', () => { const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { const myState = cloneDeep(state); - store = createStore(myState, apolloClientObservable); + store = createStore(myState, SUB_PLUGINS_REDUCER, apolloClientObservable); }); test('it renders the expected widget title', () => { diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_network/index.tsx b/x-pack/plugins/siem/public/overview/components/overview_network/index.tsx similarity index 84% rename from x-pack/plugins/siem/public/components/page/overview/overview_network/index.tsx rename to x-pack/plugins/siem/public/overview/components/overview_network/index.tsx index d649a0dd9e9237..cd70831fddfbab 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_network/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/overview_network/index.tsx @@ -10,21 +10,21 @@ import numeral from '@elastic/numeral'; import { FormattedMessage } from '@kbn/i18n/react'; import React, { useMemo } from 'react'; -import { DEFAULT_NUMBER_FORMAT } from '../../../../../common/constants'; -import { ESQuery } from '../../../../../common/typed_json'; -import { HeaderSection } from '../../../header_section'; -import { useUiSetting$ } from '../../../../lib/kibana'; -import { manageQuery } from '../../../page/manage_query'; +import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants'; +import { ESQuery } from '../../../../common/typed_json'; +import { HeaderSection } from '../../../common/components/header_section'; +import { useUiSetting$ } from '../../../common/lib/kibana'; +import { manageQuery } from '../../../common/components/page/manage_query'; import { ID as OverviewNetworkQueryId, OverviewNetworkQuery, -} from '../../../../containers/overview/overview_network'; -import { inputsModel } from '../../../../store/inputs'; +} from '../../containers/overview_network'; +import { inputsModel } from '../../../common/store/inputs'; import { getOverviewNetworkStats, OverviewNetworkStats } from '../overview_network_stats'; -import { getNetworkUrl } from '../../../link_to'; -import { InspectButtonContainer } from '../../../inspect'; -import { useGetUrlSearch } from '../../../navigation/use_get_url_search'; -import { navTabs } from '../../../../pages/home/home_navigations'; +import { getNetworkUrl } from '../../../common/components/link_to'; +import { InspectButtonContainer } from '../../../common/components/inspect'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../app/home/home_navigations'; export interface OverviewNetworkProps { startDate: number; diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_network_stats/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/page/overview/overview_network_stats/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx b/x-pack/plugins/siem/public/overview/components/overview_network_stats/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx rename to x-pack/plugins/siem/public/overview/components/overview_network_stats/index.test.tsx index cf1a7d20b73eca..bff6ee7d7469d6 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_network_stats/index.test.tsx +++ b/x-pack/plugins/siem/public/overview/components/overview_network_stats/index.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { OverviewNetworkStats } from '.'; import { mockData } from './mock'; -import { TestProviders } from '../../../../mock/test_providers'; +import { TestProviders } from '../../../common/mock/test_providers'; describe('Overview Network Stat Data', () => { describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_network_stats/index.tsx b/x-pack/plugins/siem/public/overview/components/overview_network_stats/index.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/page/overview/overview_network_stats/index.tsx rename to x-pack/plugins/siem/public/overview/components/overview_network_stats/index.tsx index ca947c29bc3822..709f1ffbe5cae5 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_network_stats/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/overview_network_stats/index.tsx @@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import React from 'react'; import styled from 'styled-components'; -import { OverviewNetworkData } from '../../../../graphql/types'; +import { OverviewNetworkData } from '../../../graphql/types'; import { FormattedStat, StatGroup } from '../types'; import { StatValue } from '../stat_value'; diff --git a/x-pack/plugins/siem/public/components/page/overview/overview_network_stats/mock.ts b/x-pack/plugins/siem/public/overview/components/overview_network_stats/mock.ts similarity index 89% rename from x-pack/plugins/siem/public/components/page/overview/overview_network_stats/mock.ts rename to x-pack/plugins/siem/public/overview/components/overview_network_stats/mock.ts index cc4c639f85deb8..f55d6a1577ccd8 100644 --- a/x-pack/plugins/siem/public/components/page/overview/overview_network_stats/mock.ts +++ b/x-pack/plugins/siem/public/overview/components/overview_network_stats/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { OverviewNetworkData } from '../../../../graphql/types'; +import { OverviewNetworkData } from '../../../graphql/types'; export const mockData: { OverviewNetwork: OverviewNetworkData } = { OverviewNetwork: { diff --git a/x-pack/plugins/siem/public/components/recent_cases/filters/index.tsx b/x-pack/plugins/siem/public/overview/components/recent_cases/filters/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/recent_cases/filters/index.tsx rename to x-pack/plugins/siem/public/overview/components/recent_cases/filters/index.tsx diff --git a/x-pack/plugins/siem/public/components/recent_cases/index.tsx b/x-pack/plugins/siem/public/overview/components/recent_cases/index.tsx similarity index 82% rename from x-pack/plugins/siem/public/components/recent_cases/index.tsx rename to x-pack/plugins/siem/public/overview/components/recent_cases/index.tsx index 07246c6c6ec885..03c1754f1b8d5a 100644 --- a/x-pack/plugins/siem/public/components/recent_cases/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/recent_cases/index.tsx @@ -7,13 +7,12 @@ import { EuiHorizontalRule, EuiLink, EuiText } from '@elastic/eui'; import React, { useEffect, useMemo, useRef } from 'react'; -import { FilterOptions, QueryParams } from '../../containers/case/types'; -import { DEFAULT_QUERY_PARAMS, useGetCases } from '../../containers/case/use_get_cases'; -import { getCaseUrl } from '../link_to/redirect_to_case'; -import { useGetUrlSearch } from '../navigation/use_get_url_search'; -import { LoadingPlaceholders } from '../page/overview/loading_placeholders'; -import { navTabs } from '../../pages/home/home_navigations'; - +import { FilterOptions, QueryParams } from '../../../cases/containers/types'; +import { DEFAULT_QUERY_PARAMS, useGetCases } from '../../../cases/containers/use_get_cases'; +import { getCaseUrl } from '../../../common/components/link_to/redirect_to_case'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../app/home/home_navigations'; +import { LoadingPlaceholders } from '../loading_placeholders'; import { NoCases } from './no_cases'; import { RecentCases } from './recent_cases'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/recent_cases/no_cases/index.tsx b/x-pack/plugins/siem/public/overview/components/recent_cases/no_cases/index.tsx similarity index 76% rename from x-pack/plugins/siem/public/components/recent_cases/no_cases/index.tsx rename to x-pack/plugins/siem/public/overview/components/recent_cases/no_cases/index.tsx index 9f0361311b7b6d..e29223ca07e65e 100644 --- a/x-pack/plugins/siem/public/components/recent_cases/no_cases/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/recent_cases/no_cases/index.tsx @@ -7,9 +7,9 @@ import { EuiLink } from '@elastic/eui'; import React, { useMemo } from 'react'; -import { getCreateCaseUrl } from '../../link_to/redirect_to_case'; -import { useGetUrlSearch } from '../../navigation/use_get_url_search'; -import { navTabs } from '../../../pages/home/home_navigations'; +import { getCreateCaseUrl } from '../../../../common/components/link_to/redirect_to_case'; +import { useGetUrlSearch } from '../../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../../app/home/home_navigations'; import * as i18n from '../translations'; diff --git a/x-pack/plugins/siem/public/components/recent_cases/recent_cases.tsx b/x-pack/plugins/siem/public/overview/components/recent_cases/recent_cases.tsx similarity index 82% rename from x-pack/plugins/siem/public/components/recent_cases/recent_cases.tsx rename to x-pack/plugins/siem/public/overview/components/recent_cases/recent_cases.tsx index eb17c75f4111be..9618ddb05716d0 100644 --- a/x-pack/plugins/siem/public/components/recent_cases/recent_cases.tsx +++ b/x-pack/plugins/siem/public/overview/components/recent_cases/recent_cases.tsx @@ -8,11 +8,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiSpacer, EuiText } from '@elastic import React from 'react'; import styled from 'styled-components'; -import { Case } from '../../containers/case/types'; -import { getCaseDetailsUrl } from '../link_to/redirect_to_case'; -import { Markdown } from '../markdown'; -import { useGetUrlSearch } from '../navigation/use_get_url_search'; -import { navTabs } from '../../pages/home/home_navigations'; +import { Case } from '../../../cases/containers/types'; +import { getCaseDetailsUrl } from '../../../common/components/link_to/redirect_to_case'; +import { Markdown } from '../../../common/components/markdown'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../app/home/home_navigations'; import { IconWithCount } from '../recent_timelines/counts'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/recent_cases/translations.ts b/x-pack/plugins/siem/public/overview/components/recent_cases/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/recent_cases/translations.ts rename to x-pack/plugins/siem/public/overview/components/recent_cases/translations.ts diff --git a/x-pack/plugins/siem/public/components/recent_cases/types.ts b/x-pack/plugins/siem/public/overview/components/recent_cases/types.ts similarity index 100% rename from x-pack/plugins/siem/public/components/recent_cases/types.ts rename to x-pack/plugins/siem/public/overview/components/recent_cases/types.ts diff --git a/x-pack/plugins/siem/public/components/recent_timelines/counts/index.tsx b/x-pack/plugins/siem/public/overview/components/recent_timelines/counts/index.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/recent_timelines/counts/index.tsx rename to x-pack/plugins/siem/public/overview/components/recent_timelines/counts/index.tsx index c80530b245cf35..bdb75f8800647b 100644 --- a/x-pack/plugins/siem/public/components/recent_timelines/counts/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/recent_timelines/counts/index.tsx @@ -8,8 +8,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText, EuiToolTip } from '@elasti import React from 'react'; import styled from 'styled-components'; -import { getPinnedEventCount, getNotesCount } from '../../open_timeline/helpers'; -import { OpenTimelineResult } from '../../open_timeline/types'; +import { + getPinnedEventCount, + getNotesCount, +} from '../../../../timelines/components/open_timeline/helpers'; +import { OpenTimelineResult } from '../../../../timelines/components/open_timeline/types'; import * as i18n from '../translations'; diff --git a/x-pack/plugins/siem/public/components/recent_timelines/filters/index.tsx b/x-pack/plugins/siem/public/overview/components/recent_timelines/filters/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/recent_timelines/filters/index.tsx rename to x-pack/plugins/siem/public/overview/components/recent_timelines/filters/index.tsx diff --git a/x-pack/plugins/siem/public/components/recent_timelines/header/index.tsx b/x-pack/plugins/siem/public/overview/components/recent_timelines/header/index.tsx similarity index 82% rename from x-pack/plugins/siem/public/components/recent_timelines/header/index.tsx rename to x-pack/plugins/siem/public/overview/components/recent_timelines/header/index.tsx index 89c7ae6f1eed96..07144840dae11c 100644 --- a/x-pack/plugins/siem/public/components/recent_timelines/header/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/recent_timelines/header/index.tsx @@ -7,8 +7,11 @@ import { EuiText, EuiLink } from '@elastic/eui'; import React, { useCallback } from 'react'; -import { isUntitled } from '../../open_timeline/helpers'; -import { OnOpenTimeline, OpenTimelineResult } from '../../open_timeline/types'; +import { isUntitled } from '../../../../timelines/components/open_timeline/helpers'; +import { + OnOpenTimeline, + OpenTimelineResult, +} from '../../../../timelines/components/open_timeline/types'; import * as i18n from '../translations'; export const RecentTimelineHeader = React.memo<{ diff --git a/x-pack/plugins/siem/public/components/recent_timelines/index.tsx b/x-pack/plugins/siem/public/overview/components/recent_timelines/index.tsx similarity index 81% rename from x-pack/plugins/siem/public/components/recent_timelines/index.tsx rename to x-pack/plugins/siem/public/overview/components/recent_timelines/index.tsx index d3532d9fd1025f..75b157a282eeb9 100644 --- a/x-pack/plugins/siem/public/components/recent_timelines/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/recent_timelines/index.tsx @@ -10,21 +10,23 @@ import React, { useCallback, useMemo, useEffect } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import { Dispatch } from 'redux'; -import { TimelineType } from '../../../common/types/timeline'; - -import { useGetAllTimeline } from '../../containers/timeline/all'; -import { SortFieldTimeline, Direction } from '../../graphql/types'; -import { queryTimelineById, dispatchUpdateTimeline } from '../open_timeline/helpers'; -import { OnOpenTimeline } from '../open_timeline/types'; -import { LoadingPlaceholders } from '../page/overview/loading_placeholders'; -import { updateIsLoading as dispatchUpdateIsLoading } from '../../store/timeline/actions'; +import { TimelineType } from '../../../../common/types/timeline'; +import { useGetAllTimeline } from '../../../timelines/containers/all'; +import { SortFieldTimeline, Direction } from '../../../graphql/types'; +import { + queryTimelineById, + dispatchUpdateTimeline, +} from '../../../timelines/components/open_timeline/helpers'; +import { OnOpenTimeline } from '../../../timelines/components/open_timeline/types'; +import { updateIsLoading as dispatchUpdateIsLoading } from '../../../timelines/store/timeline/actions'; import { RecentTimelines } from './recent_timelines'; import * as i18n from './translations'; import { FilterMode } from './types'; -import { useGetUrlSearch } from '../navigation/use_get_url_search'; -import { navTabs } from '../../pages/home/home_navigations'; -import { getTimelinesUrl } from '../link_to/redirect_to_timelines'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; +import { navTabs } from '../../../app/home/home_navigations'; +import { getTimelinesUrl } from '../../../common/components/link_to/redirect_to_timelines'; +import { LoadingPlaceholders } from '../loading_placeholders'; interface OwnProps { apolloClient: ApolloClient<{}>; diff --git a/x-pack/plugins/siem/public/components/recent_timelines/recent_timelines.tsx b/x-pack/plugins/siem/public/overview/components/recent_timelines/recent_timelines.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/recent_timelines/recent_timelines.tsx rename to x-pack/plugins/siem/public/overview/components/recent_timelines/recent_timelines.tsx index dbcd3fe721ea36..ba6fcad2a03e9b 100644 --- a/x-pack/plugins/siem/public/components/recent_timelines/recent_timelines.tsx +++ b/x-pack/plugins/siem/public/overview/components/recent_timelines/recent_timelines.tsx @@ -15,8 +15,11 @@ import { import React from 'react'; import { RecentTimelineHeader } from './header'; -import { OnOpenTimeline, OpenTimelineResult } from '../open_timeline/types'; -import { WithHoverActions } from '../with_hover_actions'; +import { + OnOpenTimeline, + OpenTimelineResult, +} from '../../../timelines/components/open_timeline/types'; +import { WithHoverActions } from '../../../common/components/with_hover_actions'; import { RecentTimelineCounts } from './counts'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/recent_timelines/translations.ts b/x-pack/plugins/siem/public/overview/components/recent_timelines/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/recent_timelines/translations.ts rename to x-pack/plugins/siem/public/overview/components/recent_timelines/translations.ts diff --git a/x-pack/plugins/siem/public/components/recent_timelines/types.ts b/x-pack/plugins/siem/public/overview/components/recent_timelines/types.ts similarity index 100% rename from x-pack/plugins/siem/public/components/recent_timelines/types.ts rename to x-pack/plugins/siem/public/overview/components/recent_timelines/types.ts diff --git a/x-pack/plugins/siem/public/pages/overview/sidebar/index.tsx b/x-pack/plugins/siem/public/overview/components/sidebar/index.tsx similarity index 82% rename from x-pack/plugins/siem/public/pages/overview/sidebar/index.tsx rename to x-pack/plugins/siem/public/overview/components/sidebar/index.tsx index 3797eae2bb8536..773750f3d0cc57 100644 --- a/x-pack/plugins/siem/public/pages/overview/sidebar/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/sidebar/index.tsx @@ -6,8 +6,8 @@ import React, { useState } from 'react'; -import { FilterMode as RecentTimelinesFilterMode } from '../../../components/recent_timelines/types'; -import { FilterMode as RecentCasesFilterMode } from '../../../components/recent_cases/types'; +import { FilterMode as RecentTimelinesFilterMode } from '../recent_timelines/types'; +import { FilterMode as RecentCasesFilterMode } from '../recent_cases/types'; import { Sidebar } from './sidebar'; diff --git a/x-pack/plugins/siem/public/pages/overview/sidebar/sidebar.tsx b/x-pack/plugins/siem/public/overview/components/sidebar/sidebar.tsx similarity index 78% rename from x-pack/plugins/siem/public/pages/overview/sidebar/sidebar.tsx rename to x-pack/plugins/siem/public/overview/components/sidebar/sidebar.tsx index c972fd83cc88f8..81de0ed5035956 100644 --- a/x-pack/plugins/siem/public/pages/overview/sidebar/sidebar.tsx +++ b/x-pack/plugins/siem/public/overview/components/sidebar/sidebar.tsx @@ -9,19 +9,19 @@ import React, { useMemo } from 'react'; import styled from 'styled-components'; import { ENABLE_NEWS_FEED_SETTING, NEWS_FEED_URL_SETTING } from '../../../../common/constants'; -import { Filters as RecentCasesFilters } from '../../../components/recent_cases/filters'; -import { Filters as RecentTimelinesFilters } from '../../../components/recent_timelines/filters'; -import { StatefulRecentCases } from '../../../components/recent_cases'; -import { StatefulRecentTimelines } from '../../../components/recent_timelines'; -import { StatefulNewsFeed } from '../../../components/news_feed'; -import { FilterMode as RecentTimelinesFilterMode } from '../../../components/recent_timelines/types'; -import { FilterMode as RecentCasesFilterMode } from '../../../components/recent_cases/types'; -import { DEFAULT_FILTER_OPTIONS } from '../../../containers/case/use_get_cases'; -import { SidebarHeader } from '../../../components/sidebar_header'; -import { useCurrentUser } from '../../../lib/kibana'; -import { useApolloClient } from '../../../utils/apollo_context'; +import { Filters as RecentCasesFilters } from '../recent_cases/filters'; +import { Filters as RecentTimelinesFilters } from '../recent_timelines/filters'; +import { StatefulRecentCases } from '../recent_cases'; +import { StatefulRecentTimelines } from '../recent_timelines'; +import { StatefulNewsFeed } from '../../../common/components/news_feed'; +import { FilterMode as RecentTimelinesFilterMode } from '../recent_timelines/types'; +import { FilterMode as RecentCasesFilterMode } from '../recent_cases/types'; +import { DEFAULT_FILTER_OPTIONS } from '../../../cases/containers/use_get_cases'; +import { SidebarHeader } from '../../../common/components/sidebar_header'; +import { useCurrentUser } from '../../../common/lib/kibana'; +import { useApolloClient } from '../../../common/utils/apollo_context'; -import * as i18n from '../translations'; +import * as i18n from '../../pages/translations'; const SidebarFlexGroup = styled(EuiFlexGroup)` width: 305px; diff --git a/x-pack/plugins/siem/public/pages/overview/signals_by_category/index.tsx b/x-pack/plugins/siem/public/overview/components/signals_by_category/index.tsx similarity index 80% rename from x-pack/plugins/siem/public/pages/overview/signals_by_category/index.tsx rename to x-pack/plugins/siem/public/overview/components/signals_by_category/index.tsx index e5863effa906d4..def7342ff76b2f 100644 --- a/x-pack/plugins/siem/public/pages/overview/signals_by_category/index.tsx +++ b/x-pack/plugins/siem/public/overview/components/signals_by_category/index.tsx @@ -6,15 +6,15 @@ import React, { useCallback } from 'react'; -import { SignalsHistogramPanel } from '../../detection_engine/components/signals_histogram_panel'; -import { signalsHistogramOptions } from '../../detection_engine/components/signals_histogram_panel/config'; -import { useSignalIndex } from '../../../containers/detection_engine/signals/use_signal_index'; -import { SetAbsoluteRangeDatePicker } from '../../network/types'; +import { SignalsHistogramPanel } from '../../../alerts/components/signals_histogram_panel'; +import { signalsHistogramOptions } from '../../../alerts/components/signals_histogram_panel/config'; +import { useSignalIndex } from '../../../alerts/containers/detection_engine/signals/use_signal_index'; +import { SetAbsoluteRangeDatePicker } from '../../../network/pages/types'; import { Filter, IIndexPattern, Query } from '../../../../../../../src/plugins/data/public'; -import { inputsModel } from '../../../store'; -import { InputsModelId } from '../../../store/inputs/constants'; -import * as i18n from '../translations'; -import { UpdateDateRange } from '../../../components/charts/common'; +import { inputsModel } from '../../../common/store'; +import { InputsModelId } from '../../../common/store/inputs/constants'; +import * as i18n from '../../pages/translations'; +import { UpdateDateRange } from '../../../common/components/charts/common'; const DEFAULT_QUERY: Query = { query: '', language: 'kuery' }; const DEFAULT_STACK_BY = 'signal.rule.threat.tactic.name'; diff --git a/x-pack/plugins/siem/public/components/page/overview/stat_value.tsx b/x-pack/plugins/siem/public/overview/components/stat_value.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/page/overview/stat_value.tsx rename to x-pack/plugins/siem/public/overview/components/stat_value.tsx index 7615001eec9da3..dd50a9599e142f 100644 --- a/x-pack/plugins/siem/public/components/page/overview/stat_value.tsx +++ b/x-pack/plugins/siem/public/overview/components/stat_value.tsx @@ -9,8 +9,8 @@ import numeral from '@elastic/numeral'; import React, { useEffect, useState } from 'react'; import styled from 'styled-components'; -import { DEFAULT_NUMBER_FORMAT } from '../../../../common/constants'; -import { useUiSetting$ } from '../../../lib/kibana'; +import { DEFAULT_NUMBER_FORMAT } from '../../../common/constants'; +import { useUiSetting$ } from '../../common/lib/kibana'; const ProgressContainer = styled.div` margin-left: 8px; diff --git a/x-pack/plugins/siem/public/components/page/overview/types.ts b/x-pack/plugins/siem/public/overview/components/types.ts similarity index 100% rename from x-pack/plugins/siem/public/components/page/overview/types.ts rename to x-pack/plugins/siem/public/overview/components/types.ts diff --git a/x-pack/plugins/siem/public/containers/overview/overview_host/index.gql_query.ts b/x-pack/plugins/siem/public/overview/containers/overview_host/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/overview/overview_host/index.gql_query.ts rename to x-pack/plugins/siem/public/overview/containers/overview_host/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/overview/overview_host/index.tsx b/x-pack/plugins/siem/public/overview/containers/overview_host/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/containers/overview/overview_host/index.tsx rename to x-pack/plugins/siem/public/overview/containers/overview_host/index.tsx index 2dd9ccf24d802f..89761e104d70f2 100644 --- a/x-pack/plugins/siem/public/containers/overview/overview_host/index.tsx +++ b/x-pack/plugins/siem/public/overview/containers/overview_host/index.tsx @@ -11,11 +11,11 @@ import { connect, ConnectedProps } from 'react-redux'; import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { GetOverviewHostQuery, OverviewHostData } from '../../../graphql/types'; -import { useUiSetting } from '../../../lib/kibana'; -import { inputsModel, inputsSelectors } from '../../../store/inputs'; -import { State } from '../../../store'; -import { createFilter, getDefaultFetchPolicy } from '../../helpers'; -import { QueryTemplateProps } from '../../query_template'; +import { useUiSetting } from '../../../common/lib/kibana'; +import { inputsModel, inputsSelectors } from '../../../common/store/inputs'; +import { State } from '../../../common/store'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { QueryTemplateProps } from '../../../common/containers/query_template'; import { overviewHostQuery } from './index.gql_query'; diff --git a/x-pack/plugins/siem/public/containers/overview/overview_network/index.gql_query.ts b/x-pack/plugins/siem/public/overview/containers/overview_network/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/overview/overview_network/index.gql_query.ts rename to x-pack/plugins/siem/public/overview/containers/overview_network/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/overview/overview_network/index.tsx b/x-pack/plugins/siem/public/overview/containers/overview_network/index.tsx similarity index 88% rename from x-pack/plugins/siem/public/containers/overview/overview_network/index.tsx rename to x-pack/plugins/siem/public/overview/containers/overview_network/index.tsx index d0acd41c224a5f..86242adf3f47fa 100644 --- a/x-pack/plugins/siem/public/containers/overview/overview_network/index.tsx +++ b/x-pack/plugins/siem/public/overview/containers/overview_network/index.tsx @@ -11,11 +11,11 @@ import { connect, ConnectedProps } from 'react-redux'; import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { GetOverviewNetworkQuery, OverviewNetworkData } from '../../../graphql/types'; -import { useUiSetting } from '../../../lib/kibana'; -import { State } from '../../../store'; -import { inputsModel, inputsSelectors } from '../../../store/inputs'; -import { createFilter, getDefaultFetchPolicy } from '../../helpers'; -import { QueryTemplateProps } from '../../query_template'; +import { useUiSetting } from '../../../common/lib/kibana'; +import { State } from '../../../common/store'; +import { inputsModel, inputsSelectors } from '../../../common/store/inputs'; +import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers'; +import { QueryTemplateProps } from '../../../common/containers/query_template'; import { overviewNetworkQuery } from './index.gql_query'; diff --git a/x-pack/plugins/siem/public/overview/index.ts b/x-pack/plugins/siem/public/overview/index.ts new file mode 100644 index 00000000000000..bdf855b3851c82 --- /dev/null +++ b/x-pack/plugins/siem/public/overview/index.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SecuritySubPlugin } from '../app/types'; +import { getOverviewRoutes } from './routes'; + +export class Overview { + public setup() {} + + public start(): SecuritySubPlugin { + return { + routes: getOverviewRoutes(), + }; + } +} diff --git a/x-pack/plugins/siem/public/pages/overview/index.tsx b/x-pack/plugins/siem/public/overview/pages/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/pages/overview/index.tsx rename to x-pack/plugins/siem/public/overview/pages/index.tsx diff --git a/x-pack/plugins/siem/public/pages/overview/overview.test.tsx b/x-pack/plugins/siem/public/overview/pages/overview.test.tsx similarity index 88% rename from x-pack/plugins/siem/public/pages/overview/overview.test.tsx rename to x-pack/plugins/siem/public/overview/pages/overview.test.tsx index c129258fa2e87b..36174bdb94a3f1 100644 --- a/x-pack/plugins/siem/public/pages/overview/overview.test.tsx +++ b/x-pack/plugins/siem/public/overview/pages/overview.test.tsx @@ -10,19 +10,19 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { MemoryRouter } from 'react-router-dom'; -import '../../mock/match_media'; -import { TestProviders } from '../../mock'; -import { mocksSource } from '../../containers/source/mock'; +import '../../common/mock/match_media'; +import { TestProviders } from '../../common/mock'; +import { mocksSource } from '../../common/containers/source/mock'; import { Overview } from './index'; -jest.mock('../../lib/kibana'); +jest.mock('../../common/lib/kibana'); // Test will fail because we will to need to mock some core services to make the test work // For now let's forget about SiemSearchBar and QueryBar -jest.mock('../../components/search_bar', () => ({ +jest.mock('../../common/components/search_bar', () => ({ SiemSearchBar: () => null, })); -jest.mock('../../components/query_bar', () => ({ +jest.mock('../../common/components/query_bar', () => ({ QueryBar: () => null, })); diff --git a/x-pack/plugins/siem/public/pages/overview/overview.tsx b/x-pack/plugins/siem/public/overview/pages/overview.tsx similarity index 82% rename from x-pack/plugins/siem/public/pages/overview/overview.tsx rename to x-pack/plugins/siem/public/overview/pages/overview.tsx index 82f44447289022..57a82f6f254f27 100644 --- a/x-pack/plugins/siem/public/pages/overview/overview.tsx +++ b/x-pack/plugins/siem/public/overview/pages/overview.tsx @@ -11,20 +11,23 @@ import { StickyContainer } from 'react-sticky'; import { Query, Filter } from 'src/plugins/data/public'; import styled from 'styled-components'; -import { AlertsByCategory } from './alerts_by_category'; -import { FiltersGlobal } from '../../components/filters_global'; -import { SiemSearchBar } from '../../components/search_bar'; -import { WrapperPage } from '../../components/wrapper_page'; -import { GlobalTime } from '../../containers/global_time'; -import { WithSource, indicesExistOrDataTemporarilyUnavailable } from '../../containers/source'; -import { EventsByDataset } from './events_by_dataset'; -import { EventCounts } from './event_counts'; -import { OverviewEmpty } from './overview_empty'; -import { StatefulSidebar } from './sidebar'; -import { SignalsByCategory } from './signals_by_category'; -import { inputsSelectors, State } from '../../store'; -import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../store/inputs/actions'; -import { SpyRoute } from '../../utils/route/spy_routes'; +import { AlertsByCategory } from '../components/alerts_by_category'; +import { FiltersGlobal } from '../../common/components/filters_global'; +import { SiemSearchBar } from '../../common/components/search_bar'; +import { WrapperPage } from '../../common/components/wrapper_page'; +import { GlobalTime } from '../../common/containers/global_time'; +import { + WithSource, + indicesExistOrDataTemporarilyUnavailable, +} from '../../common/containers/source'; +import { EventsByDataset } from '../components/events_by_dataset'; +import { EventCounts } from '../components/event_counts'; +import { OverviewEmpty } from '../components/overview_empty'; +import { StatefulSidebar } from '../components/sidebar'; +import { SignalsByCategory } from '../components/signals_by_category'; +import { inputsSelectors, State } from '../../common/store'; +import { setAbsoluteRangeDatePicker as dispatchSetAbsoluteRangeDatePicker } from '../../common/store/inputs/actions'; +import { SpyRoute } from '../../common/utils/route/spy_routes'; const DEFAULT_QUERY: Query = { query: '', language: 'kuery' }; const NO_FILTERS: Filter[] = []; diff --git a/x-pack/plugins/siem/public/pages/overview/summary.tsx b/x-pack/plugins/siem/public/overview/pages/summary.tsx similarity index 98% rename from x-pack/plugins/siem/public/pages/overview/summary.tsx rename to x-pack/plugins/siem/public/overview/pages/summary.tsx index da16cb28c61711..1e08a2cdca8e75 100644 --- a/x-pack/plugins/siem/public/pages/overview/summary.tsx +++ b/x-pack/plugins/siem/public/overview/pages/summary.tsx @@ -8,7 +8,7 @@ import React from 'react'; import { EuiFlexItem, EuiLink, EuiText } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; -import { useKibana } from '../../lib/kibana'; +import { useKibana } from '../../common/lib/kibana'; export const Summary = React.memo(() => { const docLinks = useKibana().services.docLinks; diff --git a/x-pack/plugins/siem/public/pages/overview/translations.ts b/x-pack/plugins/siem/public/overview/pages/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/overview/translations.ts rename to x-pack/plugins/siem/public/overview/pages/translations.ts diff --git a/x-pack/plugins/siem/public/overview/routes.tsx b/x-pack/plugins/siem/public/overview/routes.tsx new file mode 100644 index 00000000000000..fc41227b27c04f --- /dev/null +++ b/x-pack/plugins/siem/public/overview/routes.tsx @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Route } from 'react-router-dom'; + +import { Overview } from './pages'; +import { SiemPageName } from '../app/types'; + +export const getOverviewRoutes = () => [ + } />, +]; diff --git a/x-pack/plugins/siem/public/pages/home/types.ts b/x-pack/plugins/siem/public/pages/home/types.ts deleted file mode 100644 index 6445ac91d9e131..00000000000000 --- a/x-pack/plugins/siem/public/pages/home/types.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { NavTab } from '../../components/navigation/types'; - -export enum SiemPageName { - overview = 'overview', - hosts = 'hosts', - network = 'network', - detections = 'detections', - timelines = 'timelines', - case = 'case', -} - -export type SiemNavTabKey = - | SiemPageName.overview - | SiemPageName.hosts - | SiemPageName.network - | SiemPageName.detections - | SiemPageName.timelines - | SiemPageName.case; - -export type SiemNavTab = Record; diff --git a/x-pack/plugins/siem/public/plugin.tsx b/x-pack/plugins/siem/public/plugin.tsx index f4310e1b073ab3..cc46025ddc4a6a 100644 --- a/x-pack/plugins/siem/public/plugin.tsx +++ b/x-pack/plugins/siem/public/plugin.tsx @@ -30,9 +30,9 @@ import { } from '../../triggers_actions_ui/public'; import { SecurityPluginSetup } from '../../security/public'; import { APP_ID, APP_NAME, APP_PATH, APP_ICON } from '../common/constants'; -import { initTelemetry } from './lib/telemetry'; -import { KibanaServices } from './lib/kibana/services'; -import { serviceNowActionType, jiraActionType } from './lib/connectors'; +import { initTelemetry } from './common/lib/telemetry'; +import { KibanaServices } from './common/lib/kibana/services'; +import { serviceNowActionType, jiraActionType } from './common/lib/connectors'; export interface SetupPlugins { home: HomePublicPluginSetup; @@ -87,6 +87,53 @@ export class Plugin implements IPlugin { + const [coreStart, startPlugins] = await core.getStartServices(); + const { renderApp } = await import('./app'); + const services = { + ...coreStart, + ...startPlugins, + security: plugins.security, + } as StartServices; + + const alertsSubPlugin = new (await import('./alerts')).Alerts(); + const casesSubPlugin = new (await import('./cases')).Cases(); + const hostsSubPlugin = new (await import('./hosts')).Hosts(); + const networkSubPlugin = new (await import('./network')).Network(); + const overviewSubPlugin = new (await import('./overview')).Overview(); + const timelinesSubPlugin = new (await import('./timelines')).Timelines(); + + const alertsStart = alertsSubPlugin.start(); + const casesStart = casesSubPlugin.start(); + const hostsStart = hostsSubPlugin.start(); + const networkStart = networkSubPlugin.start(); + const overviewStart = overviewSubPlugin.start(); + const timelinesStart = timelinesSubPlugin.start(); + + return renderApp(services, params, { + routes: [ + ...alertsStart.routes, + ...casesStart.routes, + ...hostsStart.routes, + ...networkStart.routes, + ...overviewStart.routes, + ...timelinesStart.routes, + ], + store: { + initialState: { + ...hostsStart.store.initialState, + ...networkStart.store.initialState, + ...timelinesStart.store.initialState, + }, + reducer: { + ...hostsStart.store.reducer, + ...networkStart.store.reducer, + ...timelinesStart.store.reducer, + }, + }, + }); + }; + core.application.register({ id: APP_ID, title: APP_NAME, @@ -94,15 +141,7 @@ export class Plugin implements IPlugin ({ - ...initialState, - inputs: createInitialInputsState(), -}); - -export const reducer = combineReducers({ - app: appReducer, - dragAndDrop: dragAndDropReducer, - hosts: hostsReducer, - inputs: inputsReducer, - network: networkReducer, - timeline: timelineReducer, -}); diff --git a/x-pack/plugins/siem/public/components/certificate_fingerprint/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/certificate_fingerprint/index.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/certificate_fingerprint/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/certificate_fingerprint/index.test.tsx index 9cd0af062c54a6..16d4d3b6c7cbae 100644 --- a/x-pack/plugins/siem/public/components/certificate_fingerprint/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/certificate_fingerprint/index.test.tsx @@ -6,8 +6,8 @@ import React from 'react'; -import { TestProviders } from '../../mock'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { TestProviders } from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { CertificateFingerprint } from '.'; diff --git a/x-pack/plugins/siem/public/components/certificate_fingerprint/index.tsx b/x-pack/plugins/siem/public/timelines/components/certificate_fingerprint/index.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/certificate_fingerprint/index.tsx rename to x-pack/plugins/siem/public/timelines/components/certificate_fingerprint/index.tsx index 181d92dce06f99..dc3b6ea61b9c3c 100644 --- a/x-pack/plugins/siem/public/components/certificate_fingerprint/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/certificate_fingerprint/index.tsx @@ -8,9 +8,9 @@ import { EuiText } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { DraggableBadge } from '../draggables'; -import { ExternalLinkIcon } from '../external_link_icon'; -import { CertificateFingerprintLink } from '../links'; +import { DraggableBadge } from '../../../common/components/draggables'; +import { ExternalLinkIcon } from '../../../common/components/external_link_icon'; +import { CertificateFingerprintLink } from '../../../common/components/links'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/certificate_fingerprint/translations.ts b/x-pack/plugins/siem/public/timelines/components/certificate_fingerprint/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/certificate_fingerprint/translations.ts rename to x-pack/plugins/siem/public/timelines/components/certificate_fingerprint/translations.ts diff --git a/x-pack/plugins/siem/public/components/duration/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/duration/index.test.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/duration/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/duration/index.test.tsx index 0dbc60ad9ae523..8063921668c90f 100644 --- a/x-pack/plugins/siem/public/components/duration/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/duration/index.test.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import { TestProviders } from '../../mock'; +import { TestProviders } from '../../../common/mock'; import { ONE_MILLISECOND_AS_NANOSECONDS } from '../formatted_duration/helpers'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { Duration } from '.'; diff --git a/x-pack/plugins/siem/public/components/duration/index.tsx b/x-pack/plugins/siem/public/timelines/components/duration/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/duration/index.tsx rename to x-pack/plugins/siem/public/timelines/components/duration/index.tsx index 76712b789ffbe5..1106ee63a03cba 100644 --- a/x-pack/plugins/siem/public/components/duration/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/duration/index.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DefaultDraggable } from '../draggables'; +import { DefaultDraggable } from '../../../common/components/draggables'; import { FormattedDuration } from '../formatted_duration'; export const EVENT_DURATION_FIELD_NAME = 'event.duration'; diff --git a/x-pack/plugins/siem/public/components/edit_data_provider/helpers.test.tsx b/x-pack/plugins/siem/public/timelines/components/edit_data_provider/helpers.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/edit_data_provider/helpers.test.tsx rename to x-pack/plugins/siem/public/timelines/components/edit_data_provider/helpers.test.tsx index 74430873064280..87388960dc5d85 100644 --- a/x-pack/plugins/siem/public/components/edit_data_provider/helpers.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/edit_data_provider/helpers.test.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { mockBrowserFields } from '../../containers/source/mock'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; import { EXISTS_OPERATOR, IS_OPERATOR } from '../timeline/data_providers/data_provider'; import { diff --git a/x-pack/plugins/siem/public/components/edit_data_provider/helpers.tsx b/x-pack/plugins/siem/public/timelines/components/edit_data_provider/helpers.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/edit_data_provider/helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/edit_data_provider/helpers.tsx index e6afc86a7ee678..03eb4f9bb515e3 100644 --- a/x-pack/plugins/siem/public/components/edit_data_provider/helpers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/edit_data_provider/helpers.tsx @@ -6,7 +6,7 @@ import { findIndex } from 'lodash/fp'; import { EuiComboBoxOptionOption } from '@elastic/eui'; -import { BrowserField, BrowserFields, getAllFieldsByName } from '../../containers/source'; +import { BrowserField, BrowserFields, getAllFieldsByName } from '../../../common/containers/source'; import { QueryOperator, EXISTS_OPERATOR, diff --git a/x-pack/plugins/siem/public/components/edit_data_provider/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/edit_data_provider/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/edit_data_provider/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/edit_data_provider/index.test.tsx index 1786905a4bb48a..035d1bb59796e7 100644 --- a/x-pack/plugins/siem/public/components/edit_data_provider/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/edit_data_provider/index.test.tsx @@ -7,8 +7,8 @@ import { mount } from 'enzyme'; import React from 'react'; -import { mockBrowserFields } from '../../containers/source/mock'; -import { TestProviders } from '../../mock'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; +import { TestProviders } from '../../../common/mock'; import { IS_OPERATOR, EXISTS_OPERATOR } from '../timeline/data_providers/data_provider'; import { StatefulEditDataProvider } from '.'; diff --git a/x-pack/plugins/siem/public/components/edit_data_provider/index.tsx b/x-pack/plugins/siem/public/timelines/components/edit_data_provider/index.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/edit_data_provider/index.tsx rename to x-pack/plugins/siem/public/timelines/components/edit_data_provider/index.tsx index 5ecc96187532d4..95f3ec3b316493 100644 --- a/x-pack/plugins/siem/public/components/edit_data_provider/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/edit_data_provider/index.tsx @@ -20,7 +20,7 @@ import { import React, { useEffect, useState, useCallback } from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../containers/source'; +import { BrowserFields } from '../../../common/containers/source'; import { OnDataProviderEdited } from '../timeline/events'; import { QueryOperator } from '../timeline/data_providers/data_provider'; diff --git a/x-pack/plugins/siem/public/components/edit_data_provider/translations.ts b/x-pack/plugins/siem/public/timelines/components/edit_data_provider/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/edit_data_provider/translations.ts rename to x-pack/plugins/siem/public/timelines/components/edit_data_provider/translations.ts diff --git a/x-pack/plugins/siem/public/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/field_renderers/__snapshots__/field_renderers.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/field_renderers/field_renderers.test.tsx b/x-pack/plugins/siem/public/timelines/components/field_renderers/field_renderers.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/field_renderers/field_renderers.test.tsx rename to x-pack/plugins/siem/public/timelines/components/field_renderers/field_renderers.test.tsx index 88d03d8db67611..b853a978c15e2d 100644 --- a/x-pack/plugins/siem/public/components/field_renderers/field_renderers.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/field_renderers/field_renderers.test.tsx @@ -7,9 +7,9 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { FlowTarget, GetIpOverviewQuery, HostEcsFields } from '../../graphql/types'; -import { TestProviders } from '../../mock'; -import { getEmptyValue } from '../empty_value'; +import { FlowTarget, GetIpOverviewQuery, HostEcsFields } from '../../../graphql/types'; +import { TestProviders } from '../../../common/mock'; +import { getEmptyValue } from '../../../common/components/empty_value'; import { autonomousSystemRenderer, @@ -22,8 +22,8 @@ import { DEFAULT_MORE_MAX_HEIGHT, MoreContainer, } from './field_renderers'; -import { mockData } from '../page/network/ip_overview/mock'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { mockData } from '../../../network/components/ip_overview/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; type AutonomousSystem = GetIpOverviewQuery.AutonomousSystem; diff --git a/x-pack/plugins/siem/public/components/field_renderers/field_renderers.tsx b/x-pack/plugins/siem/public/timelines/components/field_renderers/field_renderers.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/field_renderers/field_renderers.tsx rename to x-pack/plugins/siem/public/timelines/components/field_renderers/field_renderers.tsx index 222eef515958c4..1d53299c0975e9 100644 --- a/x-pack/plugins/siem/public/components/field_renderers/field_renderers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/field_renderers/field_renderers.tsx @@ -10,14 +10,24 @@ import { getOr } from 'lodash/fp'; import React, { Fragment, useState } from 'react'; import styled from 'styled-components'; -import { AutonomousSystem, FlowTarget, HostEcsFields, IpOverviewData } from '../../graphql/types'; -import { escapeDataProviderId } from '../drag_and_drop/helpers'; -import { DefaultDraggable } from '../draggables'; -import { getEmptyTagValue } from '../empty_value'; -import { FormattedRelativePreferenceDate } from '../formatted_date'; -import { HostDetailsLink, ReputationLink, WhoIsLink, ReputationLinkSetting } from '../links'; -import { Spacer } from '../page'; -import * as i18n from '../page/network/ip_overview/translations'; +import { + AutonomousSystem, + FlowTarget, + HostEcsFields, + IpOverviewData, +} from '../../../graphql/types'; +import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers'; +import { DefaultDraggable } from '../../../common/components/draggables'; +import { getEmptyTagValue } from '../../../common/components/empty_value'; +import { FormattedRelativePreferenceDate } from '../../../common/components/formatted_date'; +import { + HostDetailsLink, + ReputationLink, + WhoIsLink, + ReputationLinkSetting, +} from '../../../common/components/links'; +import { Spacer } from '../../../common/components/page'; +import * as i18n from '../../../network/components/ip_overview/translations'; const DraggableContainerFlexGroup = styled(EuiFlexGroup)` flex-grow: unset; diff --git a/x-pack/plugins/siem/public/components/fields_browser/categories_pane.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/categories_pane.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/fields_browser/categories_pane.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/categories_pane.test.tsx index 361a0789135e41..9a1f9a9d073577 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/categories_pane.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/categories_pane.test.tsx @@ -9,7 +9,7 @@ import React from 'react'; import { ThemeProvider } from 'styled-components'; import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json'; -import { mockBrowserFields } from '../../containers/source/mock'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; import { CATEGORY_PANE_WIDTH } from './helpers'; import { CategoriesPane } from './categories_pane'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/categories_pane.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/categories_pane.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/fields_browser/categories_pane.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/categories_pane.tsx index d6972625821cf3..93407e43739105 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/categories_pane.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/categories_pane.tsx @@ -8,7 +8,7 @@ import { EuiInMemoryTable, EuiTitle } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../containers/source'; +import { BrowserFields } from '../../../common/containers/source'; import { FieldBrowserProps } from './types'; import { getCategoryColumns } from './category_columns'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/category.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/category.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/fields_browser/category.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/category.test.tsx index 38eaf43977fa21..177ce5648e79b1 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/category.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/category.test.tsx @@ -6,13 +6,13 @@ import React from 'react'; -import { mockBrowserFields } from '../../containers/source/mock'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; import { Category } from './category'; import { getFieldItems } from './field_items'; import { FIELDS_PANE_WIDTH } from './helpers'; -import { TestProviders } from '../../mock'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { TestProviders } from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/category.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/category.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/fields_browser/category.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/category.tsx index 9d2a7da9b2d00f..fc916930394494 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/category.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/category.tsx @@ -8,7 +8,7 @@ import { EuiInMemoryTable } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../containers/source'; +import { BrowserFields } from '../../../common/containers/source'; import { CategoryTitle } from './category_title'; import { FieldItem, getFieldColumns } from './field_items'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/category_columns.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/category_columns.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/fields_browser/category_columns.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/category_columns.test.tsx index e116209ba5d6a1..ec2156bb609fd6 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/category_columns.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/category_columns.test.tsx @@ -7,7 +7,7 @@ import { mount } from 'enzyme'; import React from 'react'; -import { mockBrowserFields } from '../../containers/source/mock'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; import { CATEGORY_PANE_WIDTH, getFieldCount } from './helpers'; import { CategoriesPane } from './categories_pane'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/category_columns.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/category_columns.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/fields_browser/category_columns.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/category_columns.tsx index 7133e9b848c5ca..2e952dc24dbd82 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/category_columns.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/category_columns.tsx @@ -10,12 +10,12 @@ import { EuiIcon, EuiFlexGroup, EuiFlexItem, EuiLink, EuiText, EuiToolTip } from import React, { useContext } from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../containers/source'; -import { getColumnsWithTimestamp } from '../event_details/helpers'; -import { CountBadge } from '../page'; +import { BrowserFields } from '../../../common/containers/source'; +import { getColumnsWithTimestamp } from '../../../common/components/event_details/helpers'; +import { CountBadge } from '../../../common/components/page'; import { OnUpdateColumns } from '../timeline/events'; import { TimelineContext } from '../timeline/timeline_context'; -import { WithHoverActions } from '../with_hover_actions'; +import { WithHoverActions } from '../../../common/components/with_hover_actions'; import { LoadingSpinner, getCategoryPaneCategoryClassName, getFieldCount } from './helpers'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/category_title.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/category_title.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/fields_browser/category_title.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/category_title.test.tsx index 792e0342a6d592..8ad9cea9b29414 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/category_title.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/category_title.test.tsx @@ -7,7 +7,7 @@ import { mount } from 'enzyme'; import React from 'react'; -import { mockBrowserFields } from '../../containers/source/mock'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; import { CategoryTitle } from './category_title'; import { getFieldCount } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/category_title.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/category_title.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/fields_browser/category_title.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/category_title.tsx index cd14cef328a7e6..c8d59f5c0dfa41 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/category_title.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/category_title.tsx @@ -8,9 +8,9 @@ import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../containers/source'; +import { BrowserFields } from '../../../common/containers/source'; import { getFieldBrowserCategoryTitleClassName, getFieldCount } from './helpers'; -import { CountBadge } from '../page'; +import { CountBadge } from '../../../common/components/page'; const CountBadgeContainer = styled.div` position: relative; diff --git a/x-pack/plugins/siem/public/components/fields_browser/field_browser.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_browser.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/fields_browser/field_browser.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/field_browser.test.tsx index 9214fd5f2540ce..d4a6d85c7ccddf 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/field_browser.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_browser.test.tsx @@ -7,8 +7,8 @@ import { mount } from 'enzyme'; import React from 'react'; -import { mockBrowserFields } from '../../containers/source/mock'; -import { TestProviders } from '../../mock'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; +import { TestProviders } from '../../../common/mock'; import { FieldsBrowser } from './field_browser'; import { FIELD_BROWSER_HEIGHT, FIELD_BROWSER_WIDTH } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/field_browser.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_browser.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/fields_browser/field_browser.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/field_browser.tsx index 02aeab74f8babf..c255bd062bb4cb 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/field_browser.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_browser.tsx @@ -9,8 +9,8 @@ import React, { useEffect, useCallback } from 'react'; import { noop } from 'lodash/fp'; import styled from 'styled-components'; -import { BrowserFields } from '../../containers/source'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { BrowserFields } from '../../../common/containers/source'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { CategoriesPane } from './categories_pane'; import { FieldsPane } from './fields_pane'; import { Header } from './header'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/field_items.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_items.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/fields_browser/field_items.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/field_items.test.tsx index 226b56dad8c4f2..3b9e5368ff196a 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/field_items.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_items.test.tsx @@ -7,16 +7,16 @@ import { omit } from 'lodash/fp'; import React from 'react'; -import { mockBrowserFields } from '../../containers/source/mock'; -import { TestProviders } from '../../mock'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; +import { TestProviders } from '../../../common/mock'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers'; import { DEFAULT_DATE_COLUMN_MIN_WIDTH } from '../timeline/body/constants'; import { Category } from './category'; import { getFieldColumns, getFieldItems } from './field_items'; import { FIELDS_PANE_WIDTH } from './helpers'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; const selectedCategoryId = 'base'; const selectedCategoryFields = mockBrowserFields[selectedCategoryId].fields; diff --git a/x-pack/plugins/siem/public/components/fields_browser/field_items.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_items.tsx similarity index 85% rename from x-pack/plugins/siem/public/components/fields_browser/field_items.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/field_items.tsx index 62f9297c38ef52..9abcc909a161f4 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/field_items.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_items.tsx @@ -12,19 +12,27 @@ import React from 'react'; import { Draggable } from 'react-beautiful-dnd'; import styled from 'styled-components'; -import { BrowserField, BrowserFields } from '../../containers/source'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; -import { DragEffects } from '../drag_and_drop/draggable_wrapper'; -import { DroppableWrapper } from '../drag_and_drop/droppable_wrapper'; -import { getDraggableFieldId, getDroppableId, DRAG_TYPE_FIELD } from '../drag_and_drop/helpers'; -import { DraggableFieldBadge } from '../draggables/field_badge'; -import { getEmptyValue } from '../empty_value'; -import { getColumnsWithTimestamp, getExampleText, getIconFromType } from '../event_details/helpers'; -import { SelectableText } from '../selectable_text'; +import { BrowserField, BrowserFields } from '../../../common/containers/source'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; +import { DragEffects } from '../../../common/components/drag_and_drop/draggable_wrapper'; +import { DroppableWrapper } from '../../../common/components/drag_and_drop/droppable_wrapper'; +import { + getDraggableFieldId, + getDroppableId, + DRAG_TYPE_FIELD, +} from '../../../common/components/drag_and_drop/helpers'; +import { DraggableFieldBadge } from '../../../common/components/draggables/field_badge'; +import { getEmptyValue } from '../../../common/components/empty_value'; +import { + getColumnsWithTimestamp, + getExampleText, + getIconFromType, +} from '../../../common/components/event_details/helpers'; +import { SelectableText } from '../../../common/components/selectable_text'; import { defaultColumnHeaderType } from '../timeline/body/column_headers/default_headers'; import { DEFAULT_COLUMN_MIN_WIDTH } from '../timeline/body/constants'; import { OnUpdateColumns } from '../timeline/events'; -import { TruncatableText } from '../truncatable_text'; +import { TruncatableText } from '../../../common/components/truncatable_text'; import { FieldName } from './field_name'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/field_name.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_name.test.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/fields_browser/field_name.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/field_name.test.tsx index 31f1e7678aa451..473dd9eca4d1e9 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/field_name.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_name.test.tsx @@ -7,9 +7,9 @@ import { mount } from 'enzyme'; import React from 'react'; -import { mockBrowserFields } from '../../containers/source/mock'; -import { TestProviders } from '../../mock'; -import { getColumnsWithTimestamp } from '../event_details/helpers'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; +import { TestProviders } from '../../../common/mock'; +import { getColumnsWithTimestamp } from '../../../common/components/event_details/helpers'; import { FieldName } from './field_name'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/field_name.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_name.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/fields_browser/field_name.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/field_name.tsx index fc9633b6f87485..4043623f5d4a49 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/field_name.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/field_name.tsx @@ -8,13 +8,13 @@ import { EuiButtonIcon, EuiHighlight, EuiIcon, EuiText, EuiToolTip } from '@elas import React, { useCallback, useContext, useState, useMemo } from 'react'; import styled from 'styled-components'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { OnUpdateColumns } from '../timeline/events'; import { TimelineContext } from '../timeline/timeline_context'; -import { WithHoverActions } from '../with_hover_actions'; +import { WithHoverActions } from '../../../common/components/with_hover_actions'; import { LoadingSpinner } from './helpers'; import * as i18n from './translations'; -import { DraggableWrapperHoverContent } from '../drag_and_drop/draggable_wrapper_hover_content'; +import { DraggableWrapperHoverContent } from '../../../common/components/drag_and_drop/draggable_wrapper_hover_content'; /** * The name of a (draggable) field diff --git a/x-pack/plugins/siem/public/components/fields_browser/fields_pane.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/fields_pane.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/fields_browser/fields_pane.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/fields_pane.test.tsx index f3ec87a96d46b6..be77b62d2d0a4b 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/fields_pane.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/fields_pane.test.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import { mockBrowserFields } from '../../containers/source/mock'; -import { TestProviders } from '../../mock'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; +import { TestProviders } from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { FIELDS_PANE_WIDTH } from './helpers'; import { FieldsPane } from './fields_pane'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/fields_pane.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/fields_pane.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/fields_browser/fields_pane.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/fields_pane.tsx index 354b2ae5e5eb83..9829a63101f823 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/fields_pane.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/fields_pane.tsx @@ -8,8 +8,8 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../containers/source'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { BrowserFields } from '../../../common/containers/source'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { Category } from './category'; import { FieldBrowserProps } from './types'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/header.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/header.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/fields_browser/header.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/header.test.tsx index 2abc2fd1046e06..ca05d075e56168 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/header.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/header.test.tsx @@ -6,8 +6,8 @@ import { mount } from 'enzyme'; import React from 'react'; -import { mockBrowserFields } from '../../containers/source/mock'; -import { TestProviders } from '../../mock'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; +import { TestProviders } from '../../../common/mock'; import { defaultHeaders } from '../timeline/body/column_headers/default_headers'; import { Header } from './header'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/header.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/header.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/fields_browser/header.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/header.tsx index ccf6ec67521b0b..1136b7c8d0dc42 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/header.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/header.tsx @@ -15,10 +15,10 @@ import { import React, { useCallback } from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../containers/source'; -import { signalsHeaders } from '../../pages/detection_engine/components/signals/default_config'; -import { alertsHeaders } from '../alerts_viewer/default_headers'; -import { defaultHeaders as eventsDefaultHeaders } from '../events_viewer/default_headers'; +import { BrowserFields } from '../../../common/containers/source'; +import { signalsHeaders } from '../../../alerts/components/signals/default_config'; +import { alertsHeaders } from '../../../common/components/alerts_viewer/default_headers'; +import { defaultHeaders as eventsDefaultHeaders } from '../../../common/components/events_viewer/default_headers'; import { defaultHeaders } from '../timeline/body/column_headers/default_headers'; import { OnUpdateColumns } from '../timeline/events'; import { useTimelineTypeContext } from '../timeline/timeline_context'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/helpers.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/helpers.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/fields_browser/helpers.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/helpers.test.tsx index db9daacb21fa8f..0e1b00dd9b8642 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/helpers.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/helpers.test.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { mockBrowserFields } from '../../containers/source/mock'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; import { categoryHasFields, @@ -15,7 +15,7 @@ import { getFieldCount, filterBrowserFieldsByFieldName, } from './helpers'; -import { BrowserFields } from '../../containers/source'; +import { BrowserFields } from '../../../common/containers/source'; const timelineId = 'test'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/helpers.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/helpers.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/fields_browser/helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/helpers.tsx index e198d802d8a2ef..d176e68bc8414e 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/helpers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/helpers.tsx @@ -8,7 +8,7 @@ import { EuiLoadingSpinner } from '@elastic/eui'; import { filter, get, pickBy } from 'lodash/fp'; import styled from 'styled-components'; -import { BrowserField, BrowserFields } from '../../containers/source'; +import { BrowserField, BrowserFields } from '../../../common/containers/source'; import { DEFAULT_CATEGORY_NAME, defaultHeaders, diff --git a/x-pack/plugins/siem/public/components/fields_browser/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/fields_browser/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/index.test.tsx index 9e513b890e722a..798fa53e607ed2 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/index.test.tsx @@ -8,9 +8,9 @@ import { mount } from 'enzyme'; import React from 'react'; import { ActionCreator } from 'typescript-fsa'; -import { mockBrowserFields } from '../../containers/source/mock'; -import { TestProviders } from '../../mock'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; +import { TestProviders } from '../../../common/mock'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { FIELD_BROWSER_HEIGHT, FIELD_BROWSER_WIDTH } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/index.tsx b/x-pack/plugins/siem/public/timelines/components/fields_browser/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/fields_browser/index.tsx rename to x-pack/plugins/siem/public/timelines/components/fields_browser/index.tsx index 3e19ba383b4ecb..11c44cce89956d 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/index.tsx @@ -10,9 +10,9 @@ import React, { useEffect, useRef, useState, useCallback, useMemo } from 'react' import { connect, ConnectedProps } from 'react-redux'; import styled from 'styled-components'; -import { BrowserFields } from '../../containers/source'; -import { timelineActions } from '../../store/actions'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { BrowserFields } from '../../../common/containers/source'; +import { timelineActions } from '../../store/timeline'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { DEFAULT_CATEGORY_NAME } from '../timeline/body/column_headers/default_headers'; import { FieldsBrowser } from './field_browser'; import { filterBrowserFieldsByFieldName, mergeBrowserFieldsWithDefaultCategory } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/fields_browser/translations.ts b/x-pack/plugins/siem/public/timelines/components/fields_browser/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/fields_browser/translations.ts rename to x-pack/plugins/siem/public/timelines/components/fields_browser/translations.ts diff --git a/x-pack/plugins/siem/public/components/fields_browser/types.ts b/x-pack/plugins/siem/public/timelines/components/fields_browser/types.ts similarity index 90% rename from x-pack/plugins/siem/public/components/fields_browser/types.ts rename to x-pack/plugins/siem/public/timelines/components/fields_browser/types.ts index d6b1936fcc52f8..2b9889ec13e794 100644 --- a/x-pack/plugins/siem/public/components/fields_browser/types.ts +++ b/x-pack/plugins/siem/public/timelines/components/fields_browser/types.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { BrowserFields } from '../../containers/source'; -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { BrowserFields } from '../../../common/containers/source'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { OnUpdateColumns } from '../timeline/events'; export type OnFieldSelected = (fieldId: string) => void; diff --git a/x-pack/plugins/siem/public/components/flyout/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/flyout/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/flyout/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/flyout/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/flyout/button/index.tsx b/x-pack/plugins/siem/public/timelines/components/flyout/button/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/flyout/button/index.tsx rename to x-pack/plugins/siem/public/timelines/components/flyout/button/index.tsx index d0debbca4dec39..a80b8de4351673 100644 --- a/x-pack/plugins/siem/public/components/flyout/button/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/flyout/button/index.tsx @@ -10,12 +10,11 @@ import { rgba } from 'polished'; import React, { useMemo } from 'react'; import styled from 'styled-components'; -import { WithSource } from '../../../containers/source'; -import { IS_DRAGGING_CLASS_NAME } from '../../drag_and_drop/helpers'; -import { DataProviders } from '../../timeline/data_providers'; +import { WithSource } from '../../../../common/containers/source'; +import { IS_DRAGGING_CLASS_NAME } from '../../../../common/components/drag_and_drop/helpers'; import { DataProvider } from '../../timeline/data_providers/data_provider'; import { flattenIntoAndGroups } from '../../timeline/data_providers/helpers'; - +import { DataProviders } from '../../timeline/data_providers'; import * as i18n from './translations'; export const FLYOUT_BUTTON_CLASS_NAME = 'timeline-flyout-button'; diff --git a/x-pack/plugins/siem/public/components/flyout/button/translations.ts b/x-pack/plugins/siem/public/timelines/components/flyout/button/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/flyout/button/translations.ts rename to x-pack/plugins/siem/public/timelines/components/flyout/button/translations.ts diff --git a/x-pack/plugins/siem/public/components/flyout/header/index.tsx b/x-pack/plugins/siem/public/timelines/components/flyout/header/index.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/flyout/header/index.tsx rename to x-pack/plugins/siem/public/timelines/components/flyout/header/index.tsx index 27a8a83a0850af..b332260597f223 100644 --- a/x-pack/plugins/siem/public/components/flyout/header/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/flyout/header/index.tsx @@ -9,23 +9,17 @@ import { connect, ConnectedProps } from 'react-redux'; import { Dispatch } from 'redux'; import { isEmpty, get } from 'lodash/fp'; -import { History } from '../../../lib/history'; -import { Note } from '../../../lib/note'; -import { - appSelectors, - inputsModel, - inputsSelectors, - State, - timelineSelectors, -} from '../../../store'; +import { History } from '../../../../common/lib/history'; +import { Note } from '../../../../common/lib/note'; +import { appSelectors, inputsModel, inputsSelectors, State } from '../../../../common/store'; import { defaultHeaders } from '../../timeline/body/column_headers/default_headers'; import { Properties } from '../../timeline/properties'; -import { appActions } from '../../../store/app'; -import { inputsActions } from '../../../store/inputs'; -import { timelineActions } from '../../../store/actions'; -import { TimelineModel } from '../../../store/timeline/model'; -import { timelineDefaults } from '../../../store/timeline/defaults'; -import { InputsModelId } from '../../../store/inputs/constants'; +import { appActions } from '../../../../common/store/app'; +import { inputsActions } from '../../../../common/store/inputs'; +import { timelineActions, timelineSelectors } from '../../../store/timeline'; +import { TimelineModel } from '../../../../timelines/store/timeline/model'; +import { timelineDefaults } from '../../../../timelines/store/timeline/defaults'; +import { InputsModelId } from '../../../../common/store/inputs/constants'; interface OwnProps { timelineId: string; diff --git a/x-pack/plugins/siem/public/components/flyout/header_with_close_button/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/flyout/header_with_close_button/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/flyout/header_with_close_button/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/flyout/header_with_close_button/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/flyout/header_with_close_button/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/flyout/header_with_close_button/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/flyout/header_with_close_button/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/flyout/header_with_close_button/index.test.tsx index e0eace2ad5b102..57fd61561c65bc 100644 --- a/x-pack/plugins/siem/public/components/flyout/header_with_close_button/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/flyout/header_with_close_button/index.test.tsx @@ -7,7 +7,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../mock'; +import { TestProviders } from '../../../../common/mock'; import { FlyoutHeaderWithCloseButton } from '.'; describe('FlyoutHeaderWithCloseButton', () => { diff --git a/x-pack/plugins/siem/public/components/flyout/header_with_close_button/index.tsx b/x-pack/plugins/siem/public/timelines/components/flyout/header_with_close_button/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/flyout/header_with_close_button/index.tsx rename to x-pack/plugins/siem/public/timelines/components/flyout/header_with_close_button/index.tsx diff --git a/x-pack/plugins/siem/public/components/flyout/header_with_close_button/translations.ts b/x-pack/plugins/siem/public/timelines/components/flyout/header_with_close_button/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/flyout/header_with_close_button/translations.ts rename to x-pack/plugins/siem/public/timelines/components/flyout/header_with_close_button/translations.ts diff --git a/x-pack/plugins/siem/public/components/flyout/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/flyout/index.test.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/flyout/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/flyout/index.test.tsx index ab41b4617894e7..b73f2f943bb0ae 100644 --- a/x-pack/plugins/siem/public/components/flyout/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/flyout/index.test.tsx @@ -9,8 +9,13 @@ import { set } from 'lodash/fp'; import React from 'react'; import { ActionCreator } from 'typescript-fsa'; -import { apolloClientObservable, mockGlobalState, TestProviders } from '../../mock'; -import { createStore, State } from '../../store'; +import { + apolloClientObservable, + mockGlobalState, + TestProviders, + SUB_PLUGINS_REDUCER, +} from '../../../common/mock'; +import { createStore, State } from '../../../common/store'; import { mockDataProviders } from '../timeline/data_providers/mock/mock_data_providers'; import { Flyout, FlyoutComponent } from '.'; @@ -54,7 +59,11 @@ describe('Flyout', () => { test('it does NOT render the fly out button when its state is set to flyout is true', () => { const stateShowIsTrue = set('timeline.timelineById.test.show', true, state); - const storeShowIsTrue = createStore(stateShowIsTrue, apolloClientObservable); + const storeShowIsTrue = createStore( + stateShowIsTrue, + SUB_PLUGINS_REDUCER, + apolloClientObservable + ); const wrapper = mount( @@ -73,7 +82,11 @@ describe('Flyout', () => { mockDataProviders, state ); - const storeWithDataProviders = createStore(stateWithDataProviders, apolloClientObservable); + const storeWithDataProviders = createStore( + stateWithDataProviders, + SUB_PLUGINS_REDUCER, + apolloClientObservable + ); const wrapper = mount( @@ -90,7 +103,11 @@ describe('Flyout', () => { mockDataProviders, state ); - const storeWithDataProviders = createStore(stateWithDataProviders, apolloClientObservable); + const storeWithDataProviders = createStore( + stateWithDataProviders, + SUB_PLUGINS_REDUCER, + apolloClientObservable + ); const wrapper = mount( @@ -127,7 +144,11 @@ describe('Flyout', () => { mockDataProviders, state ); - const storeWithDataProviders = createStore(stateWithDataProviders, apolloClientObservable); + const storeWithDataProviders = createStore( + stateWithDataProviders, + SUB_PLUGINS_REDUCER, + apolloClientObservable + ); const wrapper = mount( diff --git a/x-pack/plugins/siem/public/components/flyout/index.tsx b/x-pack/plugins/siem/public/timelines/components/flyout/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/flyout/index.tsx rename to x-pack/plugins/siem/public/timelines/components/flyout/index.tsx index 404ca4a16e0f1c..c556c2d53f7c26 100644 --- a/x-pack/plugins/siem/public/components/flyout/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/flyout/index.tsx @@ -9,11 +9,11 @@ import React, { useCallback } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import styled from 'styled-components'; -import { State, timelineSelectors } from '../../store'; +import { State } from '../../../common/store'; import { DataProvider } from '../timeline/data_providers/data_provider'; import { FlyoutButton } from './button'; import { Pane } from './pane'; -import { timelineActions } from '../../store/actions'; +import { timelineActions, timelineSelectors } from '../../store/timeline'; import { DEFAULT_TIMELINE_WIDTH } from '../timeline/body/constants'; import { StatefulTimeline } from '../timeline'; import { TimelineById } from '../../store/timeline/types'; diff --git a/x-pack/plugins/siem/public/components/flyout/pane/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/flyout/pane/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/flyout/pane/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/flyout/pane/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/flyout/pane/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/flyout/pane/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/flyout/pane/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/flyout/pane/index.test.tsx index 53cf8f95de0ce7..29606d7685d977 100644 --- a/x-pack/plugins/siem/public/components/flyout/pane/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/flyout/pane/index.test.tsx @@ -7,7 +7,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../mock'; +import { TestProviders } from '../../../../common/mock'; import { Pane } from '.'; const testFlyoutHeight = 980; diff --git a/x-pack/plugins/siem/public/components/flyout/pane/index.tsx b/x-pack/plugins/siem/public/timelines/components/flyout/pane/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/flyout/pane/index.tsx rename to x-pack/plugins/siem/public/timelines/components/flyout/pane/index.tsx index 3b5041c1ee3468..33aca80b940fe3 100644 --- a/x-pack/plugins/siem/public/components/flyout/pane/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/flyout/pane/index.tsx @@ -11,10 +11,10 @@ import styled from 'styled-components'; import { Resizable, ResizeCallback } from 're-resizable'; import { TimelineResizeHandle } from './timeline_resize_handle'; -import { EventDetailsWidthProvider } from '../../events_viewer/event_details_width_context'; +import { EventDetailsWidthProvider } from '../../../../common/components/events_viewer/event_details_width_context'; import * as i18n from './translations'; -import { timelineActions } from '../../../store/actions'; +import { timelineActions } from '../../../store/timeline'; const minWidthPixels = 550; // do not allow the flyout to shrink below this width (pixels) const maxWidthPercent = 95; // do not allow the flyout to grow past this percentage of the view diff --git a/x-pack/plugins/siem/public/components/flyout/pane/timeline_resize_handle.tsx b/x-pack/plugins/siem/public/timelines/components/flyout/pane/timeline_resize_handle.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/flyout/pane/timeline_resize_handle.tsx rename to x-pack/plugins/siem/public/timelines/components/flyout/pane/timeline_resize_handle.tsx diff --git a/x-pack/plugins/siem/public/components/flyout/pane/translations.ts b/x-pack/plugins/siem/public/timelines/components/flyout/pane/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/flyout/pane/translations.ts rename to x-pack/plugins/siem/public/timelines/components/flyout/pane/translations.ts diff --git a/x-pack/plugins/siem/public/components/formatted_duration/helpers.test.ts b/x-pack/plugins/siem/public/timelines/components/formatted_duration/helpers.test.ts similarity index 99% rename from x-pack/plugins/siem/public/components/formatted_duration/helpers.test.ts rename to x-pack/plugins/siem/public/timelines/components/formatted_duration/helpers.test.ts index 30254c49c9f3bf..dcf77f06defe3e 100644 --- a/x-pack/plugins/siem/public/components/formatted_duration/helpers.test.ts +++ b/x-pack/plugins/siem/public/timelines/components/formatted_duration/helpers.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { getEmptyValue } from '../empty_value'; +import { getEmptyValue } from '../../../common/components/empty_value'; import { getFormattedDurationString, getHumanizedDuration, diff --git a/x-pack/plugins/siem/public/components/formatted_duration/helpers.tsx b/x-pack/plugins/siem/public/timelines/components/formatted_duration/helpers.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/formatted_duration/helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/formatted_duration/helpers.tsx index 44bd76bc6beb05..113ed70776034a 100644 --- a/x-pack/plugins/siem/public/components/formatted_duration/helpers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/formatted_duration/helpers.tsx @@ -6,7 +6,7 @@ import moment from 'moment'; -import { getEmptyValue } from '../empty_value'; +import { getEmptyValue } from '../../../common/components/empty_value'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/formatted_duration/index.tsx b/x-pack/plugins/siem/public/timelines/components/formatted_duration/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_duration/index.tsx rename to x-pack/plugins/siem/public/timelines/components/formatted_duration/index.tsx diff --git a/x-pack/plugins/siem/public/components/formatted_duration/tooltip/index.tsx b/x-pack/plugins/siem/public/timelines/components/formatted_duration/tooltip/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_duration/tooltip/index.tsx rename to x-pack/plugins/siem/public/timelines/components/formatted_duration/tooltip/index.tsx diff --git a/x-pack/plugins/siem/public/components/formatted_duration/translations.ts b/x-pack/plugins/siem/public/timelines/components/formatted_duration/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/formatted_duration/translations.ts rename to x-pack/plugins/siem/public/timelines/components/formatted_duration/translations.ts diff --git a/x-pack/plugins/siem/public/components/formatted_ip/index.tsx b/x-pack/plugins/siem/public/timelines/components/formatted_ip/index.tsx similarity index 86% rename from x-pack/plugins/siem/public/components/formatted_ip/index.tsx rename to x-pack/plugins/siem/public/timelines/components/formatted_ip/index.tsx index ba97e8d61451c3..e3a722214d4723 100644 --- a/x-pack/plugins/siem/public/components/formatted_ip/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/formatted_ip/index.tsx @@ -7,13 +7,19 @@ import { isArray, isEmpty, isString, uniq } from 'lodash/fp'; import React from 'react'; -import { DragEffects, DraggableWrapper } from '../drag_and_drop/draggable_wrapper'; -import { escapeDataProviderId } from '../drag_and_drop/helpers'; -import { getOrEmptyTagFromValue } from '../empty_value'; -import { IPDetailsLink } from '../links'; -import { parseQueryValue } from '../timeline/body/renderers/parse_query_value'; -import { DataProvider, IS_OPERATOR } from '../timeline/data_providers/data_provider'; -import { Provider } from '../timeline/data_providers/provider'; +import { + DragEffects, + DraggableWrapper, +} from '../../../common/components/drag_and_drop/draggable_wrapper'; +import { escapeDataProviderId } from '../../../common/components/drag_and_drop/helpers'; +import { getOrEmptyTagFromValue } from '../../../common/components/empty_value'; +import { IPDetailsLink } from '../../../common/components/links'; +import { parseQueryValue } from '../../../timelines/components/timeline/body/renderers/parse_query_value'; +import { + DataProvider, + IS_OPERATOR, +} from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Provider } from '../../../timelines/components/timeline/data_providers/provider'; const getUniqueId = ({ contextId, diff --git a/x-pack/plugins/siem/public/components/ja3_fingerprint/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/ja3_fingerprint/index.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/ja3_fingerprint/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/ja3_fingerprint/index.test.tsx index c4ea6ff63a0a77..4ca1e7cc1bad4a 100644 --- a/x-pack/plugins/siem/public/components/ja3_fingerprint/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/ja3_fingerprint/index.test.tsx @@ -6,8 +6,8 @@ import React from 'react'; -import { TestProviders } from '../../mock'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { TestProviders } from '../../../common/mock'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; import { Ja3Fingerprint } from '.'; diff --git a/x-pack/plugins/siem/public/components/ja3_fingerprint/index.tsx b/x-pack/plugins/siem/public/timelines/components/ja3_fingerprint/index.tsx similarity index 86% rename from x-pack/plugins/siem/public/components/ja3_fingerprint/index.tsx rename to x-pack/plugins/siem/public/timelines/components/ja3_fingerprint/index.tsx index 955a57576dc8eb..2bb4e7471eba88 100644 --- a/x-pack/plugins/siem/public/components/ja3_fingerprint/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/ja3_fingerprint/index.tsx @@ -7,9 +7,9 @@ import React from 'react'; import styled from 'styled-components'; -import { DraggableBadge } from '../draggables'; -import { ExternalLinkIcon } from '../external_link_icon'; -import { Ja3FingerprintLink } from '../links'; +import { DraggableBadge } from '../../../common/components/draggables'; +import { ExternalLinkIcon } from '../../../common/components/external_link_icon'; +import { Ja3FingerprintLink } from '../../../common/components/links'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/ja3_fingerprint/translations.ts b/x-pack/plugins/siem/public/timelines/components/ja3_fingerprint/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/ja3_fingerprint/translations.ts rename to x-pack/plugins/siem/public/timelines/components/ja3_fingerprint/translations.ts diff --git a/x-pack/plugins/siem/public/components/lazy_accordion/index.tsx b/x-pack/plugins/siem/public/timelines/components/lazy_accordion/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/lazy_accordion/index.tsx rename to x-pack/plugins/siem/public/timelines/components/lazy_accordion/index.tsx diff --git a/x-pack/plugins/siem/public/components/loading/index.tsx b/x-pack/plugins/siem/public/timelines/components/loading/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/loading/index.tsx rename to x-pack/plugins/siem/public/timelines/components/loading/index.tsx diff --git a/x-pack/plugins/siem/public/components/netflow/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/netflow/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/netflow/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/netflow/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/netflow/fingerprints/index.tsx b/x-pack/plugins/siem/public/timelines/components/netflow/fingerprints/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/netflow/fingerprints/index.tsx rename to x-pack/plugins/siem/public/timelines/components/netflow/fingerprints/index.tsx diff --git a/x-pack/plugins/siem/public/components/netflow/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/netflow/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/netflow/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/netflow/index.test.tsx index ecf162ebf2739a..0a6d2f8ab3178a 100644 --- a/x-pack/plugins/siem/public/components/netflow/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/netflow/index.test.tsx @@ -8,18 +8,21 @@ import { get } from 'lodash/fp'; import React from 'react'; import { shallow } from 'enzyme'; -import { asArrayIfExists } from '../../lib/helpers'; -import { getMockNetflowData } from '../../mock'; -import { TestProviders } from '../../mock/test_providers'; +import { asArrayIfExists } from '../../../common/lib/helpers'; +import { getMockNetflowData } from '../../../common/mock'; +import { TestProviders } from '../../../common/mock/test_providers'; import { TLS_CLIENT_CERTIFICATE_FINGERPRINT_SHA1_FIELD_NAME, TLS_SERVER_CERTIFICATE_FINGERPRINT_SHA1_FIELD_NAME, } from '../certificate_fingerprint'; import { EVENT_DURATION_FIELD_NAME } from '../duration'; -import { ID_FIELD_NAME } from '../event_details/event_id'; -import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../ip'; +import { ID_FIELD_NAME } from '../../../common/components/event_details/event_id'; +import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../../../network/components/ip'; import { JA3_HASH_FIELD_NAME } from '../ja3_fingerprint'; -import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../port'; +import { + DESTINATION_PORT_FIELD_NAME, + SOURCE_PORT_FIELD_NAME, +} from '../../../network/components/port'; import { DESTINATION_GEO_CITY_NAME_FIELD_NAME, DESTINATION_GEO_CONTINENT_NAME_FIELD_NAME, @@ -31,13 +34,13 @@ import { SOURCE_GEO_COUNTRY_ISO_CODE_FIELD_NAME, SOURCE_GEO_COUNTRY_NAME_FIELD_NAME, SOURCE_GEO_REGION_NAME_FIELD_NAME, -} from '../source_destination/geo_fields'; +} from '../../../network/components/source_destination/geo_fields'; import { DESTINATION_BYTES_FIELD_NAME, DESTINATION_PACKETS_FIELD_NAME, SOURCE_BYTES_FIELD_NAME, SOURCE_PACKETS_FIELD_NAME, -} from '../source_destination/source_destination_arrows'; +} from '../../../network/components/source_destination/source_destination_arrows'; import * as i18n from '../timeline/body/renderers/translations'; import { Netflow } from '.'; @@ -53,8 +56,8 @@ import { NETWORK_PACKETS_FIELD_NAME, NETWORK_PROTOCOL_FIELD_NAME, NETWORK_TRANSPORT_FIELD_NAME, -} from '../source_destination/field_names'; -import { useMountAppended } from '../../utils/use_mount_appended'; +} from '../../../network/components/source_destination/field_names'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; const getNetflowInstance = () => ( void; diff --git a/x-pack/plugins/siem/public/components/notes/index.tsx b/x-pack/plugins/siem/public/timelines/components/notes/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/notes/index.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/index.tsx index b5fef9a5e4d413..42f28f03406798 100644 --- a/x-pack/plugins/siem/public/components/notes/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/notes/index.tsx @@ -15,7 +15,7 @@ import { import React, { useState } from 'react'; import styled from 'styled-components'; -import { Note } from '../../lib/note'; +import { Note } from '../../../common/lib/note'; import { AddNote } from './add_note'; import { columns } from './columns'; diff --git a/x-pack/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/notes/note_card/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_card/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/notes/note_card/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_card/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/notes/note_card/index.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_card/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/notes/note_card/index.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_card/index.tsx diff --git a/x-pack/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_card/note_card_body.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/notes/note_card/note_card_body.test.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_card/note_card_body.test.tsx diff --git a/x-pack/plugins/siem/public/components/notes/note_card/note_card_body.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_card/note_card_body.tsx similarity index 82% rename from x-pack/plugins/siem/public/components/notes/note_card/note_card_body.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_card/note_card_body.tsx index 4463f8d4ff6024..f846ead810ff2c 100644 --- a/x-pack/plugins/siem/public/components/notes/note_card/note_card_body.tsx +++ b/x-pack/plugins/siem/public/timelines/components/notes/note_card/note_card_body.tsx @@ -8,9 +8,9 @@ import { EuiPanel, EuiToolTip } from '@elastic/eui'; import React, { useCallback, useMemo } from 'react'; import styled from 'styled-components'; -import { WithCopyToClipboard } from '../../../lib/clipboard/with_copy_to_clipboard'; -import { Markdown } from '../../markdown'; -import { WithHoverActions } from '../../with_hover_actions'; +import { WithCopyToClipboard } from '../../../../common/lib/clipboard/with_copy_to_clipboard'; +import { Markdown } from '../../../../common/components/markdown'; +import { WithHoverActions } from '../../../../common/components/with_hover_actions'; import * as i18n from '../translations'; const BodyContainer = styled(EuiPanel)` diff --git a/x-pack/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_card/note_card_header.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/notes/note_card/note_card_header.test.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_card/note_card_header.test.tsx diff --git a/x-pack/plugins/siem/public/components/notes/note_card/note_card_header.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_card/note_card_header.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/notes/note_card/note_card_header.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_card/note_card_header.tsx diff --git a/x-pack/plugins/siem/public/components/notes/note_card/note_created.test.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_card/note_created.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/notes/note_card/note_created.test.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_card/note_created.test.tsx diff --git a/x-pack/plugins/siem/public/components/notes/note_card/note_created.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_card/note_created.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/notes/note_card/note_created.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_card/note_created.tsx index cdd0406c714509..dc97373660bd1c 100644 --- a/x-pack/plugins/siem/public/components/notes/note_card/note_created.tsx +++ b/x-pack/plugins/siem/public/timelines/components/notes/note_card/note_created.tsx @@ -8,7 +8,7 @@ import { FormattedRelative } from '@kbn/i18n/react'; import React from 'react'; import styled from 'styled-components'; -import { LocalizedDateTooltip } from '../../localized_date_tooltip'; +import { LocalizedDateTooltip } from '../../../../common/components/localized_date_tooltip'; const NoteCreatedContainer = styled.span` user-select: none; diff --git a/x-pack/plugins/siem/public/components/notes/note_cards/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_cards/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/notes/note_cards/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_cards/index.test.tsx index f70e841d1eefd3..fa63eb625f2839 100644 --- a/x-pack/plugins/siem/public/components/notes/note_cards/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/notes/note_cards/index.test.tsx @@ -9,7 +9,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import { ThemeProvider } from 'styled-components'; import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json'; -import { Note } from '../../../lib/note'; +import { Note } from '../../../../common/lib/note'; import { NoteCards } from '.'; diff --git a/x-pack/plugins/siem/public/components/notes/note_cards/index.tsx b/x-pack/plugins/siem/public/timelines/components/notes/note_cards/index.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/notes/note_cards/index.tsx rename to x-pack/plugins/siem/public/timelines/components/notes/note_cards/index.tsx index 6664660eb6bdc2..346d77b14cd90e 100644 --- a/x-pack/plugins/siem/public/components/notes/note_cards/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/notes/note_cards/index.tsx @@ -8,7 +8,7 @@ import { EuiFlexGroup, EuiPanel } from '@elastic/eui'; import React, { useState, useCallback } from 'react'; import styled from 'styled-components'; -import { Note } from '../../../lib/note'; +import { Note } from '../../../../common/lib/note'; import { AddNote } from '../add_note'; import { AssociateNote, GetNewNoteId, UpdateNote } from '../helpers'; import { NoteCard } from '../note_card'; diff --git a/x-pack/plugins/siem/public/components/notes/translations.ts b/x-pack/plugins/siem/public/timelines/components/notes/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/notes/translations.ts rename to x-pack/plugins/siem/public/timelines/components/notes/translations.ts diff --git a/x-pack/plugins/siem/public/components/open_timeline/constants.ts b/x-pack/plugins/siem/public/timelines/components/open_timeline/constants.ts similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/constants.ts rename to x-pack/plugins/siem/public/timelines/components/open_timeline/constants.ts diff --git a/x-pack/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/delete_timeline_modal/delete_timeline_modal.test.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/delete_timeline_modal/delete_timeline_modal.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/delete_timeline_modal/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/delete_timeline_modal/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/delete_timeline_modal/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/delete_timeline_modal/index.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/delete_timeline_modal/index.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/edit_timeline_actions.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/edit_timeline_actions.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/edit_timeline_actions.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/edit_timeline_actions.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/edit_timeline_batch_actions.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/edit_timeline_batch_actions.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/edit_timeline_batch_actions.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/edit_timeline_batch_actions.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/export_timeline/export_timeline.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/export_timeline/export_timeline.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/export_timeline/export_timeline.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/export_timeline.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/open_timeline/export_timeline/export_timeline.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/export_timeline.tsx index ebfd5c18bd5dc2..43ef3bccbea56e 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/export_timeline/export_timeline.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/export_timeline.tsx @@ -6,9 +6,12 @@ import React, { useCallback } from 'react'; import uuid from 'uuid'; -import { GenericDownloader, ExportSelectedData } from '../../generic_downloader'; +import { + GenericDownloader, + ExportSelectedData, +} from '../../../../common/components/generic_downloader'; import * as i18n from '../translations'; -import { useStateToaster } from '../../toasters'; +import { useStateToaster } from '../../../../common/components/toasters'; const ExportTimeline: React.FC<{ exportedIds: string[] | undefined; diff --git a/x-pack/plugins/siem/public/components/open_timeline/export_timeline/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/export_timeline/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/export_timeline/index.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/open_timeline/export_timeline/index.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/index.tsx index 12cf952bb1ff86..7bac3229c81732 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/export_timeline/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/index.tsx @@ -9,7 +9,7 @@ import { DeleteTimelines } from '../types'; import { TimelineDownloader } from './export_timeline'; import { DeleteTimelineModalOverlay } from '../delete_timeline_modal'; -import { exportSelectedTimeline } from '../../../containers/timeline/api'; +import { exportSelectedTimeline } from '../../../containers/api'; export interface ExportTimeline { disableExportTimelineDownloader: () => void; diff --git a/x-pack/plugins/siem/public/components/open_timeline/export_timeline/mocks.ts b/x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/mocks.ts similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/export_timeline/mocks.ts rename to x-pack/plugins/siem/public/timelines/components/open_timeline/export_timeline/mocks.ts diff --git a/x-pack/plugins/siem/public/components/open_timeline/helpers.test.ts b/x-pack/plugins/siem/public/timelines/components/open_timeline/helpers.test.ts similarity index 97% rename from x-pack/plugins/siem/public/components/open_timeline/helpers.test.ts rename to x-pack/plugins/siem/public/timelines/components/open_timeline/helpers.test.ts index a7c0b08fc8a21e..e6db9df61b9020 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/helpers.test.ts +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/helpers.test.ts @@ -10,19 +10,19 @@ import { mockTimelineResults, mockTimelineResult, mockTimelineModel, -} from '../../mock/timeline_results'; -import { timelineDefaults } from '../../store/timeline/defaults'; -import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../store/inputs/actions'; +} from '../../../common/mock/timeline_results'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; +import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../../common/store/inputs/actions'; import { setKqlFilterQueryDraft as dispatchSetKqlFilterQueryDraft, applyKqlFilterQuery as dispatchApplyKqlFilterQuery, addTimeline as dispatchAddTimeline, addNote as dispatchAddGlobalTimelineNote, -} from '../../store/timeline/actions'; +} from '../../../timelines/store/timeline/actions'; import { addNotes as dispatchAddNotes, updateNote as dispatchUpdateNote, -} from '../../store/app/actions'; +} from '../../../common/store/app/actions'; import { defaultTimelineToTimelineModel, getNotesCount, @@ -32,15 +32,15 @@ import { dispatchUpdateTimeline, } from './helpers'; import { OpenTimelineResult, DispatchUpdateTimeline } from './types'; -import { KueryFilterQueryKind } from '../../store/model'; -import { Note } from '../../lib/note'; +import { KueryFilterQueryKind } from '../../../common/store/model'; +import { Note } from '../../../common/lib/note'; import moment from 'moment'; import sinon from 'sinon'; -import { TimelineType } from '../../../common/types/timeline'; +import { TimelineType } from '../../../../common/types/timeline'; -jest.mock('../../store/inputs/actions'); -jest.mock('../../store/timeline/actions'); -jest.mock('../../store/app/actions'); +jest.mock('../../../common/store/inputs/actions'); +jest.mock('../../../timelines/store/timeline/actions'); +jest.mock('../../../common/store/app/actions'); jest.mock('uuid', () => { return { v1: jest.fn(() => 'uuid.v1()'), diff --git a/x-pack/plugins/siem/public/components/open_timeline/helpers.ts b/x-pack/plugins/siem/public/timelines/components/open_timeline/helpers.ts similarity index 95% rename from x-pack/plugins/siem/public/components/open_timeline/helpers.ts rename to x-pack/plugins/siem/public/timelines/components/open_timeline/helpers.ts index 681d39feb09f81..df433f147490e4 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/helpers.ts +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/helpers.ts @@ -9,23 +9,22 @@ import { getOr, set, isEmpty } from 'lodash/fp'; import { Action } from 'typescript-fsa'; import uuid from 'uuid'; import { Dispatch } from 'redux'; - -import { oneTimelineQuery } from '../../containers/timeline/one/index.gql_query'; -import { TimelineResult, GetOneTimeline, NoteResult } from '../../graphql/types'; +import { oneTimelineQuery } from '../../containers/one/index.gql_query'; +import { TimelineResult, GetOneTimeline, NoteResult } from '../../../graphql/types'; import { addNotes as dispatchAddNotes, updateNote as dispatchUpdateNote, -} from '../../store/app/actions'; -import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../store/inputs/actions'; +} from '../../../common/store/app/actions'; +import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../../common/store/inputs/actions'; import { setKqlFilterQueryDraft as dispatchSetKqlFilterQueryDraft, applyKqlFilterQuery as dispatchApplyKqlFilterQuery, addTimeline as dispatchAddTimeline, addNote as dispatchAddGlobalTimelineNote, -} from '../../store/timeline/actions'; +} from '../../../timelines/store/timeline/actions'; -import { ColumnHeaderOptions, TimelineModel } from '../../store/timeline/model'; -import { timelineDefaults } from '../../store/timeline/defaults'; +import { ColumnHeaderOptions, TimelineModel } from '../../../timelines/store/timeline/model'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; import { defaultColumnHeaderType, defaultHeaders, @@ -36,7 +35,7 @@ import { } from '../timeline/body/constants'; import { OpenTimelineResult, UpdateTimeline, DispatchUpdateTimeline } from './types'; -import { getTimeRangeSettings } from '../../utils/default_date_settings'; +import { getTimeRangeSettings } from '../../../common/utils/default_date_settings'; import { createNote } from '../notes/helpers'; export const OPEN_TIMELINE_CLASS_NAME = 'open-timeline'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/open_timeline/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/index.test.tsx index 731c6d1ca9806a..52197b92bdfb12 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/index.test.tsx @@ -10,20 +10,20 @@ import { MockedProvider } from 'react-apollo/test-utils'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { wait } from '../../lib/helpers'; -import { TestProviderWithoutDragAndDrop, apolloClient } from '../../mock/test_providers'; -import { mockOpenTimelineQueryResults } from '../../mock/timeline_results'; -import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../pages/timelines/timelines_page'; +import { wait } from '../../../common/lib/helpers'; +import { TestProviderWithoutDragAndDrop, apolloClient } from '../../../common/mock/test_providers'; +import { mockOpenTimelineQueryResults } from '../../../common/mock/timeline_results'; +import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../pages/timelines_page'; import { NotePreviews } from './note_previews'; import { OPEN_TIMELINE_CLASS_NAME } from './helpers'; import { TimelineTabsStyle } from './types'; import { StatefulOpenTimeline } from '.'; -import { useGetAllTimeline, getAllTimeline } from '../../containers/timeline/all'; -jest.mock('../../lib/kibana'); -jest.mock('../../containers/timeline/all', () => { - const originalModule = jest.requireActual('../../containers/timeline/all'); +import { useGetAllTimeline, getAllTimeline } from '../../containers/all'; +jest.mock('../../../common/lib/kibana'); +jest.mock('../../containers/all', () => { + const originalModule = jest.requireActual('../../containers/all'); return { ...originalModule, useGetAllTimeline: jest.fn(), diff --git a/x-pack/plugins/siem/public/components/open_timeline/index.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/open_timeline/index.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/index.tsx index ed22673f07a780..735ccdd19a5614 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/index.tsx @@ -9,18 +9,18 @@ import React, { useEffect, useState, useCallback } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import { Dispatch } from 'redux'; - -import { defaultHeaders } from '../../components/timeline/body/column_headers/default_headers'; -import { deleteTimelineMutation } from '../../containers/timeline/delete/persist.gql_query'; -import { useGetAllTimeline } from '../../containers/timeline/all'; -import { DeleteTimelineMutation, SortFieldTimeline, Direction } from '../../graphql/types'; -import { State, timelineSelectors } from '../../store'; -import { ColumnHeaderOptions, TimelineModel } from '../../store/timeline/model'; -import { timelineDefaults } from '../../store/timeline/defaults'; +import { defaultHeaders } from '../timeline/body/column_headers/default_headers'; +import { deleteTimelineMutation } from '../../containers/delete/persist.gql_query'; +import { useGetAllTimeline } from '../../containers/all'; +import { DeleteTimelineMutation, SortFieldTimeline, Direction } from '../../../graphql/types'; +import { State } from '../../../common/store'; +import { ColumnHeaderOptions, TimelineModel } from '../../../timelines/store/timeline/model'; +import { timelineSelectors } from '../../../timelines/store/timeline'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; import { createTimeline as dispatchCreateNewTimeline, updateIsLoading as dispatchUpdateIsLoading, -} from '../../store/timeline/actions'; +} from '../../../timelines/store/timeline/actions'; import { OpenTimeline } from './open_timeline'; import { OPEN_TIMELINE_CLASS_NAME, queryTimelineById, dispatchUpdateTimeline } from './helpers'; import { OpenTimelineModalBody } from './open_timeline_modal/open_timeline_modal_body'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/index.test.tsx index 463111bd9735f0..318e50bb67d2d2 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/note_previews/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/index.test.tsx @@ -11,7 +11,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { mockTimelineResults } from '../../../mock/timeline_results'; +import { mockTimelineResults } from '../../../../common/mock/timeline_results'; import { OpenTimelineResult, TimelineResultNote } from '../types'; import { NotePreviews } from '.'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/note_previews/index.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/note_previews/index.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/index.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/note_preview.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/note_preview.test.tsx index 7cefaf08d76cb2..c0046e43eef306 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/note_previews/note_preview.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/note_preview.test.tsx @@ -9,7 +9,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { getEmptyValue } from '../../empty_value'; +import { getEmptyValue } from '../../../../common/components/empty_value'; import { NotePreview } from './note_preview'; import * as i18n from '../translations'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/note_preview.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/note_preview.tsx index bb4a032734b5b9..d079a4bedcbaf3 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/note_previews/note_preview.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/note_previews/note_preview.tsx @@ -9,9 +9,9 @@ import { FormattedRelative } from '@kbn/i18n/react'; import React from 'react'; import styled from 'styled-components'; -import { getEmptyValue, defaultToEmptyTag } from '../../empty_value'; -import { FormattedDate } from '../../formatted_date'; -import { Markdown } from '../../markdown'; +import { getEmptyValue, defaultToEmptyTag } from '../../../../common/components/empty_value'; +import { FormattedDate } from '../../../../common/components/formatted_date'; +import { Markdown } from '../../../../common/components/markdown'; import * as i18n from '../translations'; import { TimelineResultNote } from '../types'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/open_timeline.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/open_timeline/open_timeline.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline.test.tsx index 449e1b169cea64..787da4ed6cf416 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/open_timeline.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline.test.tsx @@ -10,14 +10,14 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../pages/timelines/timelines_page'; +import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../pages/timelines_page'; import { OpenTimelineResult, OpenTimelineProps } from './types'; import { TimelinesTableProps } from './timelines_table'; -import { mockTimelineResults } from '../../mock/timeline_results'; +import { mockTimelineResults } from '../../../common/mock/timeline_results'; import { OpenTimeline } from './open_timeline'; import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from './constants'; -jest.mock('../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); describe('OpenTimeline', () => { const theme = () => ({ eui: euiDarkVars, darkMode: true }); diff --git a/x-pack/plugins/siem/public/components/open_timeline/open_timeline.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/open_timeline/open_timeline.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline.tsx index e172a006abe4b0..cdbba307a11544 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/open_timeline.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline.tsx @@ -11,9 +11,9 @@ import { OPEN_TIMELINE_CLASS_NAME } from './helpers'; import { OpenTimelineProps, OpenTimelineResult } from './types'; import { SearchRow } from './search_row'; import { TimelinesTable } from './timelines_table'; -import { ImportDataModal } from '../import_data_modal'; +import { ImportDataModal } from '../../../common/components/import_data_modal'; import * as i18n from './translations'; -import { importTimelines } from '../../containers/timeline/api'; +import { importTimelines } from '../../containers/api'; import { UtilityBarGroup, @@ -21,7 +21,7 @@ import { UtilityBar, UtilityBarSection, UtilityBarAction, -} from '../utility_bar'; +} from '../../../common/components/utility_bar'; import { useEditTimelinBatchActions } from './edit_timeline_batch_actions'; import { useEditTimelineActions } from './edit_timeline_actions'; import { EditOneTimelineAction } from './export_timeline'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/index.test.tsx similarity index 83% rename from x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/index.test.tsx index 178c69e6957e1d..8382af6056ca78 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/index.test.tsx @@ -10,19 +10,19 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { ThemeProvider } from 'styled-components'; -import { wait } from '../../../lib/helpers'; -import { TestProviderWithoutDragAndDrop } from '../../../mock/test_providers'; -import { mockOpenTimelineQueryResults } from '../../../mock/timeline_results'; -import { useGetAllTimeline, getAllTimeline } from '../../../containers/timeline/all'; +import { wait } from '../../../../common/lib/helpers'; +import { TestProviderWithoutDragAndDrop } from '../../../../common/mock/test_providers'; +import { mockOpenTimelineQueryResults } from '../../../../common/mock/timeline_results'; +import { useGetAllTimeline, getAllTimeline } from '../../../containers/all'; import { OpenTimelineModal } from '.'; -jest.mock('../../../lib/kibana'); -jest.mock('../../../utils/apollo_context', () => ({ +jest.mock('../../../../common/lib/kibana'); +jest.mock('../../../../common/utils/apollo_context', () => ({ useApolloClient: () => ({}), })); -jest.mock('../../../containers/timeline/all', () => { - const originalModule = jest.requireActual('../../../containers/timeline/all'); +jest.mock('../../../containers/all', () => { + const originalModule = jest.requireActual('../../../containers/all'); return { useGetAllTimeline: jest.fn(), getAllTimeline: originalModule.getAllTimeline, diff --git a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/index.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/index.tsx index c530929a3c96ee..901ae955cbfe9b 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/index.tsx @@ -7,8 +7,8 @@ import { EuiModal, EuiOverlayMask } from '@elastic/eui'; import React from 'react'; -import { TimelineModel } from '../../../store/timeline/model'; -import { useApolloClient } from '../../../utils/apollo_context'; +import { TimelineModel } from '../../../../timelines/store/timeline/model'; +import { useApolloClient } from '../../../../common/utils/apollo_context'; import * as i18n from '../translations'; import { ActionTimelineToShow } from '../types'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx index a610884d287a62..1b320c9ebd7551 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.test.tsx @@ -10,14 +10,14 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page'; +import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines_page'; import { OpenTimelineResult, OpenTimelineProps } from '../types'; import { TimelinesTableProps } from '../timelines_table'; -import { mockTimelineResults } from '../../../mock/timeline_results'; +import { mockTimelineResults } from '../../../../common/mock/timeline_results'; import { OpenTimelineModalBody } from './open_timeline_modal_body'; import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants'; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('OpenTimelineModal', () => { const theme = () => ({ eui: euiDarkVars, darkMode: true }); diff --git a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_body.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx index 66947a313f5e55..0244bdda0d826e 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_button.test.tsx @@ -10,9 +10,9 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import { ThemeProvider } from 'styled-components'; -import { wait } from '../../../lib/helpers'; -import { TestProviderWithoutDragAndDrop } from '../../../mock/test_providers'; -import { mockOpenTimelineQueryResults } from '../../../mock/timeline_results'; +import { wait } from '../../../../common/lib/helpers'; +import { TestProviderWithoutDragAndDrop } from '../../../../common/mock/test_providers'; +import { mockOpenTimelineQueryResults } from '../../../../common/mock/timeline_results'; import * as i18n from '../translations'; import { OpenTimelineModalButton } from './open_timeline_modal_button'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_button.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/open_timeline_modal/open_timeline_modal_button.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/open_timeline_modal/open_timeline_modal_button.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/search_row/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/search_row/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/search_row/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/search_row/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/search_row/index.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/search_row/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/search_row/index.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/search_row/index.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/actions_columns.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/actions_columns.test.tsx index b0f8963dd501ea..0560bcf2b08ca3 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/actions_columns.test.tsx @@ -11,12 +11,12 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { mockTimelineResults } from '../../../mock/timeline_results'; +import { mockTimelineResults } from '../../../../common/mock/timeline_results'; import { OpenTimelineResult } from '../types'; import { TimelinesTableProps } from '.'; import { getMockTimelinesTableProps } from './mocks'; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); const { TimelinesTable } = jest.requireActual('.'); diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/actions_columns.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/actions_columns.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/common_columns.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/common_columns.test.tsx index a312c72ecc25be..4fb6a4d84f7db1 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/common_columns.test.tsx @@ -11,16 +11,16 @@ import React from 'react'; import { ThemeProvider } from 'styled-components'; import { mountWithIntl } from 'test_utils/enzyme_helpers'; -import { getEmptyValue } from '../../empty_value'; +import { getEmptyValue } from '../../../../common/components/empty_value'; import { OpenTimelineResult } from '../types'; -import { mockTimelineResults } from '../../../mock/timeline_results'; +import { mockTimelineResults } from '../../../../common/mock/timeline_results'; import { NotePreviews } from '../note_previews'; import { TimelinesTable, TimelinesTableProps } from '.'; import * as i18n from '../translations'; import { getMockTimelinesTableProps } from './mocks'; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('#getCommonColumns', () => { const theme = () => ({ eui: euiDarkVars, darkMode: true }); diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/common_columns.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/common_columns.tsx index 0d3a73a389050d..e0c7ab68f6bf51 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/common_columns.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/common_columns.tsx @@ -15,8 +15,8 @@ import { isUntitled } from '../helpers'; import { NotePreviews } from '../note_previews'; import * as i18n from '../translations'; import { OnOpenTimeline, OnToggleShowNotes, OpenTimelineResult } from '../types'; -import { getEmptyTagValue } from '../../empty_value'; -import { FormattedRelativePreferenceDate } from '../../formatted_date'; +import { getEmptyTagValue } from '../../../../common/components/empty_value'; +import { FormattedRelativePreferenceDate } from '../../../../common/components/formatted_date'; /** * Returns the column definitions (passed as the `columns` prop to diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/common_styles.ts b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/common_styles.ts similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/common_styles.ts rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/common_styles.ts diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/extended_columns.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/extended_columns.test.tsx index 14409a6bbb5ae9..be7127668f7f1b 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/extended_columns.test.tsx @@ -10,8 +10,8 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { getEmptyValue } from '../../empty_value'; -import { mockTimelineResults } from '../../../mock/timeline_results'; +import { getEmptyValue } from '../../../../common/components/empty_value'; +import { mockTimelineResults } from '../../../../common/mock/timeline_results'; import { OpenTimelineResult } from '../types'; import { TimelinesTable, TimelinesTableProps } from '.'; @@ -19,7 +19,7 @@ import { TimelinesTable, TimelinesTableProps } from '.'; import * as i18n from '../translations'; import { getMockTimelinesTableProps } from './mocks'; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('#getExtendedColumns', () => { const theme = () => ({ eui: euiDarkVars, darkMode: true }); diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/extended_columns.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/extended_columns.tsx index b6d874fa0c4d1a..e50336f5169e88 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/extended_columns.tsx @@ -8,7 +8,7 @@ import React from 'react'; -import { defaultToEmptyTag } from '../../empty_value'; +import { defaultToEmptyTag } from '../../../../common/components/empty_value'; import * as i18n from '../translations'; import { OpenTimelineResult } from '../types'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/icon_header_columns.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/icon_header_columns.test.tsx index 658dd96faa9864..f1df605c072dde 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/icon_header_columns.test.tsx @@ -10,11 +10,11 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { mockTimelineResults } from '../../../mock/timeline_results'; +import { mockTimelineResults } from '../../../../common/mock/timeline_results'; import { TimelinesTable, TimelinesTableProps } from '.'; import { OpenTimelineResult } from '../types'; import { getMockTimelinesTableProps } from './mocks'; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('#getActionsColumns', () => { const theme = () => ({ eui: euiDarkVars, darkMode: true }); diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/icon_header_columns.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/icon_header_columns.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/icon_header_columns.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/index.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/index.test.tsx index 44e6218b5ad259..1ebde8488e46cf 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/index.test.tsx @@ -10,14 +10,14 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { mockTimelineResults } from '../../../mock/timeline_results'; +import { mockTimelineResults } from '../../../../common/mock/timeline_results'; import { OpenTimelineResult } from '../types'; import { TimelinesTable, TimelinesTableProps } from '.'; import { getMockTimelinesTableProps } from './mocks'; import * as i18n from '../translations'; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('TimelinesTable', () => { const theme = () => ({ eui: euiDarkVars, darkMode: true }); diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/index.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/index.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/index.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/mocks.ts b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/mocks.ts similarity index 97% rename from x-pack/plugins/siem/public/components/open_timeline/timelines_table/mocks.ts rename to x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/mocks.ts index 519dfc1b66efee..78ca898cc407e8 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/timelines_table/mocks.ts +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/timelines_table/mocks.ts @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines/timelines_page'; +import { DEFAULT_SEARCH_RESULTS_PER_PAGE } from '../../../pages/timelines_page'; import { DEFAULT_SORT_DIRECTION, DEFAULT_SORT_FIELD } from '../constants'; import { OpenTimelineResult } from '../types'; import { TimelinesTableProps } from '.'; diff --git a/x-pack/plugins/siem/public/components/open_timeline/title_row/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/title_row/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/title_row/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/title_row/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/open_timeline/title_row/index.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/title_row/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/open_timeline/title_row/index.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/title_row/index.tsx index 559bbc3eecb824..e5f921e397b03a 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/title_row/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/title_row/index.tsx @@ -9,7 +9,7 @@ import React from 'react'; import * as i18n from '../translations'; import { OpenTimelineProps } from '../types'; -import { HeaderSection } from '../../header_section'; +import { HeaderSection } from '../../../../common/components/header_section'; type Props = Pick & { /** The number of timelines currently selected */ diff --git a/x-pack/plugins/siem/public/components/open_timeline/translations.ts b/x-pack/plugins/siem/public/timelines/components/open_timeline/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/open_timeline/translations.ts rename to x-pack/plugins/siem/public/timelines/components/open_timeline/translations.ts diff --git a/x-pack/plugins/siem/public/components/open_timeline/types.ts b/x-pack/plugins/siem/public/timelines/components/open_timeline/types.ts similarity index 96% rename from x-pack/plugins/siem/public/components/open_timeline/types.ts rename to x-pack/plugins/siem/public/timelines/components/open_timeline/types.ts index 4d953f6fa775e1..f874b5f58d9856 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/types.ts +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/types.ts @@ -5,10 +5,10 @@ */ import { SetStateAction, Dispatch } from 'react'; -import { AllTimelinesVariables } from '../../containers/timeline/all'; -import { TimelineModel } from '../../store/timeline/model'; -import { NoteResult } from '../../graphql/types'; -import { TimelineType, TimelineTypeLiteral } from '../../../common/types/timeline'; +import { AllTimelinesVariables } from '../../containers/all'; +import { TimelineModel } from '../../../timelines/store/timeline/model'; +import { NoteResult } from '../../../graphql/types'; +import { TimelineType, TimelineTypeLiteral } from '../../../../common/types/timeline'; /** The users who added a timeline to favorites */ export interface FavoriteTimelineResult { diff --git a/x-pack/plugins/siem/public/components/open_timeline/use_timeline_types.tsx b/x-pack/plugins/siem/public/timelines/components/open_timeline/use_timeline_types.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/open_timeline/use_timeline_types.tsx rename to x-pack/plugins/siem/public/timelines/components/open_timeline/use_timeline_types.tsx index 1e23bc5bdda3cb..f99d8c566c4a54 100644 --- a/x-pack/plugins/siem/public/components/open_timeline/use_timeline_types.tsx +++ b/x-pack/plugins/siem/public/timelines/components/open_timeline/use_timeline_types.tsx @@ -7,12 +7,11 @@ import React, { useState, useCallback, useMemo } from 'react'; import { useParams } from 'react-router-dom'; import { EuiTabs, EuiTab, EuiSpacer, EuiFilterButton } from '@elastic/eui'; -import { TimelineTypeLiteralWithNull, TimelineType } from '../../../common/types/timeline'; - -import { getTimelineTabsUrl } from '../link_to'; -import { useGetUrlSearch } from '../navigation/use_get_url_search'; -import { navTabs } from '../../pages/home/home_navigations'; +import { TimelineTypeLiteralWithNull, TimelineType } from '../../../../common/types/timeline'; +import { getTimelineTabsUrl } from '../../../common/components/link_to'; +import { navTabs } from '../../../app/home/home_navigations'; +import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search'; import * as i18n from './translations'; import { TimelineTabsStyle, TimelineTab } from './types'; diff --git a/x-pack/plugins/siem/public/components/timeline/__snapshots__/timeline.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/__snapshots__/timeline.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/__snapshots__/timeline.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/and_or_badge/__examples__/index.stories.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/and_or_badge/__examples__/index.stories.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/and_or_badge/__examples__/index.stories.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/and_or_badge/__examples__/index.stories.tsx diff --git a/x-pack/plugins/siem/public/components/and_or_badge/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/and_or_badge/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/and_or_badge/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/and_or_badge/index.tsx diff --git a/x-pack/plugins/siem/public/components/and_or_badge/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/and_or_badge/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/and_or_badge/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/and_or_badge/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/auto_save_warning/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/auto_save_warning/index.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/timeline/auto_save_warning/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/auto_save_warning/index.tsx index 90d0738aba72f2..210af7a571569a 100644 --- a/x-pack/plugins/siem/public/components/timeline/auto_save_warning/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/auto_save_warning/index.tsx @@ -14,13 +14,12 @@ import { getOr } from 'lodash/fp'; import React from 'react'; import { connect, ConnectedProps } from 'react-redux'; -import { State, timelineSelectors } from '../../../store'; -import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../../store/inputs/actions'; - -import * as i18n from './translations'; -import { timelineActions } from '../../../store/timeline'; +import { State } from '../../../../common/store'; +import { setTimelineRangeDatePicker as dispatchSetTimelineRangeDatePicker } from '../../../../common/store/inputs/actions'; +import { timelineActions, timelineSelectors } from '../../../store/timeline'; import { AutoSavedWarningMsg } from '../../../store/timeline/types'; -import { useStateToaster } from '../../toasters'; +import { useStateToaster } from '../../../../common/components/toasters'; +import * as i18n from './translations'; const AutoSaveWarningMsgComponent = React.memo( ({ diff --git a/x-pack/plugins/siem/public/components/timeline/auto_save_warning/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/auto_save_warning/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/auto_save_warning/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/auto_save_warning/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/actions/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/actions/index.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/timeline/body/actions/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/actions/index.test.tsx index 6055745e9378ee..ee177f4aba05ed 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/actions/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/actions/index.test.tsx @@ -6,7 +6,7 @@ import { mount } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../../../common/mock'; import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../constants'; import { Actions } from '.'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/actions/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/actions/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/body/actions/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/actions/index.tsx index 030e9be7703ed5..d36a064b6cc7d6 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/actions/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/actions/index.tsx @@ -6,15 +6,15 @@ import { EuiButtonIcon, EuiCheckbox, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui'; import React from 'react'; -import { Note } from '../../../../lib/note'; +import { Note } from '../../../../../common/lib/note'; import { AssociateNote, UpdateNote } from '../../../notes/helpers'; -import { Pin } from '../../../pin'; +import { Pin } from '../../pin'; import { NotesButton } from '../../properties/helpers'; import { EventsLoading, EventsTd, EventsTdContent, EventsTdGroupActions } from '../../styles'; import { eventHasNotes, getPinTooltip } from '../helpers'; import * as i18n from '../translations'; import { OnRowSelected } from '../../events'; -import { Ecs } from '../../../../graphql/types'; +import { Ecs } from '../../../../../graphql/types'; export interface TimelineActionProps { eventId: string; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/actions/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/actions/index.tsx index 7a2898d465b225..8ec7c52179b99a 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/actions/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/actions/index.tsx @@ -7,7 +7,7 @@ import { EuiButtonIcon } from '@elastic/eui'; import React from 'react'; -import { ColumnHeaderOptions } from '../../../../../store/timeline/model'; +import { ColumnHeaderOptions } from '../../../../../../timelines/store/timeline/model'; import { OnColumnRemoved } from '../../../events'; import { EventsHeadingExtra, EventsLoading } from '../../../styles'; import { useTimelineContext } from '../../../timeline_context'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/column_header.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/column_header.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/column_header.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/column_header.tsx index e070ed8fa1d2ab..10f2d264d65d2d 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/column_header.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/column_header.tsx @@ -9,8 +9,8 @@ import { Draggable } from 'react-beautiful-dnd'; import { Resizable, ResizeCallback } from 're-resizable'; import deepEqual from 'fast-deep-equal'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; -import { getDraggableFieldId } from '../../../drag_and_drop/helpers'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; +import { getDraggableFieldId } from '../../../../../common/components/drag_and_drop/helpers'; import { OnColumnRemoved, OnColumnSorted, OnFilterChange, OnColumnResized } from '../../events'; import { EventsTh, EventsThContent, EventsHeadingHandle } from '../../styles'; import { Sort } from '../sort'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/common/dragging_container.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/common/dragging_container.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/common/dragging_container.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/common/dragging_container.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/common/styles.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/common/styles.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/common/styles.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/common/styles.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/default_headers.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/default_headers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/default_headers.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/default_headers.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/events_select/helpers.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/events_select/helpers.tsx index 853c1ec24b7031..9b2cb2e97b98a5 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/events_select/helpers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/events_select/helpers.tsx @@ -8,7 +8,7 @@ import { EuiText } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { Pin } from '../../../../pin'; +import { Pin } from '../../../pin'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/events_select/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/events_select/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/events_select/index.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/events_select/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/events_select/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/events_select/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/events_select/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/filter/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/filter/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/filter/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/filter/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx index f0f6ce8d0ed6ff..9d1920b03c9bec 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/filter/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/filter/index.test.tsx @@ -7,7 +7,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { ColumnHeaderType } from '../../../../../store/timeline/model'; +import { ColumnHeaderType } from '../../../../../../timelines/store/timeline/model'; import { defaultHeaders } from '../default_headers'; import { Filter } from '.'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/filter/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/filter/index.tsx index 911a309edfd987..9daccf27399fb6 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/filter/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/filter/index.tsx @@ -8,7 +8,7 @@ import { noop } from 'lodash/fp'; import React from 'react'; import { OnFilterChange } from '../../../events'; -import { ColumnHeaderOptions } from '../../../../../store/timeline/model'; +import { ColumnHeaderOptions } from '../../../../../../timelines/store/timeline/model'; import { TextFilter } from '../text_filter'; interface Props { diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/header_content.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/header_content.tsx index 0a69cef6185706..83e3728c149016 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header/header_content.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/header_content.tsx @@ -8,8 +8,8 @@ import { EuiToolTip } from '@elastic/eui'; import { noop } from 'lodash/fp'; import React from 'react'; -import { ColumnHeaderOptions } from '../../../../../store/timeline/model'; -import { TruncatableText } from '../../../../truncatable_text'; +import { ColumnHeaderOptions } from '../../../../../../timelines/store/timeline/model'; +import { TruncatableText } from '../../../../../../common/components/truncatable_text'; import { EventsHeading, EventsHeadingTitleButton, EventsHeadingTitleSpan } from '../../../styles'; import { useTimelineContext } from '../../../timeline_context'; import { Sort } from '../../sort'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header/helpers.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/helpers.ts similarity index 86% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/header/helpers.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/helpers.ts index 47ce21e4c96371..6d70795c422d93 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header/helpers.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/helpers.ts @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Direction } from '../../../../../graphql/types'; -import { assertUnreachable } from '../../../../../lib/helpers'; -import { ColumnHeaderOptions } from '../../../../../store/timeline/model'; +import { Direction } from '../../../../../../graphql/types'; +import { assertUnreachable } from '../../../../../../common/lib/helpers'; +import { ColumnHeaderOptions } from '../../../../../../timelines/store/timeline/model'; import { Sort, SortDirection } from '../../sort'; interface GetNewSortDirectionOnClickParams { diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/index.test.tsx index 80ae2aab0a19c2..dfbb5508f27c74 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/index.test.tsx @@ -7,9 +7,9 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { Direction } from '../../../../../graphql/types'; -import { TestProviders } from '../../../../../mock'; -import { ColumnHeaderType } from '../../../../../store/timeline/model'; +import { Direction } from '../../../../../../graphql/types'; +import { TestProviders } from '../../../../../../common/mock'; +import { ColumnHeaderType } from '../../../../../../timelines/store/timeline/model'; import { Sort } from '../../sort'; import { CloseButton } from '../actions'; import { defaultHeaders } from '../default_headers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/header/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/index.tsx index 82c5d7eb73f024..854d45449c92cd 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header/index.tsx @@ -7,7 +7,7 @@ import { noop } from 'lodash/fp'; import React, { useCallback } from 'react'; -import { ColumnHeaderOptions } from '../../../../../store/timeline/model'; +import { ColumnHeaderOptions } from '../../../../../../timelines/store/timeline/model'; import { OnColumnRemoved, OnColumnSorted, OnFilterChange } from '../../../events'; import { Sort } from '../../sort'; import { Actions } from '../actions'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header_tooltip_content/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header_tooltip_content/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx index 9afc852373bc6c..534dd7bc9b73c2 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.test.tsx @@ -8,8 +8,8 @@ import { mount, shallow } from 'enzyme'; import { cloneDeep } from 'lodash/fp'; import React from 'react'; -import { ColumnHeaderOptions } from '../../../../../store/timeline/model'; -import { defaultHeaders } from '../../../../../mock'; +import { ColumnHeaderOptions } from '../../../../../../timelines/store/timeline/model'; +import { defaultHeaders } from '../../../../../../common/mock'; import { HeaderToolTipContent } from '.'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.tsx index bef4bcc42b0c78..efad85775a9e46 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/header_tooltip_content/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/header_tooltip_content/index.tsx @@ -9,8 +9,8 @@ import { isEmpty } from 'lodash/fp'; import React from 'react'; import styled from 'styled-components'; -import { ColumnHeaderOptions } from '../../../../../store/timeline/model'; -import { getIconFromType } from '../../../../event_details/helpers'; +import { ColumnHeaderOptions } from '../../../../../../timelines/store/timeline/model'; +import { getIconFromType } from '../../../../../../common/components/event_details/helpers'; import * as i18n from '../translations'; const IconType = styled(EuiIcon)` diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/helpers.test.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/helpers.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/helpers.test.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/helpers.test.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/helpers.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/helpers.ts similarity index 90% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/helpers.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/helpers.ts index 6923831f9ef634..7c29f1498d0df7 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/helpers.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/helpers.ts @@ -6,8 +6,8 @@ import { get } from 'lodash/fp'; -import { BrowserFields } from '../../../../containers/source'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; +import { BrowserFields } from '../../../../../common/containers/source'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; import { DEFAULT_COLUMN_MIN_WIDTH, DEFAULT_DATE_COLUMN_MIN_WIDTH, diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/index.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/index.test.tsx index 4fafacfd01633c..446e6f2758e4c5 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/index.test.tsx @@ -9,11 +9,11 @@ import React from 'react'; import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../constants'; import { defaultHeaders } from './default_headers'; -import { Direction } from '../../../../graphql/types'; -import { mockBrowserFields } from '../../../../../public/containers/source/mock'; +import { Direction } from '../../../../../graphql/types'; +import { mockBrowserFields } from '../../../../../common/containers/source/mock'; import { Sort } from '../sort'; -import { TestProviders } from '../../../../mock/test_providers'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { TestProviders } from '../../../../../common/mock/test_providers'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; import { ColumnHeadersComponent } from '.'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/index.tsx index 7a072f1dbf578b..7a5ce5ac3c7c9f 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/column_headers/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/index.tsx @@ -10,11 +10,14 @@ import React, { useState, useEffect, useCallback, useMemo } from 'react'; import { Droppable, DraggableChildrenFn } from 'react-beautiful-dnd'; import deepEqual from 'fast-deep-equal'; -import { DragEffects } from '../../../drag_and_drop/draggable_wrapper'; -import { DraggableFieldBadge } from '../../../draggables/field_badge'; -import { BrowserFields } from '../../../../containers/source'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; -import { DRAG_TYPE_FIELD, droppableTimelineColumnsPrefix } from '../../../drag_and_drop/helpers'; +import { DragEffects } from '../../../../../common/components/drag_and_drop/draggable_wrapper'; +import { DraggableFieldBadge } from '../../../../../common/components/draggables/field_badge'; +import { BrowserFields } from '../../../../../common/containers/source'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; +import { + DRAG_TYPE_FIELD, + droppableTimelineColumnsPrefix, +} from '../../../../../common/components/drag_and_drop/helpers'; import { StatefulFieldsBrowser } from '../../../fields_browser'; import { FIELD_BROWSER_HEIGHT, FIELD_BROWSER_WIDTH } from '../../../fields_browser/helpers'; import { diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/range_picker/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/range_picker/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/range_picker/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/range_picker/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/range_picker/index.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/range_picker/ranges.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/range_picker/ranges.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/range_picker/ranges.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/range_picker/ranges.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/range_picker/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/range_picker/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/range_picker/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/range_picker/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/text_filter/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/text_filter/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/text_filter/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/text_filter/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/text_filter/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/text_filter/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/text_filter/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/text_filter/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/text_filter/index.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_headers/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_headers/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_headers/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/column_id.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/column_id.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/column_id.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/column_id.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/constants.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/constants.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/constants.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/constants.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/data_driven_columns/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/data_driven_columns/index.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/data_driven_columns/index.test.tsx index 098bd3108dba16..8a2cc88eea9106 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/data_driven_columns/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/data_driven_columns/index.test.tsx @@ -7,7 +7,7 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { mockTimelineData } from '../../../../mock'; +import { mockTimelineData } from '../../../../../common/mock'; import { defaultHeaders } from '../column_headers/default_headers'; import { columnRenderers } from '../renderers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/data_driven_columns/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/data_driven_columns/index.tsx index c15c468373c5ac..da00e4054a763d 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/data_driven_columns/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/data_driven_columns/index.tsx @@ -7,8 +7,8 @@ import React from 'react'; import { getOr } from 'lodash/fp'; -import { Ecs, TimelineNonEcsData } from '../../../../graphql/types'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; +import { Ecs, TimelineNonEcsData } from '../../../../../graphql/types'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; import { OnColumnResized } from '../../events'; import { EventsTd, EventsTdContent, EventsTdGroupData } from '../../styles'; import { ColumnRenderer } from '../renderers/column_renderer'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/events/event_column_view.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/events/event_column_view.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/events/event_column_view.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/events/event_column_view.tsx index daf9c3d8b1f963..2b143d34d3814e 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/events/event_column_view.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/events/event_column_view.tsx @@ -7,9 +7,9 @@ import React, { useMemo } from 'react'; import uuid from 'uuid'; -import { TimelineNonEcsData, Ecs } from '../../../../graphql/types'; -import { Note } from '../../../../lib/note'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; +import { TimelineNonEcsData, Ecs } from '../../../../../graphql/types'; +import { Note } from '../../../../../common/lib/note'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; import { AssociateNote, UpdateNote } from '../../../notes/helpers'; import { OnColumnResized, OnPinEvent, OnRowSelected, OnUnPinEvent } from '../../events'; import { EventsTdContent, EventsTrData } from '../../styles'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/events/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/events/index.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/timeline/body/events/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/events/index.tsx index 4178bc656f32d3..fc892f5b8e6b13 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/events/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/events/index.tsx @@ -6,11 +6,11 @@ import React from 'react'; -import { BrowserFields } from '../../../../containers/source'; -import { TimelineItem, TimelineNonEcsData } from '../../../../graphql/types'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; -import { maxDelay } from '../../../../lib/helpers/scheduler'; -import { Note } from '../../../../lib/note'; +import { BrowserFields } from '../../../../../common/containers/source'; +import { TimelineItem, TimelineNonEcsData } from '../../../../../graphql/types'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; +import { maxDelay } from '../../../../../common/lib/helpers/scheduler'; +import { Note } from '../../../../../common/lib/note'; import { AddNoteToEvent, UpdateNote } from '../../../notes/helpers'; import { OnColumnResized, diff --git a/x-pack/plugins/siem/public/components/timeline/body/events/stateful_event.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/events/stateful_event.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/events/stateful_event.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/events/stateful_event.tsx index 6e5c292064dc63..61c58095189285 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/events/stateful_event.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/events/stateful_event.tsx @@ -8,14 +8,14 @@ import React, { useEffect, useRef, useState, useCallback } from 'react'; import uuid from 'uuid'; import VisibilitySensor from 'react-visibility-sensor'; -import { BrowserFields } from '../../../../containers/source'; -import { TimelineDetailsQuery } from '../../../../containers/timeline/details'; -import { TimelineItem, DetailItem, TimelineNonEcsData } from '../../../../graphql/types'; -import { requestIdleCallbackViaScheduler } from '../../../../lib/helpers/scheduler'; -import { Note } from '../../../../lib/note'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; +import { BrowserFields } from '../../../../../common/containers/source'; +import { TimelineDetailsQuery } from '../../../../containers/details'; +import { TimelineItem, DetailItem, TimelineNonEcsData } from '../../../../../graphql/types'; +import { requestIdleCallbackViaScheduler } from '../../../../../common/lib/helpers/scheduler'; +import { Note } from '../../../../../common/lib/note'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; import { AddNoteToEvent, UpdateNote } from '../../../notes/helpers'; -import { SkeletonRow } from '../../../skeleton_row'; +import { SkeletonRow } from '../../skeleton_row'; import { OnColumnResized, OnPinEvent, @@ -31,7 +31,7 @@ import { getRowRenderer } from '../renderers/get_row_renderer'; import { RowRenderer } from '../renderers/row_renderer'; import { getEventType } from '../helpers'; import { NoteCards } from '../../../notes/note_cards'; -import { useEventDetailsWidthContext } from '../../../events_viewer/event_details_width_context'; +import { useEventDetailsWidthContext } from '../../../../../common/components/events_viewer/event_details_width_context'; import { EventColumnView } from './event_column_view'; interface Props { diff --git a/x-pack/plugins/siem/public/components/timeline/body/helpers.test.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/helpers.test.ts similarity index 99% rename from x-pack/plugins/siem/public/components/timeline/body/helpers.test.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/helpers.test.ts index f021bf38b56c2d..e237e99df9ada4 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/helpers.test.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/helpers.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Ecs } from '../../../graphql/types'; +import { Ecs } from '../../../../graphql/types'; import { eventHasNotes, eventIsPinned, getPinTooltip, stringifyEvent } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/helpers.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/helpers.ts similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/helpers.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/helpers.ts index 3d1d165ef4fa60..a3eb3cc651f7ac 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/helpers.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/helpers.ts @@ -5,8 +5,8 @@ */ import { isEmpty, noop } from 'lodash/fp'; -import { Ecs, TimelineItem, TimelineNonEcsData } from '../../../graphql/types'; -import { EventType } from '../../../store/timeline/model'; +import { Ecs, TimelineItem, TimelineNonEcsData } from '../../../../graphql/types'; +import { EventType } from '../../../../timelines/store/timeline/model'; import { OnPinEvent, OnUnPinEvent } from '../events'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/index.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/index.test.tsx index cf35c8e565bbc0..c2c3f4dd7f12ef 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/index.test.tsx @@ -6,16 +6,16 @@ import React from 'react'; -import { mockBrowserFields } from '../../../containers/source/mock'; -import { Direction } from '../../../graphql/types'; -import { defaultHeaders, mockTimelineData } from '../../../mock'; -import { TestProviders } from '../../../mock/test_providers'; +import { mockBrowserFields } from '../../../../common/containers/source/mock'; +import { Direction } from '../../../../graphql/types'; +import { defaultHeaders, mockTimelineData } from '../../../../common/mock'; +import { TestProviders } from '../../../../common/mock/test_providers'; import { Body, BodyProps } from '.'; import { columnRenderers, rowRenderers } from './renderers'; import { Sort } from './sort'; -import { wait } from '../../../lib/helpers'; -import { useMountAppended } from '../../../utils/use_mount_appended'; +import { wait } from '../../../../common/lib/helpers'; +import { useMountAppended } from '../../../../common/utils/use_mount_appended'; const testBodyHeight = 700; const mockGetNotesByIds = (eventId: string[]) => []; @@ -30,7 +30,7 @@ jest.mock( children({ isVisible: true }) ); -jest.mock('../../../lib/helpers/scheduler', () => ({ +jest.mock('../../../../common/lib/helpers/scheduler', () => ({ requestIdleCallbackViaScheduler: (callback: () => void, opts?: unknown) => { callback(); }, diff --git a/x-pack/plugins/siem/public/components/timeline/body/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/index.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/index.tsx index fac8cc61cddd2e..391d19cb7855c9 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/index.tsx @@ -6,10 +6,10 @@ import React, { useMemo, useRef } from 'react'; -import { BrowserFields } from '../../../containers/source'; -import { TimelineItem, TimelineNonEcsData } from '../../../graphql/types'; -import { Note } from '../../../lib/note'; -import { ColumnHeaderOptions } from '../../../store/timeline/model'; +import { BrowserFields } from '../../../../common/containers/source'; +import { TimelineItem, TimelineNonEcsData } from '../../../../graphql/types'; +import { Note } from '../../../../common/lib/note'; +import { ColumnHeaderOptions } from '../../../../timelines/store/timeline/model'; import { AddNoteToEvent, UpdateNote } from '../../notes/helpers'; import { OnColumnRemoved, diff --git a/x-pack/plugins/siem/public/components/timeline/body/mini_map/date_ranges.test.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/mini_map/date_ranges.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/mini_map/date_ranges.test.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/mini_map/date_ranges.test.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/mini_map/date_ranges.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/mini_map/date_ranges.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/mini_map/date_ranges.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/mini_map/date_ranges.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/args.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/args.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/args.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/args.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/empty_column_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/empty_column_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/empty_column_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/empty_column_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/formatted_field.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/get_column_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_row_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/get_row_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/get_row_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/get_row_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/host_working_dir.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/host_working_dir.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/host_working_dir.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/host_working_dir.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/plain_column_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_row_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/plain_row_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/plain_row_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/plain_row_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/process_draggable.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/process_draggable.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/process_draggable.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/process_draggable.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/unknown_column_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/unknown_column_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/unknown_column_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/unknown_column_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/user_host_working_dir.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/user_host_working_dir.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/__snapshots__/user_host_working_dir.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/__snapshots__/user_host_working_dir.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/args.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/args.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/args.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/args.test.tsx index 53a20544124400..e7e7d1d47f4783 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/args.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/args.test.tsx @@ -7,8 +7,8 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; -import { TestProviders } from '../../../../mock'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; +import { TestProviders } from '../../../../../common/mock'; import { ArgsComponent } from './args'; describe('Args', () => { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/args.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/args.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/args.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/args.tsx index 22367ec879851a..f421b471282be9 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/args.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/args.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../draggables'; +import { DraggableBadge } from '../../../../../common/components/draggables'; import { isNillEmptyOrNotFinite, TokensFlexItem } from './helpers'; interface Props { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/generic_details.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_details.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/generic_details.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_details.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/generic_file_details.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_file_details.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/generic_file_details.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_file_details.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/generic_row_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/primary_secondary_user_info.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/primary_secondary_user_info.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/primary_secondary_user_info.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/primary_secondary_user_info.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/session_user_host_working_dir.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/session_user_host_working_dir.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/__snapshots__/session_user_host_working_dir.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/__snapshots__/session_user_host_working_dir.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx index 21cccc88f4fbce..b4c95d383593af 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_details.test.tsx @@ -7,11 +7,11 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { mockTimelineData, TestProviders } from '../../../../../mock'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { mockTimelineData, TestProviders } from '../../../../../../common/mock'; import { AuditdGenericDetails, AuditdGenericLine } from './generic_details'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; describe('GenericDetails', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx index c25c656b75e41f..1e82519285da38 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_details.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_details.tsx @@ -8,9 +8,9 @@ import { EuiFlexGroup, EuiSpacer } from '@elastic/eui'; import { get } from 'lodash/fp'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { Ecs } from '../../../../../graphql/types'; -import { DraggableBadge } from '../../../../draggables'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { Ecs } from '../../../../../../graphql/types'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; import * as i18n from './translations'; import { NetflowRenderer } from '../netflow'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx index fce0e1d645e164..0990280879a140 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.test.tsx @@ -7,11 +7,11 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { mockTimelineData, TestProviders } from '../../../../../mock'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { mockTimelineData, TestProviders } from '../../../../../../common/mock'; import { AuditdGenericFileDetails, AuditdGenericFileLine } from './generic_file_details'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; describe('GenericFileDetails', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx index 797361878e6c53..d9149bae891903 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_file_details.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_file_details.tsx @@ -8,9 +8,9 @@ import { EuiFlexGroup, EuiSpacer, IconType } from '@elastic/eui'; import { get } from 'lodash/fp'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { Ecs } from '../../../../../graphql/types'; -import { DraggableBadge } from '../../../../draggables'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { Ecs } from '../../../../../../graphql/types'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; import * as i18n from './translations'; import { NetflowRenderer } from '../netflow'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx index 417a078a081509..ae5e7e2ef789b7 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.test.tsx @@ -8,18 +8,18 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash/fp'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { Ecs } from '../../../../../graphql/types'; -import { mockTimelineData, TestProviders } from '../../../../../mock'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { Ecs } from '../../../../../../graphql/types'; +import { mockTimelineData, TestProviders } from '../../../../../../common/mock'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { RowRenderer } from '../row_renderer'; import { createGenericAuditRowRenderer, createGenericFileRowRenderer, } from './generic_row_renderer'; -jest.mock('../../../../../pages/overview/events_by_dataset'); +jest.mock('../../../../../../overview/components/events_by_dataset'); describe('GenericRowRenderer', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/generic_row_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/generic_row_renderer.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx index 598769e854b422..41e35427ae2542 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/primary_secondary_user_info.test.tsx @@ -7,9 +7,9 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../../../mock'; +import { TestProviders } from '../../../../../../common/mock'; import { PrimarySecondaryUserInfo, nilOrUnSet } from './primary_secondary_user_info'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; describe('UserPrimarySecondary', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx index a54042d3de9d87..8c9191181d93b5 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/primary_secondary_user_info.tsx @@ -7,7 +7,7 @@ import { EuiFlexGroup } from '@elastic/eui'; import React from 'react'; -import { DraggableBadge } from '../../../../draggables'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; import * as i18n from './translations'; import { TokensFlexItem } from '../helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx index a0a9977f5765e3..d1e67c25bd79c5 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/session_user_host_working_dir.test.tsx @@ -8,9 +8,9 @@ import { EuiFlexItem } from '@elastic/eui'; import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../../../mock'; +import { TestProviders } from '../../../../../../common/mock'; import { SessionUserHostWorkingDir } from './session_user_host_working_dir'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; describe('SessionUserHostWorkingDir', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx index 6a6b55bb817c84..fb2fd7a4b04b05 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/session_user_host_working_dir.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../../draggables'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; import * as i18n from './translations'; import { TokensFlexItem } from '../helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/auditd/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/auditd/translations.ts diff --git a/x-pack/plugins/siem/public/components/bytes/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/bytes/index.test.tsx similarity index 74% rename from x-pack/plugins/siem/public/components/bytes/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/bytes/index.test.tsx index d99a909efad102..06f392683cbf17 100644 --- a/x-pack/plugins/siem/public/components/bytes/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/bytes/index.test.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import { TestProviders } from '../../mock'; -import { PreferenceFormattedBytes } from '../formatted_bytes'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { TestProviders } from '../../../../../../common/mock'; +import { PreferenceFormattedBytes } from '../../../../../../common/components/formatted_bytes'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { Bytes } from '.'; diff --git a/x-pack/plugins/siem/public/components/bytes/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/bytes/index.tsx similarity index 83% rename from x-pack/plugins/siem/public/components/bytes/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/bytes/index.tsx index 94c6ecba68be52..a8dfe939d28dd8 100644 --- a/x-pack/plugins/siem/public/components/bytes/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/bytes/index.tsx @@ -6,8 +6,8 @@ import React from 'react'; -import { DefaultDraggable } from '../draggables'; -import { PreferenceFormattedBytes } from '../formatted_bytes'; +import { DefaultDraggable } from '../../../../../../common/components/draggables'; +import { PreferenceFormattedBytes } from '../../../../../../common/components/formatted_bytes'; export const BYTES_FORMAT = 'bytes'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/column_renderer.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/column_renderer.ts similarity index 82% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/column_renderer.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/column_renderer.ts index a13de90e7aed3d..4a89fea8c51067 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/column_renderer.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/column_renderer.ts @@ -4,8 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ -import { TimelineNonEcsData } from '../../../../graphql/types'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; export interface ColumnRenderer { isInstance: (columnName: string, data: TimelineNonEcsData[]) => boolean; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/constants.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/constants.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/constants.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/constants.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx similarity index 82% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx index a7c9d10e82a2fd..ba77709459c28e 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.test.tsx @@ -11,10 +11,10 @@ import React from 'react'; -import { TestProviders } from '../../../../../mock'; -import { mockBrowserFields } from '../../../../../../public/containers/source/mock'; -import { mockEndgameDnsRequest } from '../../../../../../public/mock/mock_endgame_ecs_data'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { TestProviders } from '../../../../../../common/mock'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { mockEndgameDnsRequest } from '../../../../../../common/mock/mock_endgame_ecs_data'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { DnsRequestEventDetails } from './dns_request_event_details'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx index 824e8c00de307a..74ed5b2a6587fa 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details.tsx @@ -8,9 +8,9 @@ import { EuiSpacer } from '@elastic/eui'; import { get } from 'lodash/fp'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; +import { BrowserFields } from '../../../../../../common/containers/source'; import { Details } from '../helpers'; -import { Ecs } from '../../../../../graphql/types'; +import { Ecs } from '../../../../../../graphql/types'; import { NetflowRenderer } from '../netflow'; import { DnsRequestEventDetailsLine } from './dns_request_event_details_line'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx index e12eacd73559de..1d46e4c3eb02d7 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details_line.test.tsx @@ -11,10 +11,10 @@ import React from 'react'; -import { TestProviders } from '../../../../../mock'; +import { TestProviders } from '../../../../../../common/mock'; import { DnsRequestEventDetailsLine } from './dns_request_event_details_line'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; describe('DnsRequestEventDetailsLine', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx index c7a08620bebbbe..eafe64f13c25cf 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/dns_request_event_details_line.tsx @@ -7,7 +7,7 @@ import { EuiFlexGroup } from '@elastic/eui'; import React from 'react'; -import { DraggableBadge } from '../../../../draggables'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; import { isNillEmptyOrNotFinite, TokensFlexItem } from '../helpers'; import { ProcessDraggableWithNonExistentProcess } from '../process_draggable'; import { UserHostWorkingDir } from '../user_host_working_dir'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/dns/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/dns/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/dns/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/empty_column_renderer.test.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/empty_column_renderer.test.tsx index b31d01b8e94a0f..4514ce5e9bb069 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/empty_column_renderer.test.tsx @@ -8,10 +8,10 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash/fp'; import React from 'react'; -import { TimelineNonEcsData } from '../../../../graphql/types'; -import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; -import { getEmptyValue } from '../../../empty_value'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; +import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../../common/mock'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; +import { getEmptyValue } from '../../../../../common/components/empty_value'; import { deleteItemIdx, findItem } from './helpers'; import { emptyColumnRenderer } from './empty_column_renderer'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/empty_column_renderer.tsx similarity index 81% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/empty_column_renderer.tsx index 45ef46616718d1..9769e23b57aff4 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/empty_column_renderer.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/empty_column_renderer.tsx @@ -8,11 +8,14 @@ import React from 'react'; -import { TimelineNonEcsData } from '../../../../graphql/types'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; -import { DraggableWrapper, DragEffects } from '../../../drag_and_drop/draggable_wrapper'; -import { escapeDataProviderId } from '../../../drag_and_drop/helpers'; -import { getEmptyValue } from '../../../empty_value'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; +import { + DraggableWrapper, + DragEffects, +} from '../../../../../common/components/drag_and_drop/draggable_wrapper'; +import { escapeDataProviderId } from '../../../../../common/components/drag_and_drop/helpers'; +import { getEmptyValue } from '../../../../../common/components/empty_value'; import { EXISTS_OPERATOR } from '../../data_providers/data_provider'; import { Provider } from '../../data_providers/provider'; import { ColumnRenderer } from './column_renderer'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx index 72b879d4ade78b..e84cb93b871781 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.test.tsx @@ -11,15 +11,15 @@ import React from 'react'; -import { TestProviders } from '../../../../../mock'; -import { mockBrowserFields } from '../../../../../../public/containers/source/mock'; +import { TestProviders } from '../../../../../../common/mock'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; import { mockEndgameAdminLogon, mockEndgameExplicitUserLogon, mockEndgameUserLogon, mockEndgameUserLogoff, -} from '../../../../../../public/mock/mock_endgame_ecs_data'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +} from '../../../../../../common/mock/mock_endgame_ecs_data'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { EndgameSecurityEventDetails } from './endgame_security_event_details'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx index 35a88f52f05a3a..11580e2536ff7e 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details.tsx @@ -8,8 +8,8 @@ import { EuiSpacer } from '@elastic/eui'; import { get } from 'lodash/fp'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { Ecs } from '../../../../../graphql/types'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { Ecs } from '../../../../../../graphql/types'; import { NetflowRenderer } from '../netflow'; import { EndgameSecurityEventDetailsLine } from './endgame_security_event_details_line'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx index 4e522f6ed5c94f..b2b4b021e5db53 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.test.tsx @@ -11,10 +11,10 @@ import React from 'react'; -import { TestProviders } from '../../../../../mock'; +import { TestProviders } from '../../../../../../common/mock'; import { EndgameSecurityEventDetailsLine } from './endgame_security_event_details_line'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; describe('EndgameSecurityEventDetailsLine', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx index c2c42ba0e4ddcf..c2bccc24fd9945 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/endgame_security_event_details_line.tsx @@ -7,7 +7,7 @@ import { EuiFlexGroup } from '@elastic/eui'; import React from 'react'; -import { DraggableBadge } from '../../../../draggables'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; import { isNillEmptyOrNotFinite, TokensFlexItem } from '../helpers'; import { ProcessDraggableWithNonExistentProcess } from '../process_draggable'; import { UserHostWorkingDir } from '../user_host_working_dir'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/helpers.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/helpers.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/helpers.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/helpers.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/helpers.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/helpers.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/endgame/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/endgame/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/exit_code_draggable.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/exit_code_draggable.test.tsx index 4da236bfa34c30..4471c26ef8fd7b 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/exit_code_draggable.test.tsx @@ -6,8 +6,8 @@ import React from 'react'; -import { TestProviders } from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { TestProviders } from '../../../../../common/mock'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; import { ExitCodeDraggable } from './exit_code_draggable'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/exit_code_draggable.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/exit_code_draggable.tsx index 7671e3f0509a53..8aba73f5373e91 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/exit_code_draggable.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/exit_code_draggable.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../draggables'; +import { DraggableBadge } from '../../../../../common/components/draggables'; import { isNillEmptyOrNotFinite, TokensFlexItem } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/file_draggable.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/file_draggable.test.tsx index d800821f8d8a5f..70e0e74675cd2f 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/file_draggable.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/file_draggable.test.tsx @@ -6,10 +6,10 @@ import React from 'react'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../../../common/mock'; import { FileDraggable } from './file_draggable'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; describe('FileDraggable', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/file_draggable.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/file_draggable.tsx index e4871c6479c6be..bdf223d215a1cc 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/file_draggable.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/file_draggable.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../draggables'; +import { DraggableBadge } from '../../../../../common/components/draggables'; import { isNillEmptyOrNotFinite, TokensFlexItem } from './helpers'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/formatted_field.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/formatted_field.test.tsx index 73f7b004ca3f71..64f4656e7e790a 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/formatted_field.test.tsx @@ -8,14 +8,14 @@ import { shallow } from 'enzyme'; import { get } from 'lodash/fp'; import React from 'react'; -import { mockTimelineData, TestProviders } from '../../../../mock'; -import { getEmptyValue } from '../../../empty_value'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { mockTimelineData, TestProviders } from '../../../../../common/mock'; +import { getEmptyValue } from '../../../../../common/components/empty_value'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; import { FormattedFieldValue } from './formatted_field'; import { HOST_NAME_FIELD_NAME } from './constants'; -jest.mock('../../../../lib/kibana'); +jest.mock('../../../../../common/lib/kibana'); describe('Events', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/formatted_field.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/formatted_field.tsx index 0f650d6386194b..d03f0573dc2b0a 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/formatted_field.tsx @@ -8,16 +8,19 @@ import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui'; import { isNumber, isString, isEmpty } from 'lodash/fp'; import React from 'react'; -import { DefaultDraggable } from '../../../draggables'; -import { Bytes, BYTES_FORMAT } from '../../../bytes'; +import { DefaultDraggable } from '../../../../../common/components/draggables'; +import { Bytes, BYTES_FORMAT } from './bytes'; import { Duration, EVENT_DURATION_FIELD_NAME } from '../../../duration'; -import { getOrEmptyTagFromValue, getEmptyTagValue } from '../../../empty_value'; -import { FormattedDate } from '../../../formatted_date'; -import { FormattedIp } from '../../../formatted_ip'; -import { HostDetailsLink } from '../../../links'; +import { + getOrEmptyTagFromValue, + getEmptyTagValue, +} from '../../../../../common/components/empty_value'; +import { FormattedDate } from '../../../../../common/components/formatted_date'; +import { FormattedIp } from '../../../../components/formatted_ip'; +import { HostDetailsLink } from '../../../../../common/components/links'; -import { Port, PORT_NAMES } from '../../../port'; -import { TruncatableText } from '../../../truncatable_text'; +import { Port, PORT_NAMES } from '../../../../../network/components/port'; +import { TruncatableText } from '../../../../../common/components/truncatable_text'; import { DATE_FIELD_TYPE, HOST_NAME_FIELD_NAME, diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field_helpers.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field_helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx index 7c9accd4cef49e..bbf8c5af3be970 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/formatted_field_helpers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/formatted_field_helpers.tsx @@ -9,13 +9,13 @@ import { isString, isEmpty } from 'lodash/fp'; import React from 'react'; import styled from 'styled-components'; -import { DefaultDraggable } from '../../../draggables'; -import { getEmptyTagValue } from '../../../empty_value'; -import { getRuleDetailsUrl } from '../../../link_to/redirect_to_detection_engine'; -import { TruncatableText } from '../../../truncatable_text'; +import { DefaultDraggable } from '../../../../../common/components/draggables'; +import { getEmptyTagValue } from '../../../../../common/components/empty_value'; +import { getRuleDetailsUrl } from '../../../../../common/components/link_to/redirect_to_detection_engine'; +import { TruncatableText } from '../../../../../common/components/truncatable_text'; -import { isUrlInvalid } from '../../../../pages/detection_engine/rules/components/step_about_rule/helpers'; -import endPointSvg from '../../../../utils/logo_endpoint/64_color.svg'; +import { isUrlInvalid } from '../../../../../alerts/components/rules/step_about_rule/helpers'; +import endPointSvg from '../../../../../common/utils/logo_endpoint/64_color.svg'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_column_renderer.test.tsx similarity index 89% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_column_renderer.test.tsx index 25d5c71caf48ab..12b093bd517c8c 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_column_renderer.test.tsx @@ -8,16 +8,16 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash/fp'; import React from 'react'; -import { TimelineNonEcsData } from '../../../../graphql/types'; -import { mockTimelineData } from '../../../../mock'; -import { TestProviders } from '../../../../mock/test_providers'; -import { getEmptyValue } from '../../../empty_value'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; +import { mockTimelineData } from '../../../../../common/mock'; +import { TestProviders } from '../../../../../common/mock/test_providers'; +import { getEmptyValue } from '../../../../../common/components/empty_value'; import { defaultHeaders } from '../column_headers/default_headers'; import { columnRenderers } from '.'; import { getColumnRenderer } from './get_column_renderer'; import { getValues, findItem, deleteItemIdx } from './helpers'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; describe('get_column_renderer', () => { let nonSuricata: TimelineNonEcsData[]; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_column_renderer.ts similarity index 91% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_column_renderer.ts index 22aa14d598c135..03d041aef1e702 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/get_column_renderer.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_column_renderer.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { TimelineNonEcsData } from '../../../../graphql/types'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; import { ColumnRenderer } from './column_renderer'; const unhandledColumnRenderer = (): never => { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx index 7ad8cfed5256ba..3222f8a2362db8 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_row_renderer.test.tsx @@ -8,11 +8,11 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash'; import React from 'react'; -import { mockBrowserFields } from '../../../../containers/source/mock'; -import { Ecs } from '../../../../graphql/types'; -import { mockTimelineData } from '../../../../mock'; -import { TestProviders } from '../../../../mock/test_providers'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { mockBrowserFields } from '../../../../../common/containers/source/mock'; +import { Ecs } from '../../../../../graphql/types'; +import { mockTimelineData } from '../../../../../common/mock'; +import { TestProviders } from '../../../../../common/mock/test_providers'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; import { rowRenderers } from '.'; import { getRowRenderer } from './get_row_renderer'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_row_renderer.ts similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_row_renderer.ts index b5a585d4638198..2e90c589e65329 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/get_row_renderer.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/get_row_renderer.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Ecs } from '../../../../graphql/types'; +import { Ecs } from '../../../../../graphql/types'; import { RowRenderer } from './row_renderer'; const unhandledRowRenderer = (): never => { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/helpers.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/helpers.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/helpers.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/helpers.test.tsx index 98a99cb6e40897..82704d544b8b9f 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/helpers.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/helpers.test.tsx @@ -6,8 +6,8 @@ import { cloneDeep } from 'lodash/fp'; -import { TimelineNonEcsData } from '../../../../graphql/types'; -import { mockTimelineData } from '../../../../mock'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; +import { mockTimelineData } from '../../../../../common/mock'; import { deleteItemIdx, findItem, diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/helpers.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/helpers.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/helpers.tsx index 26aa5cea51ce73..7cda5aa3c59f78 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/helpers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/helpers.tsx @@ -8,7 +8,7 @@ import { EuiFlexItem } from '@elastic/eui'; import { isNumber, isEmpty } from 'lodash/fp'; import styled from 'styled-components'; -import { TimelineNonEcsData } from '../../../../graphql/types'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; export const deleteItemIdx = (data: TimelineNonEcsData[], idx: number) => [ ...data.slice(0, idx), diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/host_working_dir.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/host_working_dir.test.tsx index d84dfcc5618826..85a000bbcaf638 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/host_working_dir.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/host_working_dir.test.tsx @@ -7,8 +7,8 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { mockTimelineData, TestProviders } from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { mockTimelineData, TestProviders } from '../../../../../common/mock'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; import { HostWorkingDir } from './host_working_dir'; describe('HostWorkingDir', () => { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/host_working_dir.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/host_working_dir.tsx index db49df30be473f..89d46dd287ffd8 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/host_working_dir.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/host_working_dir.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../draggables'; +import { DraggableBadge } from '../../../../../common/components/draggables'; import * as i18n from './translations'; import { TokensFlexItem } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/index.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/index.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/index.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/index.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/netflow.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow.tsx similarity index 86% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/netflow.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow.tsx index 0990301b6e2b92..0492450df51347 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/netflow.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow.tsx @@ -7,22 +7,28 @@ import { get } from 'lodash/fp'; import React from 'react'; -import { Ecs } from '../../../../graphql/types'; -import { asArrayIfExists } from '../../../../lib/helpers'; +import { Ecs } from '../../../../../graphql/types'; +import { asArrayIfExists } from '../../../../../common/lib/helpers'; import { TLS_CLIENT_CERTIFICATE_FINGERPRINT_SHA1_FIELD_NAME, TLS_SERVER_CERTIFICATE_FINGERPRINT_SHA1_FIELD_NAME, } from '../../../certificate_fingerprint'; import { EVENT_DURATION_FIELD_NAME } from '../../../duration'; -import { ID_FIELD_NAME } from '../../../event_details/event_id'; -import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../../../ip'; +import { ID_FIELD_NAME } from '../../../../../common/components/event_details/event_id'; +import { + DESTINATION_IP_FIELD_NAME, + SOURCE_IP_FIELD_NAME, +} from '../../../../../network/components/ip'; import { JA3_HASH_FIELD_NAME } from '../../../ja3_fingerprint'; import { Netflow } from '../../../netflow'; import { EVENT_END_FIELD_NAME, EVENT_START_FIELD_NAME, } from '../../../netflow/netflow_columns/duration_event_start_end'; -import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../../../port'; +import { + DESTINATION_PORT_FIELD_NAME, + SOURCE_PORT_FIELD_NAME, +} from '../../../../../network/components/port'; import { DESTINATION_GEO_CITY_NAME_FIELD_NAME, DESTINATION_GEO_CONTINENT_NAME_FIELD_NAME, @@ -34,13 +40,13 @@ import { SOURCE_GEO_COUNTRY_ISO_CODE_FIELD_NAME, SOURCE_GEO_COUNTRY_NAME_FIELD_NAME, SOURCE_GEO_REGION_NAME_FIELD_NAME, -} from '../../../source_destination/geo_fields'; +} from '../../../../../network/components/source_destination/geo_fields'; import { DESTINATION_BYTES_FIELD_NAME, DESTINATION_PACKETS_FIELD_NAME, SOURCE_BYTES_FIELD_NAME, SOURCE_PACKETS_FIELD_NAME, -} from '../../../source_destination/source_destination_arrows'; +} from '../../../../../network/components/source_destination/source_destination_arrows'; import { NETWORK_BYTES_FIELD_NAME, NETWORK_COMMUNITY_ID_FIELD_NAME, @@ -48,7 +54,7 @@ import { NETWORK_PACKETS_FIELD_NAME, NETWORK_PROTOCOL_FIELD_NAME, NETWORK_TRANSPORT_FIELD_NAME, -} from '../../../source_destination/field_names'; +} from '../../../../../network/components/source_destination/field_names'; interface NetflowRendererProps { data: Ecs; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/netflow/__snapshots__/netflow_row_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow/__snapshots__/netflow_row_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/netflow/__snapshots__/netflow_row_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow/__snapshots__/netflow_row_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx index e5375302f5bab2..9c620f5cf6701f 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.test.tsx @@ -7,11 +7,11 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { Ecs } from '../../../../../graphql/types'; -import { getMockNetflowData, TestProviders } from '../../../../../mock'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { Ecs } from '../../../../../../graphql/types'; +import { getMockNetflowData, TestProviders } from '../../../../../../common/mock'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { eventActionMatches, diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx similarity index 90% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx index 10d80e1952f40c..7926b447196fb9 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/netflow/netflow_row_renderer.tsx @@ -10,14 +10,17 @@ import { get } from 'lodash/fp'; import React from 'react'; import styled from 'styled-components'; -import { asArrayIfExists } from '../../../../../lib/helpers'; +import { asArrayIfExists } from '../../../../../../common/lib/helpers'; import { TLS_CLIENT_CERTIFICATE_FINGERPRINT_SHA1_FIELD_NAME, TLS_SERVER_CERTIFICATE_FINGERPRINT_SHA1_FIELD_NAME, } from '../../../../certificate_fingerprint'; import { EVENT_DURATION_FIELD_NAME } from '../../../../duration'; -import { ID_FIELD_NAME } from '../../../../event_details/event_id'; -import { DESTINATION_IP_FIELD_NAME, SOURCE_IP_FIELD_NAME } from '../../../../ip'; +import { ID_FIELD_NAME } from '../../../../../../common/components/event_details/event_id'; +import { + DESTINATION_IP_FIELD_NAME, + SOURCE_IP_FIELD_NAME, +} from '../../../../../../network/components/ip'; import { JA3_HASH_FIELD_NAME } from '../../../../ja3_fingerprint'; import { Netflow } from '../../../../netflow'; import { @@ -28,7 +31,10 @@ import { PROCESS_NAME_FIELD_NAME, USER_NAME_FIELD_NAME, } from '../../../../netflow/netflow_columns/user_process'; -import { DESTINATION_PORT_FIELD_NAME, SOURCE_PORT_FIELD_NAME } from '../../../../port'; +import { + DESTINATION_PORT_FIELD_NAME, + SOURCE_PORT_FIELD_NAME, +} from '../../../../../../network/components/port'; import { NETWORK_BYTES_FIELD_NAME, NETWORK_COMMUNITY_ID_FIELD_NAME, @@ -36,7 +42,7 @@ import { NETWORK_PACKETS_FIELD_NAME, NETWORK_PROTOCOL_FIELD_NAME, NETWORK_TRANSPORT_FIELD_NAME, -} from '../../../../source_destination/field_names'; +} from '../../../../../../network/components/source_destination/field_names'; import { DESTINATION_GEO_CITY_NAME_FIELD_NAME, DESTINATION_GEO_CONTINENT_NAME_FIELD_NAME, @@ -48,13 +54,13 @@ import { SOURCE_GEO_COUNTRY_ISO_CODE_FIELD_NAME, SOURCE_GEO_COUNTRY_NAME_FIELD_NAME, SOURCE_GEO_REGION_NAME_FIELD_NAME, -} from '../../../../source_destination/geo_fields'; +} from '../../../../../../network/components/source_destination/geo_fields'; import { DESTINATION_BYTES_FIELD_NAME, DESTINATION_PACKETS_FIELD_NAME, SOURCE_BYTES_FIELD_NAME, SOURCE_PACKETS_FIELD_NAME, -} from '../../../../source_destination/source_destination_arrows'; +} from '../../../../../../network/components/source_destination/source_destination_arrows'; import { RowRenderer, RowRendererContainer } from '../row_renderer'; const Details = styled.div` diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parent_process_draggable.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parent_process_draggable.test.tsx index 684def7386da04..0a173f766ae19b 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parent_process_draggable.test.tsx @@ -6,10 +6,10 @@ import React from 'react'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../../../common/mock'; import { ParentProcessDraggable } from './parent_process_draggable'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; describe('ParentProcessDraggable', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parent_process_draggable.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parent_process_draggable.tsx index 1402743ef8a519..12d23e2f0b604f 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/parent_process_draggable.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parent_process_draggable.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../draggables'; +import { DraggableBadge } from '../../../../../common/components/draggables'; import { isNillEmptyOrNotFinite, TokensFlexItem } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/parse_query_value.test.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parse_query_value.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/parse_query_value.test.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parse_query_value.test.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/parse_query_value.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parse_query_value.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/parse_query_value.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parse_query_value.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/parse_value.test.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parse_value.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/parse_value.test.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parse_value.test.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/parse_value.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parse_value.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/parse_value.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/parse_value.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_column_renderer.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_column_renderer.test.tsx index 8a22307767a40b..b80b3cf9a375a8 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_column_renderer.test.tsx @@ -8,10 +8,10 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash/fp'; import React from 'react'; -import { TimelineNonEcsData } from '../../../../graphql/types'; -import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../mock'; -import { getEmptyValue } from '../../../empty_value'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; +import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../../common/mock'; +import { getEmptyValue } from '../../../../../common/components/empty_value'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; import { plainColumnRenderer } from './plain_column_renderer'; import { getValues, deleteItemIdx, findItem } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_column_renderer.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_column_renderer.tsx index f6a61889c501b7..d2881382b17014 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/plain_column_renderer.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_column_renderer.tsx @@ -7,9 +7,9 @@ import { head } from 'lodash/fp'; import React from 'react'; -import { TimelineNonEcsData } from '../../../../graphql/types'; -import { ColumnHeaderOptions } from '../../../../store/timeline/model'; -import { getEmptyTagValue } from '../../../empty_value'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; +import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model'; +import { getEmptyTagValue } from '../../../../../common/components/empty_value'; import { ColumnRenderer } from './column_renderer'; import { FormattedFieldValue } from './formatted_field'; import { parseValue } from './parse_value'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx index 467f507e8be7d6..82d42988ef34f7 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_row_renderer.test.tsx @@ -10,9 +10,9 @@ import { cloneDeep } from 'lodash'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { mockBrowserFields } from '../../../../containers/source/mock'; -import { Ecs } from '../../../../graphql/types'; -import { mockTimelineData } from '../../../../mock'; +import { mockBrowserFields } from '../../../../../common/containers/source/mock'; +import { Ecs } from '../../../../../graphql/types'; +import { mockTimelineData } from '../../../../../common/mock'; import { plainRowRenderer } from './plain_row_renderer'; describe('plain_row_renderer', () => { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_row_renderer.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/plain_row_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/plain_row_renderer.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_draggable.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_draggable.test.tsx index 8cc7323ed358f8..91ae94940f7f4f 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/process_draggable.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_draggable.test.tsx @@ -7,9 +7,9 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../../../common/mock'; import { ProcessDraggable, ProcessDraggableWithNonExistentProcess } from './process_draggable'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; describe('ProcessDraggable', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_draggable.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_draggable.tsx index 35512c60629dd0..6e900fb3cab4d7 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/process_draggable.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_draggable.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../draggables'; +import { DraggableBadge } from '../../../../../common/components/draggables'; import { isNillEmptyOrNotFinite } from './helpers'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/process_hash.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_hash.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/process_hash.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_hash.test.tsx index 08a9d29967db27..55cc61edb064e1 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/process_hash.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_hash.test.tsx @@ -6,8 +6,8 @@ import React from 'react'; -import { TestProviders } from '../../../../mock'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { TestProviders } from '../../../../../common/mock'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; import { ProcessHash } from './process_hash'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_hash.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_hash.tsx index b6696d38dc1c53..9658ed89a60877 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/process_hash.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/process_hash.tsx @@ -8,7 +8,7 @@ import { EuiFlexGroup } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { DraggableBadge } from '../../../draggables'; +import { DraggableBadge } from '../../../../../common/components/draggables'; import { isNillEmptyOrNotFinite, TokensFlexItem } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/row_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/row_renderer.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/row_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/row_renderer.tsx index 2d9f877fe4af0d..5cee0a0118dd2e 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/row_renderer.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/row_renderer.tsx @@ -6,8 +6,8 @@ import React from 'react'; -import { BrowserFields } from '../../../../containers/source'; -import { Ecs } from '../../../../graphql/types'; +import { BrowserFields } from '../../../../../common/containers/source'; +import { Ecs } from '../../../../../graphql/types'; import { EventsTrSupplement } from '../../styles'; interface RowRendererContainerProps { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/__snapshots__/suricata_details.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_details.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/__snapshots__/suricata_details.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_details.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_row_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/__snapshots__/suricata_signature.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_signature.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/__snapshots__/suricata_signature.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/__snapshots__/suricata_signature.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx similarity index 83% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx index 027aa0df8bcdd3..d5040cb2523704 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_details.test.tsx @@ -7,10 +7,10 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { mockTimelineData } from '../../../../../mock'; -import { TestProviders } from '../../../../../mock/test_providers'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { mockTimelineData } from '../../../../../../common/mock'; +import { TestProviders } from '../../../../../../common/mock/test_providers'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { SuricataDetails } from './suricata_details'; describe('SuricataDetails', () => { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx index 17f5f236265edf..c21b609a0f91e9 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_details.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_details.tsx @@ -9,8 +9,8 @@ import { get } from 'lodash/fp'; import React from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../../../../containers/source'; -import { Ecs } from '../../../../../graphql/types'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { Ecs } from '../../../../../../graphql/types'; import { NetflowRenderer } from '../netflow'; import { SuricataSignature } from './suricata_signature'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_links.test.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_links.test.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_links.test.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_links.test.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_links.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_links.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_links.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_links.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_refs.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_refs.tsx index dd773bb88ef686..08992216bf74d4 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_refs.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_refs.tsx @@ -8,7 +8,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { ExternalLinkIcon } from '../../../../external_link_icon'; +import { ExternalLinkIcon } from '../../../../../../common/components/external_link_icon'; import { getLinksFromSignature } from './suricata_links'; const LinkEuiFlexItem = styled(EuiFlexItem)` diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx similarity index 85% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx index b26d8ce3693b4c..a10cd9dc97f6d4 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.test.tsx @@ -8,12 +8,12 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash/fp'; import React from 'react'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { Ecs } from '../../../../../graphql/types'; -import { mockTimelineData } from '../../../../../mock'; -import { TestProviders } from '../../../../../mock/test_providers'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { Ecs } from '../../../../../../graphql/types'; +import { mockTimelineData } from '../../../../../../common/mock'; +import { TestProviders } from '../../../../../../common/mock/test_providers'; import { suricataRowRenderer } from './suricata_row_renderer'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; describe('suricata_row_renderer', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_row_renderer.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.test.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.test.tsx index beae16af558ed5..245e538f691933 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.test.tsx @@ -7,8 +7,8 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../../../mock'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { TestProviders } from '../../../../../../common/mock'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { SuricataSignature, Tokens, diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.tsx index 66c559729cccdf..3ae88a1e7c57df 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/suricata/suricata_signature.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/suricata/suricata_signature.tsx @@ -8,15 +8,18 @@ import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { DragEffects, DraggableWrapper } from '../../../../drag_and_drop/draggable_wrapper'; -import { escapeDataProviderId } from '../../../../drag_and_drop/helpers'; -import { ExternalLinkIcon } from '../../../../external_link_icon'; -import { GoogleLink } from '../../../../links'; -import { Provider } from '../../../../timeline/data_providers/provider'; +import { + DragEffects, + DraggableWrapper, +} from '../../../../../../common/components/drag_and_drop/draggable_wrapper'; +import { escapeDataProviderId } from '../../../../../../common/components/drag_and_drop/helpers'; +import { ExternalLinkIcon } from '../../../../../../common/components/external_link_icon'; +import { GoogleLink } from '../../../../../../common/components/links'; +import { Provider } from '../../../data_providers/provider'; import { TokensFlexItem } from '../helpers'; import { getBeginningTokens } from './suricata_links'; -import { DefaultDraggable } from '../../../../draggables'; +import { DefaultDraggable } from '../../../../../../common/components/draggables'; import { IS_OPERATOR } from '../../../data_providers/data_provider'; export const SURICATA_SIGNATURE_FIELD_NAME = 'suricata.eve.alert.signature'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/auth_ssh.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/auth_ssh.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/auth_ssh.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/auth_ssh.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/generic_details.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_details.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/generic_details.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_details.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/generic_file_details.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_file_details.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/generic_file_details.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_file_details.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/generic_row_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/package.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/package.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/__snapshots__/package.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/__snapshots__/package.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/auth_ssh.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/auth_ssh.test.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/auth_ssh.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/auth_ssh.tsx index 0ff2eec35314d8..431f1b5e974d59 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/auth_ssh.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/auth_ssh.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../../draggables'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; import { TokensFlexItem } from '../helpers'; interface Props { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx index 19113d93f7cb03..e622c91e8b8700 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_details.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_details.test.tsx @@ -7,11 +7,11 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { mockTimelineData, TestProviders } from '../../../../../mock'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { mockTimelineData, TestProviders } from '../../../../../../common/mock'; import { SystemGenericDetails, SystemGenericLine } from './generic_details'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; describe('SystemGenericDetails', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_details.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_details.tsx index 2ad3eb46814542..e849732d07f6ff 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_details.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_details.tsx @@ -8,10 +8,10 @@ import { EuiFlexGroup, EuiSpacer } from '@elastic/eui'; import { get } from 'lodash/fp'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { Ecs } from '../../../../../graphql/types'; -import { DraggableBadge } from '../../../../draggables'; -import { OverflowField } from '../../../../tables/helpers'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { Ecs } from '../../../../../../graphql/types'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; +import { OverflowField } from '../../../../../../common/components/tables/helpers'; import * as i18n from './translations'; import { NetflowRenderer } from '../netflow'; @@ -20,7 +20,7 @@ import { Details, TokensFlexItem } from '../helpers'; import { ProcessDraggable } from '../process_draggable'; import { Package } from './package'; import { AuthSsh } from './auth_ssh'; -import { Badge } from '../../../../page'; +import { Badge } from '../../../../../../common/components/page'; interface Props { contextId: string; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx index cab7191c13aef5..d8784233b664dc 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_file_details.test.tsx @@ -7,11 +7,11 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { mockTimelineData, TestProviders } from '../../../../../mock'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { mockTimelineData, TestProviders } from '../../../../../../common/mock'; import { SystemGenericFileDetails, SystemGenericFileLine } from './generic_file_details'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; describe('SystemGenericFileDetails', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx index ef7c3b3ccf8591..8dd513539a96a1 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_file_details.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_file_details.tsx @@ -8,10 +8,10 @@ import { EuiFlexGroup, EuiSpacer } from '@elastic/eui'; import { get } from 'lodash/fp'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { Ecs } from '../../../../../graphql/types'; -import { DraggableBadge } from '../../../../draggables'; -import { OverflowField } from '../../../../tables/helpers'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { Ecs } from '../../../../../../graphql/types'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; +import { OverflowField } from '../../../../../../common/components/tables/helpers'; import * as i18n from './translations'; import { NetflowRenderer } from '../netflow'; @@ -23,7 +23,7 @@ import { AuthSsh } from './auth_ssh'; import { ExitCodeDraggable } from '../exit_code_draggable'; import { FileDraggable } from '../file_draggable'; import { Package } from './package'; -import { Badge } from '../../../../page'; +import { Badge } from '../../../../../../common/components/page'; import { ParentProcessDraggable } from '../parent_process_draggable'; import { ProcessHash } from '../process_hash'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx index 2f5fa76855f2be..26cccc82896eae 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.test.tsx @@ -8,9 +8,9 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash/fp'; import React from 'react'; -import { BrowserFields } from '../../../../../containers/source'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { Ecs } from '../../../../../graphql/types'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { Ecs } from '../../../../../../graphql/types'; import { mockDnsEvent, mockFimFileCreatedEvent, @@ -19,7 +19,7 @@ import { mockSocketOpenedEvent, mockTimelineData, TestProviders, -} from '../../../../../mock'; +} from '../../../../../../common/mock'; import { mockEndgameAdminLogon, mockEndgameCreationEvent, @@ -34,8 +34,8 @@ import { mockEndgameTerminationEvent, mockEndgameUserLogoff, mockEndgameUserLogon, -} from '../../../../../mock/mock_endgame_ecs_data'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +} from '../../../../../../common/mock/mock_endgame_ecs_data'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { RowRenderer } from '../row_renderer'; import { createDnsRowRenderer, @@ -48,7 +48,7 @@ import { } from './generic_row_renderer'; import * as i18n from './translations'; -jest.mock('../../../../../pages/overview/events_by_dataset'); +jest.mock('../../../../../../overview/components/events_by_dataset'); describe('GenericRowRenderer', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/generic_row_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/generic_row_renderer.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/package.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/package.test.tsx index 100c8fbe5a9888..56f9452ba40b8d 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/package.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/package.test.tsx @@ -7,8 +7,8 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../../../mock'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { TestProviders } from '../../../../../../common/mock'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { Package } from './package'; describe('Package', () => { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/package.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/package.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/package.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/package.tsx index a28e850e2af968..7aa66f8db88305 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/package.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/package.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../../draggables'; +import { DraggableBadge } from '../../../../../../common/components/draggables'; import { TokensFlexItem } from '../helpers'; interface Props { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/system/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/system/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/system/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/unknown_column_renderer.test.tsx similarity index 91% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/unknown_column_renderer.test.tsx index 73d1d5cb441ef3..f49318171e8b67 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/unknown_column_renderer.test.tsx @@ -10,9 +10,9 @@ import { cloneDeep } from 'lodash'; import React from 'react'; import { ThemeProvider } from 'styled-components'; -import { TimelineNonEcsData } from '../../../../graphql/types'; -import { defaultHeaders, mockTimelineData } from '../../../../mock'; -import { getEmptyValue } from '../../../empty_value'; +import { TimelineNonEcsData } from '../../../../../graphql/types'; +import { defaultHeaders, mockTimelineData } from '../../../../../common/mock'; +import { getEmptyValue } from '../../../../../common/components/empty_value'; import { unknownColumnRenderer } from './unknown_column_renderer'; import { getValues } from './helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/unknown_column_renderer.tsx similarity index 83% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/unknown_column_renderer.tsx index 4b4a4a3d43780d..49bc61f00a63e2 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/unknown_column_renderer.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/unknown_column_renderer.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { getEmptyTagValue } from '../../../empty_value'; +import { getEmptyTagValue } from '../../../../../common/components/empty_value'; import { ColumnRenderer } from './column_renderer'; export const unknownColumnRenderer: ColumnRenderer = { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/user_host_working_dir.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/user_host_working_dir.test.tsx index 45b670acb569ab..7f460d30d709c0 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/user_host_working_dir.test.tsx @@ -7,9 +7,9 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../../mock'; +import { TestProviders } from '../../../../../common/mock'; import { UserHostWorkingDir } from './user_host_working_dir'; -import { useMountAppended } from '../../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../../common/utils/use_mount_appended'; describe('UserHostWorkingDir', () => { const mount = useMountAppended(); diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/user_host_working_dir.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/user_host_working_dir.tsx index d370afee2585f5..80585b37cfd9e6 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/user_host_working_dir.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/user_host_working_dir.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { DraggableBadge } from '../../../draggables'; +import { DraggableBadge } from '../../../../../common/components/draggables'; import { TokensFlexItem } from './helpers'; import { HostWorkingDir } from './host_working_dir'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_details.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_row_renderer.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/__snapshots__/zeek_signature.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_signature.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/__snapshots__/zeek_signature.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/__snapshots__/zeek_signature.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx index b45e4c41762bc7..d3ec7922342c36 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_details.test.tsx @@ -6,9 +6,9 @@ import React from 'react'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { mockTimelineData, TestProviders } from '../../../../../mock'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { mockTimelineData, TestProviders } from '../../../../../../common/mock'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { ZeekDetails } from './zeek_details'; describe('ZeekDetails', () => { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx index d8561186b45462..4f991429d6a4d3 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_details.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_details.tsx @@ -8,8 +8,8 @@ import { EuiSpacer } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../../../../containers/source'; -import { Ecs } from '../../../../../graphql/types'; +import { BrowserFields } from '../../../../../../common/containers/source'; +import { Ecs } from '../../../../../../graphql/types'; import { NetflowRenderer } from '../netflow'; import { ZeekSignature } from './zeek_signature'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx index 456b93eb829ee5..2197ccb0ce2e00 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.test.tsx @@ -8,10 +8,10 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash/fp'; import React from 'react'; -import { mockBrowserFields } from '../../../../../containers/source/mock'; -import { Ecs } from '../../../../../graphql/types'; -import { mockTimelineData, TestProviders } from '../../../../../mock'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { mockBrowserFields } from '../../../../../../common/containers/source/mock'; +import { Ecs } from '../../../../../../graphql/types'; +import { mockTimelineData, TestProviders } from '../../../../../../common/mock'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { zeekRowRenderer } from './zeek_row_renderer'; describe('zeek_row_renderer', () => { diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_row_renderer.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.test.tsx index f199b537f1be04..f416da5625042c 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.test.tsx @@ -8,9 +8,9 @@ import { shallow } from 'enzyme'; import { cloneDeep } from 'lodash/fp'; import React from 'react'; -import { Ecs } from '../../../../../graphql/types'; -import { mockTimelineData, TestProviders } from '../../../../../mock'; -import { useMountAppended } from '../../../../../utils/use_mount_appended'; +import { Ecs } from '../../../../../../graphql/types'; +import { mockTimelineData, TestProviders } from '../../../../../../common/mock'; +import { useMountAppended } from '../../../../../../common/utils/use_mount_appended'; import { ZeekSignature, extractStateValue, diff --git a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx index 4cb8140e22ceff..cdf4a8cba68abb 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/renderers/zeek/zeek_signature.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/renderers/zeek/zeek_signature.tsx @@ -9,12 +9,15 @@ import { get } from 'lodash/fp'; import React from 'react'; import styled from 'styled-components'; -import { Ecs } from '../../../../../graphql/types'; -import { DragEffects, DraggableWrapper } from '../../../../drag_and_drop/draggable_wrapper'; -import { escapeDataProviderId } from '../../../../drag_and_drop/helpers'; -import { ExternalLinkIcon } from '../../../../external_link_icon'; -import { GoogleLink, ReputationLink } from '../../../../links'; -import { Provider } from '../../../../timeline/data_providers/provider'; +import { Ecs } from '../../../../../../graphql/types'; +import { + DragEffects, + DraggableWrapper, +} from '../../../../../../common/components/drag_and_drop/draggable_wrapper'; +import { escapeDataProviderId } from '../../../../../../common/components/drag_and_drop/helpers'; +import { ExternalLinkIcon } from '../../../../../../common/components/external_link_icon'; +import { GoogleLink, ReputationLink } from '../../../../../../common/components/links'; +import { Provider } from '../../../data_providers/provider'; import { IS_OPERATOR } from '../../../data_providers/data_provider'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/sort/__snapshots__/sort_indicator.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/body/sort/__snapshots__/sort_indicator.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/sort/__snapshots__/sort_indicator.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/body/sort/__snapshots__/sort_indicator.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/body/sort/index.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/sort/index.ts similarity index 89% rename from x-pack/plugins/siem/public/components/timeline/body/sort/index.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/sort/index.ts index 4a55ba8e1e8eea..93fbe314e1dad1 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/sort/index.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/sort/index.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Direction } from '../../../../graphql/types'; +import { Direction } from '../../../../../graphql/types'; import { ColumnId } from '../column_id'; /** Specifies a column's sort direction */ diff --git a/x-pack/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/sort/sort_indicator.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/sort/sort_indicator.test.tsx index db3e96a4e26502..43738da44b17f2 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/sort/sort_indicator.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/sort/sort_indicator.test.tsx @@ -7,7 +7,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { Direction } from '../../../../graphql/types'; +import { Direction } from '../../../../../graphql/types'; import { getDirection, SortIndicator } from './sort_indicator'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/sort/sort_indicator.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/sort/sort_indicator.tsx index 74fb1e5e4034c8..c148e2f6c6295d 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/sort/sort_indicator.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/sort/sort_indicator.tsx @@ -7,7 +7,7 @@ import { EuiIcon } from '@elastic/eui'; import React from 'react'; -import { Direction } from '../../../../graphql/types'; +import { Direction } from '../../../../../graphql/types'; import { SortDirection } from '.'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/stateful_body.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/stateful_body.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/body/stateful_body.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/stateful_body.test.tsx index 4945939ac2bdc4..126f3439f46364 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/stateful_body.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/stateful_body.test.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { mockBrowserFields } from '../../../containers/source/mock'; +import { mockBrowserFields } from '../../../../common/containers/source/mock'; import { defaultHeaders } from './column_headers/default_headers'; import { getColumnHeaders } from './column_headers/helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/body/stateful_body.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/body/stateful_body.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/body/stateful_body.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/body/stateful_body.tsx index 76f26d3dda5afc..1aed63ff71d6d4 100644 --- a/x-pack/plugins/siem/public/components/timeline/body/stateful_body.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/body/stateful_body.tsx @@ -10,13 +10,14 @@ import React, { useCallback, useEffect } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import deepEqual from 'fast-deep-equal'; -import { BrowserFields } from '../../../containers/source'; -import { TimelineItem } from '../../../graphql/types'; -import { Note } from '../../../lib/note'; -import { appSelectors, State, timelineSelectors } from '../../../store'; -import { timelineActions, appActions } from '../../../store/actions'; +import { BrowserFields } from '../../../../common/containers/source'; +import { TimelineItem } from '../../../../graphql/types'; +import { Note } from '../../../../common/lib/note'; +import { appSelectors, State } from '../../../../common/store'; +import { appActions } from '../../../../common/store/actions'; import { ColumnHeaderOptions, TimelineModel } from '../../../store/timeline/model'; import { timelineDefaults } from '../../../store/timeline/defaults'; +import { timelineActions, timelineSelectors } from '../../../store/timeline'; import { AddNoteToEvent, UpdateNote } from '../../notes/helpers'; import { OnColumnRemoved, diff --git a/x-pack/plugins/siem/public/components/timeline/body/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/body/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/body/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/body/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/__snapshots__/data_providers.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/__snapshots__/data_providers.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/data_providers/__snapshots__/data_providers.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/__snapshots__/data_providers.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/__snapshots__/empty.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/__snapshots__/empty.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/data_providers/__snapshots__/empty.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/__snapshots__/empty.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/__snapshots__/provider.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/__snapshots__/provider.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/data_providers/__snapshots__/provider.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/__snapshots__/provider.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/__snapshots__/providers.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/__snapshots__/providers.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/data_providers/__snapshots__/providers.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/__snapshots__/providers.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/data_provider.ts b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/data_provider.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/data_providers/data_provider.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/data_provider.ts diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/data_providers.test.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/data_providers.test.tsx index b77d37e8e31ab3..54e7cb20aeed30 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/data_providers.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/data_providers.test.tsx @@ -7,8 +7,8 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../mock/test_providers'; -import { useMountAppended } from '../../../utils/use_mount_appended'; +import { TestProviders } from '../../../../common/mock/test_providers'; +import { useMountAppended } from '../../../../common/utils/use_mount_appended'; import { DataProviders } from '.'; import { DataProvider } from './data_provider'; diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/empty.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/empty.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/data_providers/empty.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/empty.test.tsx index 10586657b52a3d..9cc5704808c66c 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/empty.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/empty.test.tsx @@ -8,7 +8,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; import { Empty } from './empty'; -import { TestProviders } from '../../../mock/test_providers'; +import { TestProviders } from '../../../../common/mock/test_providers'; describe('Empty', () => { describe('rendering', () => { diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/empty.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/empty.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/data_providers/empty.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/empty.tsx index 1c225eba20b4f9..84f533977a9a30 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/empty.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/empty.tsx @@ -8,7 +8,7 @@ import { EuiBadge, EuiText } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { AndOrBadge } from '../../and_or_badge'; +import { AndOrBadge } from '../and_or_badge'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/helpers.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/helpers.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/data_providers/helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/helpers.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/data_providers/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/index.tsx index caead394db051b..13c91f25c88004 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/index.tsx @@ -8,12 +8,12 @@ import { rgba } from 'polished'; import React from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../../containers/source'; -import { DroppableWrapper } from '../../drag_and_drop/droppable_wrapper'; +import { BrowserFields } from '../../../../common/containers/source'; +import { DroppableWrapper } from '../../../../common/components/drag_and_drop/droppable_wrapper'; import { droppableTimelineProvidersPrefix, IS_DRAGGING_CLASS_NAME, -} from '../../drag_and_drop/helpers'; +} from '../../../../common/components/drag_and_drop/helpers'; import { OnDataProviderEdited, OnDataProviderRemoved, diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/mock/mock_data_providers.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/mock/mock_data_providers.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/data_providers/mock/mock_data_providers.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/mock/mock_data_providers.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/provider.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/data_providers/provider.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider.test.tsx index f0d7ca83fb391e..d6d337bb3e1d7b 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/provider.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider.test.tsx @@ -7,7 +7,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../../mock/test_providers'; +import { TestProviders } from '../../../../common/mock/test_providers'; import { mockDataProviders } from './mock/mock_data_providers'; import { Provider } from './provider'; diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/provider.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/data_providers/provider.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/provider_badge.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_badge.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/data_providers/provider_badge.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_badge.tsx index 859ced39ebc4f4..b3682c0d551475 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/provider_badge.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_badge.tsx @@ -10,8 +10,8 @@ import { isString } from 'lodash/fp'; import React, { useCallback, useMemo } from 'react'; import styled from 'styled-components'; -import { ProviderContainer } from '../../drag_and_drop/provider_container'; -import { getEmptyString } from '../../empty_value'; +import { getEmptyString } from '../../../../common/components/empty_value'; +import { ProviderContainer } from '../../../../common/components/drag_and_drop/provider_container'; import { EXISTS_OPERATOR, QueryOperator } from './data_provider'; diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/provider_item_actions.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_actions.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/data_providers/provider_item_actions.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_actions.tsx index 121f832221d3e6..540b1b80259a01 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/provider_item_actions.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_actions.tsx @@ -12,7 +12,7 @@ import { import React, { FunctionComponent } from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../../containers/source'; +import { BrowserFields } from '../../../../common/containers/source'; import { OnDataProviderEdited } from '../events'; import { QueryOperator, EXISTS_OPERATOR } from './data_provider'; import { StatefulEditDataProvider } from '../../edit_data_provider'; diff --git a/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_and.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_and.tsx new file mode 100644 index 00000000000000..171112b28d789c --- /dev/null +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_and.tsx @@ -0,0 +1,95 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexItem } from '@elastic/eui'; +import React from 'react'; + +import { AndOrBadge } from '../and_or_badge'; +import { BrowserFields } from '../../../../common/containers/source'; +import { + OnChangeDataProviderKqlQuery, + OnDataProviderEdited, + OnDataProviderRemoved, + OnToggleDataProviderEnabled, + OnToggleDataProviderExcluded, +} from '../events'; + +import { DataProvidersAnd, IS_OPERATOR } from './data_provider'; +import { ProviderItemBadge } from './provider_item_badge'; + +interface ProviderItemAndPopoverProps { + browserFields: BrowserFields; + dataProvidersAnd: DataProvidersAnd[]; + onChangeDataProviderKqlQuery: OnChangeDataProviderKqlQuery; + onDataProviderEdited: OnDataProviderEdited; + onDataProviderRemoved: OnDataProviderRemoved; + onToggleDataProviderEnabled: OnToggleDataProviderEnabled; + onToggleDataProviderExcluded: OnToggleDataProviderExcluded; + providerId: string; + timelineId: string; +} + +export class ProviderItemAnd extends React.PureComponent { + public render() { + const { + browserFields, + dataProvidersAnd, + onDataProviderEdited, + providerId, + timelineId, + } = this.props; + + return dataProvidersAnd.map((providerAnd: DataProvidersAnd, index: number) => ( + + + + + + this.deleteAndProvider(providerId, providerAnd.id)} + field={providerAnd.queryMatch.displayField || providerAnd.queryMatch.field} + kqlQuery={providerAnd.kqlQuery} + isEnabled={providerAnd.enabled} + isExcluded={providerAnd.excluded} + onDataProviderEdited={onDataProviderEdited} + operator={providerAnd.queryMatch.operator || IS_OPERATOR} + providerId={providerId} + timelineId={timelineId} + toggleEnabledProvider={() => + this.toggleEnabledAndProvider(providerId, !providerAnd.enabled, providerAnd.id) + } + toggleExcludedProvider={() => + this.toggleExcludedAndProvider(providerId, !providerAnd.excluded, providerAnd.id) + } + val={providerAnd.queryMatch.displayValue || providerAnd.queryMatch.value} + /> + + + )); + } + + private deleteAndProvider = (providerId: string, andProviderId: string) => { + this.props.onDataProviderRemoved(providerId, andProviderId); + }; + + private toggleEnabledAndProvider = ( + providerId: string, + enabled: boolean, + andProviderId: string + ) => { + this.props.onToggleDataProviderEnabled({ providerId, enabled, andProviderId }); + }; + + private toggleExcludedAndProvider = ( + providerId: string, + excluded: boolean, + andProviderId: string + ) => { + this.props.onToggleDataProviderExcluded({ providerId, excluded, andProviderId }); + }; +} diff --git a/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_and_drag_drop.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_and_drag_drop.tsx new file mode 100644 index 00000000000000..4a9358befc51f4 --- /dev/null +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_and_drag_drop.tsx @@ -0,0 +1,136 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; +import { rgba } from 'polished'; +import React, { useCallback } from 'react'; +import styled from 'styled-components'; + +import { AndOrBadge } from '../and_or_badge'; +import { + OnChangeDataProviderKqlQuery, + OnChangeDroppableAndProvider, + OnDataProviderEdited, + OnDataProviderRemoved, + OnToggleDataProviderEnabled, + OnToggleDataProviderExcluded, +} from '../events'; + +import { BrowserFields } from '../../../../common/containers/source'; + +import { DataProvider } from './data_provider'; +import { ProviderItemAnd } from './provider_item_and'; + +import * as i18n from './translations'; + +const DropAndTargetDataProvidersContainer = styled(EuiFlexItem)` + margin: 0px 8px; +`; + +DropAndTargetDataProvidersContainer.displayName = 'DropAndTargetDataProvidersContainer'; + +const DropAndTargetDataProviders = styled.div<{ hasAndItem: boolean }>` + min-width: 230px; + width: auto; + border: 0.1rem dashed ${props => props.theme.eui.euiColorSuccess}; + border-radius: 5px; + text-align: center; + padding: 3px 10px; + display: flex; + justify-content: center; + align-items: center; + ${props => + props.hasAndItem + ? `&:hover { + transition: background-color 0.7s ease; + background-color: ${() => rgba(props.theme.eui.euiColorSuccess, 0.2)}; + }` + : ''}; + cursor: ${({ hasAndItem }) => (!hasAndItem ? `default` : 'inherit')}; +`; + +DropAndTargetDataProviders.displayName = 'DropAndTargetDataProviders'; + +const NumberProviderAndBadge = (styled(EuiBadge)` + margin: 0px 5px; +` as unknown) as typeof EuiBadge; + +NumberProviderAndBadge.displayName = 'NumberProviderAndBadge'; + +interface ProviderItemDropProps { + browserFields: BrowserFields; + dataProvider: DataProvider; + mousePosition?: { x: number; y: number; boundLeft: number; boundTop: number }; + onChangeDataProviderKqlQuery: OnChangeDataProviderKqlQuery; + onChangeDroppableAndProvider: OnChangeDroppableAndProvider; + onDataProviderEdited: OnDataProviderEdited; + onDataProviderRemoved: OnDataProviderRemoved; + onToggleDataProviderEnabled: OnToggleDataProviderEnabled; + onToggleDataProviderExcluded: OnToggleDataProviderExcluded; + timelineId: string; +} + +export const ProviderItemAndDragDrop = React.memo( + ({ + browserFields, + dataProvider, + onChangeDataProviderKqlQuery, + onChangeDroppableAndProvider, + onDataProviderEdited, + onDataProviderRemoved, + onToggleDataProviderEnabled, + onToggleDataProviderExcluded, + timelineId, + }) => { + const onMouseEnter = useCallback(() => onChangeDroppableAndProvider(dataProvider.id), [ + onChangeDroppableAndProvider, + dataProvider.id, + ]); + const onMouseLeave = useCallback(() => onChangeDroppableAndProvider(''), [ + onChangeDroppableAndProvider, + ]); + const hasAndItem = dataProvider.and.length > 0; + return ( + + + + {hasAndItem && ( + + {dataProvider.and.length} + + )} + + {i18n.DROP_HERE_TO_ADD_AN} + + + + + + + ); + } +); + +ProviderItemAndDragDrop.displayName = 'ProviderItemAndDragDrop'; diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_badge.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_badge.tsx index b268315efb919d..b53c08a8bb10db 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/provider_item_badge.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/provider_item_badge.tsx @@ -8,13 +8,13 @@ import { noop } from 'lodash/fp'; import React, { useCallback, useEffect, useState } from 'react'; import { useDispatch } from 'react-redux'; -import { BrowserFields } from '../../../containers/source'; +import { BrowserFields } from '../../../../common/containers/source'; import { OnDataProviderEdited } from '../events'; import { ProviderBadge } from './provider_badge'; import { ProviderItemActions } from './provider_item_actions'; import { DataProvidersAnd, QueryOperator } from './data_provider'; -import { dragAndDropActions } from '../../../store/drag_and_drop'; +import { dragAndDropActions } from '../../../../common/store/drag_and_drop'; import { TimelineContext } from '../timeline_context'; interface ProviderItemBadgeProps { diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/providers.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/providers.test.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/data_providers/providers.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/providers.test.tsx index 43e84bac508ea0..34202d090e06f7 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/providers.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/providers.test.tsx @@ -7,16 +7,16 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { createKibanaCoreStartMock } from '../../../mock/kibana_core'; -import { TestProviders } from '../../../mock/test_providers'; -import { DroppableWrapper } from '../../drag_and_drop/droppable_wrapper'; -import { FilterManager } from '../../../../../../../src/plugins/data/public'; +import { createKibanaCoreStartMock } from '../../../../common/mock/kibana_core'; +import { TestProviders } from '../../../../common/mock/test_providers'; +import { DroppableWrapper } from '../../../../common/components/drag_and_drop/droppable_wrapper'; +import { FilterManager } from '../../../../../../../../src/plugins/data/public'; import { TimelineContext } from '../timeline_context'; import { mockDataProviders } from './mock/mock_data_providers'; import { Providers } from './providers'; import { DELETE_CLASS_NAME, ENABLE_CLASS_NAME, EXCLUDE_CLASS_NAME } from './provider_item_actions'; -import { useMountAppended } from '../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../common/utils/use_mount_appended'; const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings; diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/providers.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/providers.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/data_providers/providers.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/providers.tsx index 8d9d0c69d53cd2..7f10a7b16c7b27 100644 --- a/x-pack/plugins/siem/public/components/timeline/data_providers/providers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/providers.tsx @@ -10,13 +10,13 @@ import React, { useMemo } from 'react'; import { Draggable, DraggingStyle, Droppable, NotDraggingStyle } from 'react-beautiful-dnd'; import styled, { css } from 'styled-components'; -import { AndOrBadge } from '../../and_or_badge'; -import { BrowserFields } from '../../../containers/source'; +import { AndOrBadge } from '../and_or_badge'; +import { BrowserFields } from '../../../../common/containers/source'; import { getTimelineProviderDroppableId, IS_DRAGGING_CLASS_NAME, getTimelineProviderDraggableId, -} from '../../drag_and_drop/helpers'; +} from '../../../../common/components/drag_and_drop/helpers'; import { OnDataProviderEdited, OnDataProviderRemoved, diff --git a/x-pack/plugins/siem/public/components/timeline/data_providers/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/data_providers/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/data_providers/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/data_providers/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/events.ts b/x-pack/plugins/siem/public/timelines/components/timeline/events.ts similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/events.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/events.ts index f977c03ed3053a..6c9a9b8b896797 100644 --- a/x-pack/plugins/siem/public/components/timeline/events.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/events.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { ColumnHeaderOptions } from '../../store/timeline/model'; +import { ColumnHeaderOptions } from '../../../timelines/store/timeline/model'; import { ColumnId } from './body/column_id'; import { SortDirection } from './body/sort'; import { QueryOperator } from './data_providers/data_provider'; diff --git a/x-pack/plugins/siem/public/components/timeline/expandable_event/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/expandable_event/index.tsx similarity index 84% rename from x-pack/plugins/siem/public/components/timeline/expandable_event/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/expandable_event/index.tsx index 218d4db9901cbf..b08c6afcaf4a69 100644 --- a/x-pack/plugins/siem/public/components/timeline/expandable_event/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/expandable_event/index.tsx @@ -7,10 +7,10 @@ import React from 'react'; import styled from 'styled-components'; -import { BrowserFields } from '../../../containers/source'; -import { ColumnHeaderOptions } from '../../../store/timeline/model'; -import { DetailItem } from '../../../graphql/types'; -import { StatefulEventDetails } from '../../event_details/stateful_event_details'; +import { BrowserFields } from '../../../../common/containers/source'; +import { ColumnHeaderOptions } from '../../../../timelines/store/timeline/model'; +import { DetailItem } from '../../../../graphql/types'; +import { StatefulEventDetails } from '../../../../common/components/event_details/stateful_event_details'; import { LazyAccordion } from '../../lazy_accordion'; import { OnUpdateColumns } from '../events'; diff --git a/x-pack/plugins/siem/public/components/timeline/expandable_event/translations.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/expandable_event/translations.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/expandable_event/translations.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/expandable_event/translations.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/fetch_kql_timeline.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/fetch_kql_timeline.tsx similarity index 88% rename from x-pack/plugins/siem/public/components/timeline/fetch_kql_timeline.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/fetch_kql_timeline.tsx index 16eaa803082050..e75f87e0d6011a 100644 --- a/x-pack/plugins/siem/public/components/timeline/fetch_kql_timeline.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/fetch_kql_timeline.tsx @@ -9,11 +9,11 @@ import { connect, ConnectedProps } from 'react-redux'; import deepEqual from 'fast-deep-equal'; import { IIndexPattern } from 'src/plugins/data/public'; -import { timelineSelectors, State } from '../../store'; -import { inputsActions } from '../../store/actions'; -import { InputsModelId } from '../../store/inputs/constants'; -import { useUpdateKql } from '../../utils/kql/use_update_kql'; - +import { State } from '../../../common/store'; +import { inputsActions } from '../../../common/store/actions'; +import { InputsModelId } from '../../../common/store/inputs/constants'; +import { useUpdateKql } from '../../../common/utils/kql/use_update_kql'; +import { timelineSelectors } from '../../store/timeline'; export interface TimelineKqlFetchProps { id: string; indexPattern: IIndexPattern; diff --git a/x-pack/plugins/siem/public/components/timeline/footer/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/footer/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/footer/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/footer/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/footer/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/footer/index.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/timeline/footer/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/footer/index.test.tsx index d54a4cee83e527..86b362aefca1a8 100644 --- a/x-pack/plugins/siem/public/components/timeline/footer/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/footer/index.test.tsx @@ -8,7 +8,7 @@ import { mount, shallow } from 'enzyme'; import { getOr } from 'lodash/fp'; import React from 'react'; -import { TestProviders } from '../../../mock/test_providers'; +import { TestProviders } from '../../../../common/mock/test_providers'; import { FooterComponent, PagingControlComponent } from './index'; import { mockData } from './mock'; diff --git a/x-pack/plugins/siem/public/components/timeline/footer/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/footer/index.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/footer/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/footer/index.tsx index 7a025e96e57f29..556f7b043e3ab5 100644 --- a/x-pack/plugins/siem/public/components/timeline/footer/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/footer/index.tsx @@ -28,7 +28,7 @@ import { OnChangeItemsPerPage, OnLoadMore } from '../events'; import { LastUpdatedAt } from './last_updated'; import * as i18n from './translations'; import { useTimelineTypeContext } from '../timeline_context'; -import { useEventDetailsWidthContext } from '../../events_viewer/event_details_width_context'; +import { useEventDetailsWidthContext } from '../../../../common/components/events_viewer/event_details_width_context'; export const isCompactFooter = (width: number): boolean => width < 600; diff --git a/x-pack/plugins/siem/public/components/timeline/footer/last_updated.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/footer/last_updated.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/footer/last_updated.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/footer/last_updated.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/footer/mock.ts b/x-pack/plugins/siem/public/timelines/components/timeline/footer/mock.ts similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/footer/mock.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/footer/mock.ts index f6aaf9475f2c4e..fcd30ee2b8500b 100644 --- a/x-pack/plugins/siem/public/components/timeline/footer/mock.ts +++ b/x-pack/plugins/siem/public/timelines/components/timeline/footer/mock.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { EventsTimelineData } from '../../../graphql/types'; +import { EventsTimelineData } from '../../../../graphql/types'; export const mockData: { Events: EventsTimelineData } = { Events: { diff --git a/x-pack/plugins/siem/public/components/timeline/footer/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/footer/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/footer/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/footer/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/header/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/header/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/header/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/timeline/header/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/header/index.test.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/timeline/header/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/header/index.test.tsx index 7da76df4977684..a3855c848cf24e 100644 --- a/x-pack/plugins/siem/public/components/timeline/header/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/header/index.test.tsx @@ -7,18 +7,18 @@ import { shallow } from 'enzyme'; import React from 'react'; -import { mockIndexPattern } from '../../../mock'; -import { createKibanaCoreStartMock } from '../../../mock/kibana_core'; -import { TestProviders } from '../../../mock/test_providers'; -import { FilterManager } from '../../../../../../../src/plugins/data/public'; +import { mockIndexPattern } from '../../../../common/mock'; +import { createKibanaCoreStartMock } from '../../../../common/mock/kibana_core'; +import { TestProviders } from '../../../../common/mock/test_providers'; +import { FilterManager } from '../../../../../../../../src/plugins/data/public'; import { mockDataProviders } from '../data_providers/mock/mock_data_providers'; -import { useMountAppended } from '../../../utils/use_mount_appended'; +import { useMountAppended } from '../../../../common/utils/use_mount_appended'; import { TimelineHeader } from '.'; const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('Header', () => { const indexPattern = mockIndexPattern; diff --git a/x-pack/plugins/siem/public/components/timeline/header/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/header/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/header/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/header/index.tsx index 58e6b6e8372495..974b23bedac013 100644 --- a/x-pack/plugins/siem/public/components/timeline/header/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/header/index.tsx @@ -18,7 +18,7 @@ import { OnToggleDataProviderExcluded, } from '../events'; import { StatefulSearchOrFilter } from '../search_or_filter'; -import { BrowserFields } from '../../../containers/source'; +import { BrowserFields } from '../../../../common/containers/source'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/timeline/header/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/header/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/header/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/header/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/helpers.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/helpers.test.tsx similarity index 99% rename from x-pack/plugins/siem/public/components/timeline/helpers.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/helpers.test.tsx index fc5a8ae924f828..87eb9cc45b98b2 100644 --- a/x-pack/plugins/siem/public/components/timeline/helpers.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/helpers.test.tsx @@ -5,12 +5,12 @@ */ import { cloneDeep } from 'lodash/fp'; -import { mockIndexPattern } from '../../mock'; +import { mockIndexPattern } from '../../../common/mock'; import { mockDataProviders } from './data_providers/mock/mock_data_providers'; import { buildGlobalQuery, combineQueries } from './helpers'; -import { mockBrowserFields } from '../../containers/source/mock'; -import { EsQueryConfig, Filter, esFilters } from '../../../../../../src/plugins/data/public'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; +import { EsQueryConfig, Filter, esFilters } from '../../../../../../../src/plugins/data/public'; const cleanUpKqlQuery = (str: string) => str.replace(/\n/g, '').replace(/\s\s+/g, ' '); const startDate = new Date('2018-03-23T18:49:23.132Z').valueOf(); diff --git a/x-pack/plugins/siem/public/components/timeline/helpers.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/helpers.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/helpers.tsx index 53ab7d81cadc26..776ff114734d90 100644 --- a/x-pack/plugins/siem/public/components/timeline/helpers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/helpers.tsx @@ -7,16 +7,16 @@ import { isEmpty, isNumber, get } from 'lodash/fp'; import memoizeOne from 'memoize-one'; -import { escapeQueryValue, convertToBuildEsQuery } from '../../lib/keury'; +import { escapeQueryValue, convertToBuildEsQuery } from '../../../common/lib/keury'; import { DataProvider, DataProvidersAnd, EXISTS_OPERATOR } from './data_providers/data_provider'; -import { BrowserFields } from '../../containers/source'; +import { BrowserFields } from '../../../common/containers/source'; import { IIndexPattern, Query, EsQueryConfig, Filter, -} from '../../../../../../src/plugins/data/public'; +} from '../../../../../../../src/plugins/data/public'; const convertDateFieldToQuery = (field: string, value: string | number) => `${field}: ${isNumber(value) ? value : new Date(value).valueOf()}`; diff --git a/x-pack/plugins/siem/public/components/timeline/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/index.tsx index bebc6f9b654c58..fca16ffadce843 100644 --- a/x-pack/plugins/siem/public/components/timeline/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/index.tsx @@ -8,12 +8,12 @@ import React, { useEffect, useCallback, useMemo } from 'react'; import { connect, ConnectedProps } from 'react-redux'; import deepEqual from 'fast-deep-equal'; -import { WithSource } from '../../containers/source'; -import { useSignalIndex } from '../../containers/detection_engine/signals/use_signal_index'; -import { inputsModel, inputsSelectors, State, timelineSelectors } from '../../store'; -import { timelineActions } from '../../store/actions'; -import { ColumnHeaderOptions, TimelineModel } from '../../store/timeline/model'; -import { timelineDefaults } from '../../store/timeline/defaults'; +import { WithSource } from '../../../common/containers/source'; +import { useSignalIndex } from '../../../alerts/containers/detection_engine/signals/use_signal_index'; +import { inputsModel, inputsSelectors, State } from '../../../common/store'; +import { timelineActions, timelineSelectors } from '../../store/timeline'; +import { ColumnHeaderOptions, TimelineModel } from '../../../timelines/store/timeline/model'; +import { timelineDefaults } from '../../../timelines/store/timeline/defaults'; import { defaultHeaders } from './body/column_headers/default_headers'; import { OnChangeItemsPerPage, diff --git a/x-pack/plugins/siem/public/components/timeline/insert_timeline_popover/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/insert_timeline_popover/index.test.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/insert_timeline_popover/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/insert_timeline_popover/index.test.tsx index c5aea833a4b2f9..d5cfc397e1990a 100644 --- a/x-pack/plugins/siem/public/components/timeline/insert_timeline_popover/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/insert_timeline_popover/index.test.tsx @@ -9,7 +9,7 @@ import { mount } from 'enzyme'; /* eslint-disable @kbn/eslint/module_migration */ import routeData from 'react-router'; /* eslint-enable @kbn/eslint/module_migration */ -import { InsertTimelinePopoverComponent } from './'; +import { InsertTimelinePopoverComponent } from '.'; const mockDispatch = jest.fn(); jest.mock('react-redux', () => { diff --git a/x-pack/plugins/siem/public/components/timeline/insert_timeline_popover/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/insert_timeline_popover/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/insert_timeline_popover/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/insert_timeline_popover/index.tsx index 573e010868babd..37b1125cd673af 100644 --- a/x-pack/plugins/siem/public/components/timeline/insert_timeline_popover/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/insert_timeline_popover/index.tsx @@ -12,7 +12,7 @@ import { useDispatch } from 'react-redux'; import { OpenTimelineResult } from '../../open_timeline/types'; import { SelectableTimeline } from '../selectable_timeline'; import * as i18n from '../translations'; -import { timelineActions } from '../../../store/timeline'; +import { timelineActions } from '../../../../timelines/store/timeline'; interface InsertTimelinePopoverProps { isDisabled: boolean; diff --git a/x-pack/plugins/siem/public/components/timeline/insert_timeline_popover/use_insert_timeline.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/insert_timeline_popover/use_insert_timeline.tsx similarity index 87% rename from x-pack/plugins/siem/public/components/timeline/insert_timeline_popover/use_insert_timeline.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/insert_timeline_popover/use_insert_timeline.tsx index e4d828b68f3dc9..1a81c131de0150 100644 --- a/x-pack/plugins/siem/public/components/timeline/insert_timeline_popover/use_insert_timeline.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/insert_timeline_popover/use_insert_timeline.tsx @@ -5,9 +5,9 @@ */ import { useCallback, useState } from 'react'; -import { useBasePath } from '../../../lib/kibana'; -import { CursorPosition } from '../../markdown_editor'; -import { FormData, FormHook } from '../../../shared_imports'; +import { useBasePath } from '../../../../common/lib/kibana'; +import { CursorPosition } from '../../../../common/components/markdown_editor'; +import { FormData, FormHook } from '../../../../shared_imports'; export const useInsertTimeline = (form: FormHook, fieldName: string) => { const basePath = window.location.origin + useBasePath(); diff --git a/x-pack/plugins/siem/public/components/pin/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/pin/index.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/pin/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/pin/index.test.tsx diff --git a/x-pack/plugins/siem/public/components/pin/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/pin/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/pin/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/pin/index.tsx index 9f898f9acaf2e9..800ea814fdd509 100644 --- a/x-pack/plugins/siem/public/components/pin/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/pin/index.tsx @@ -8,7 +8,7 @@ import { EuiButtonIcon, IconSize } from '@elastic/eui'; import { noop } from 'lodash/fp'; import React from 'react'; -import * as i18n from '../../components/timeline/body/translations'; +import * as i18n from '../body/translations'; export type PinIcon = 'pin' | 'pinFilled'; diff --git a/x-pack/plugins/siem/public/components/timeline/properties/helpers.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/properties/helpers.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/properties/helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/properties/helpers.tsx index 4c64c8a100b41a..1453d58c2ffd59 100644 --- a/x-pack/plugins/siem/public/components/timeline/properties/helpers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/properties/helpers.tsx @@ -23,15 +23,15 @@ import styled from 'styled-components'; import { useHistory } from 'react-router-dom'; import { useSelector } from 'react-redux'; -import { Note } from '../../../lib/note'; +import { Note } from '../../../../common/lib/note'; import { Notes } from '../../notes'; import { AssociateNote, UpdateNote } from '../../notes/helpers'; import { NOTES_PANEL_WIDTH } from './notes_size'; import { ButtonContainer, DescriptionContainer, LabelText, NameField, StyledStar } from './styles'; import * as i18n from './translations'; -import { SiemPageName } from '../../../pages/home/types'; -import { timelineSelectors } from '../../../store/timeline'; -import { State } from '../../../store'; +import { SiemPageName } from '../../../../app/types'; +import { timelineSelectors } from '../../../../timelines/store/timeline'; +import { State } from '../../../../common/store'; export const historyToolTip = 'The chronological history of actions related to this timeline'; export const streamLiveToolTip = 'Update the Timeline as new data arrives'; diff --git a/x-pack/plugins/siem/public/components/timeline/properties/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/properties/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/properties/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/properties/index.test.tsx index e942c8f36dc837..17968a5977069a 100644 --- a/x-pack/plugins/siem/public/components/timeline/properties/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/properties/index.test.tsx @@ -8,16 +8,19 @@ import { mount } from 'enzyme'; import React from 'react'; import { Provider as ReduxStoreProvider } from 'react-redux'; -import { mockGlobalState, apolloClientObservable } from '../../../mock'; -import { createStore, State } from '../../../store'; -import { useThrottledResizeObserver } from '../../utils'; - +import { + mockGlobalState, + apolloClientObservable, + SUB_PLUGINS_REDUCER, +} from '../../../../common/mock'; +import { createStore, State } from '../../../../common/store'; +import { useThrottledResizeObserver } from '../../../../common/components/utils'; import { Properties, showDescriptionThreshold, showNotesThreshold } from '.'; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); let mockedWidth = 1000; -jest.mock('../../utils'); +jest.mock('../../../../common/components/utils'); (useThrottledResizeObserver as jest.Mock).mockImplementation(() => ({ width: mockedWidth, })); @@ -26,11 +29,11 @@ describe('Properties', () => { const usersViewing = ['elastic']; const state: State = mockGlobalState; - let store = createStore(state, apolloClientObservable); + let store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); beforeEach(() => { jest.clearAllMocks(); - store = createStore(state, apolloClientObservable); + store = createStore(state, SUB_PLUGINS_REDUCER, apolloClientObservable); mockedWidth = 1000; }); diff --git a/x-pack/plugins/siem/public/components/timeline/properties/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/properties/index.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/properties/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/properties/index.tsx index 0080fcb1e69242..502cc85ce907aa 100644 --- a/x-pack/plugins/siem/public/components/timeline/properties/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/properties/index.tsx @@ -6,9 +6,9 @@ import React, { useState, useCallback, useMemo } from 'react'; -import { useThrottledResizeObserver } from '../../utils'; -import { Note } from '../../../lib/note'; -import { InputsModelId } from '../../../store/inputs/constants'; +import { useThrottledResizeObserver } from '../../../../common/components/utils'; +import { Note } from '../../../../common/lib/note'; +import { InputsModelId } from '../../../../common/store/inputs/constants'; import { AssociateNote, UpdateNote } from '../../notes/helpers'; import { TimelineProperties } from './styles'; diff --git a/x-pack/plugins/siem/public/components/timeline/properties/notes_size.ts b/x-pack/plugins/siem/public/timelines/components/timeline/properties/notes_size.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/properties/notes_size.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/properties/notes_size.ts diff --git a/x-pack/plugins/siem/public/components/timeline/properties/properties_left.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/properties/properties_left.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/properties/properties_left.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/properties/properties_left.tsx index 3016def8a80b10..52766422e49c38 100644 --- a/x-pack/plugins/siem/public/components/timeline/properties/properties_left.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/properties/properties_left.tsx @@ -10,8 +10,8 @@ import React from 'react'; import styled from 'styled-components'; import { Description, Name, NotesButton, StarIcon } from './helpers'; import { AssociateNote, UpdateNote } from '../../notes/helpers'; -import { Note } from '../../../lib/note'; -import { SuperDatePicker } from '../../super_date_picker'; +import { Note } from '../../../../common/lib/note'; +import { SuperDatePicker } from '../../../../common/components/super_date_picker'; import * as i18n from './translations'; diff --git a/x-pack/plugins/siem/public/components/timeline/properties/properties_right.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/properties/properties_right.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/properties/properties_right.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/properties/properties_right.tsx index 59d268487cca72..3db64390b51b71 100644 --- a/x-pack/plugins/siem/public/components/timeline/properties/properties_right.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/properties/properties_right.tsx @@ -17,11 +17,11 @@ import { import { NewTimeline, Description, NotesButton, NewCase } from './helpers'; import { OpenTimelineModalButton } from '../../open_timeline/open_timeline_modal/open_timeline_modal_button'; import { OpenTimelineModal } from '../../open_timeline/open_timeline_modal'; -import { InspectButton, InspectButtonContainer } from '../../inspect'; +import { InspectButton, InspectButtonContainer } from '../../../../common/components/inspect'; import * as i18n from './translations'; import { AssociateNote } from '../../notes/helpers'; -import { Note } from '../../../lib/note'; +import { Note } from '../../../../common/lib/note'; export const PropertiesRightStyle = styled(EuiFlexGroup)` margin-right: 5px; diff --git a/x-pack/plugins/siem/public/components/timeline/properties/styles.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/properties/styles.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/properties/styles.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/properties/styles.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/properties/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/properties/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/properties/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/properties/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/query_bar/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/query_bar/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/query_bar/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/query_bar/index.test.tsx index a78e5b8e1d2264..546f06b60cb56a 100644 --- a/x-pack/plugins/siem/public/components/timeline/query_bar/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/query_bar/index.test.tsx @@ -7,13 +7,13 @@ import { mount } from 'enzyme'; import React from 'react'; -import { DEFAULT_FROM, DEFAULT_TO } from '../../../../common/constants'; -import { mockBrowserFields } from '../../../containers/source/mock'; -import { convertKueryToElasticSearchQuery } from '../../../lib/keury'; -import { mockIndexPattern, TestProviders } from '../../../mock'; -import { createKibanaCoreStartMock } from '../../../mock/kibana_core'; -import { QueryBar } from '../../query_bar'; -import { FilterManager } from '../../../../../../../src/plugins/data/public'; +import { DEFAULT_FROM, DEFAULT_TO } from '../../../../../common/constants'; +import { mockBrowserFields } from '../../../../common/containers/source/mock'; +import { convertKueryToElasticSearchQuery } from '../../../../common/lib/keury'; +import { mockIndexPattern, TestProviders } from '../../../../common/mock'; +import { createKibanaCoreStartMock } from '../../../../common/mock/kibana_core'; +import { QueryBar } from '../../../../common/components/query_bar'; +import { FilterManager } from '../../../../../../../../src/plugins/data/public'; import { mockDataProviders } from '../data_providers/mock/mock_data_providers'; import { buildGlobalQuery } from '../helpers'; @@ -21,7 +21,7 @@ import { QueryBarTimeline, QueryBarTimelineComponentProps, getDataProviderFilter const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings; -jest.mock('../../../lib/kibana'); +jest.mock('../../../../common/lib/kibana'); describe('Timeline QueryBar ', () => { // We are doing that because we need to wrapped this component with redux diff --git a/x-pack/plugins/siem/public/components/timeline/query_bar/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/query_bar/index.tsx similarity index 94% rename from x-pack/plugins/siem/public/components/timeline/query_bar/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/query_bar/index.tsx index 7d2b4f71183dde..07a769751cb0fc 100644 --- a/x-pack/plugins/siem/public/components/timeline/query_bar/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/query_bar/index.tsx @@ -17,15 +17,15 @@ import { FilterManager, SavedQuery, SavedQueryTimeFilter, -} from '../../../../../../../src/plugins/data/public'; +} from '../../../../../../../../src/plugins/data/public'; -import { BrowserFields } from '../../../containers/source'; -import { convertKueryToElasticSearchQuery } from '../../../lib/keury'; -import { KueryFilterQuery, KueryFilterQueryKind } from '../../../store'; -import { KqlMode } from '../../../store/timeline/model'; -import { useSavedQueryServices } from '../../../utils/saved_query_services'; -import { DispatchUpdateReduxTime } from '../../super_date_picker'; -import { QueryBar } from '../../query_bar'; +import { BrowserFields } from '../../../../common/containers/source'; +import { convertKueryToElasticSearchQuery } from '../../../../common/lib/keury'; +import { KueryFilterQuery, KueryFilterQueryKind } from '../../../../common/store'; +import { KqlMode } from '../../../../timelines/store/timeline/model'; +import { useSavedQueryServices } from '../../../../common/utils/saved_query_services'; +import { DispatchUpdateReduxTime } from '../../../../common/components/super_date_picker'; +import { QueryBar } from '../../../../common/components/query_bar'; import { DataProvider } from '../data_providers/data_provider'; import { buildGlobalQuery } from '../helpers'; diff --git a/x-pack/plugins/siem/public/components/timeline/refetch_timeline.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/refetch_timeline.tsx similarity index 83% rename from x-pack/plugins/siem/public/components/timeline/refetch_timeline.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/refetch_timeline.tsx index 73c20d9b9b6b47..aef6e0df604cb8 100644 --- a/x-pack/plugins/siem/public/components/timeline/refetch_timeline.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/refetch_timeline.tsx @@ -7,9 +7,9 @@ import React, { useEffect } from 'react'; import { useDispatch } from 'react-redux'; -import { inputsModel } from '../../store'; -import { inputsActions } from '../../store/actions'; -import { InputsModelId } from '../../store/inputs/constants'; +import { inputsModel } from '../../../common/store'; +import { inputsActions } from '../../../common/store/actions'; +import { InputsModelId } from '../../../common/store/inputs/constants'; export interface TimelineRefetchProps { id: string; diff --git a/x-pack/plugins/siem/public/components/timeline/search_or_filter/helpers.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/helpers.test.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/search_or_filter/helpers.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/helpers.test.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/helpers.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/helpers.tsx index 5db453988cbb8e..77257e367c6f58 100644 --- a/x-pack/plugins/siem/public/components/timeline/search_or_filter/helpers.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/helpers.tsx @@ -8,10 +8,10 @@ import { EuiSpacer, EuiText } from '@elastic/eui'; import React from 'react'; import styled from 'styled-components'; -import { AndOrBadge } from '../../and_or_badge'; +import { AndOrBadge } from '../and_or_badge'; import * as i18n from './translations'; -import { KqlMode } from '../../../store/timeline/model'; +import { KqlMode } from '../../../../timelines/store/timeline/model'; const AndOrContainer = styled.div` position: relative; diff --git a/x-pack/plugins/siem/public/components/timeline/search_or_filter/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/components/timeline/search_or_filter/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/index.tsx index fa92ef9ce59652..22fbaadf2e816e 100644 --- a/x-pack/plugins/siem/public/components/timeline/search_or_filter/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/index.tsx @@ -10,21 +10,24 @@ import { connect, ConnectedProps } from 'react-redux'; import { Dispatch } from 'redux'; import deepEqual from 'fast-deep-equal'; -import { Filter, FilterManager, IIndexPattern } from '../../../../../../../src/plugins/data/public'; -import { BrowserFields } from '../../../containers/source'; -import { convertKueryToElasticSearchQuery } from '../../../lib/keury'; +import { + Filter, + FilterManager, + IIndexPattern, +} from '../../../../../../../../src/plugins/data/public'; +import { BrowserFields } from '../../../../common/containers/source'; +import { convertKueryToElasticSearchQuery } from '../../../../common/lib/keury'; import { KueryFilterQuery, SerializedFilterQuery, State, - timelineSelectors, inputsModel, inputsSelectors, -} from '../../../store'; -import { timelineActions } from '../../../store/actions'; -import { KqlMode, TimelineModel, EventType } from '../../../store/timeline/model'; -import { timelineDefaults } from '../../../store/timeline/defaults'; -import { dispatchUpdateReduxTime } from '../../super_date_picker'; +} from '../../../../common/store'; +import { timelineActions, timelineSelectors } from '../../../store/timeline'; +import { KqlMode, TimelineModel, EventType } from '../../../../timelines/store/timeline/model'; +import { timelineDefaults } from '../../../../timelines/store/timeline/defaults'; +import { dispatchUpdateReduxTime } from '../../../../common/components/super_date_picker'; import { SearchOrFilter } from './search_or_filter'; interface OwnProps { diff --git a/x-pack/plugins/siem/public/components/timeline/search_or_filter/pick_events.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/pick_events.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/search_or_filter/pick_events.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/pick_events.tsx index 3117bae7452864..85097f93464b34 100644 --- a/x-pack/plugins/siem/public/components/timeline/search_or_filter/pick_events.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/pick_events.tsx @@ -8,7 +8,7 @@ import { EuiHealth, EuiSuperSelect } from '@elastic/eui'; import React, { memo } from 'react'; import styled from 'styled-components'; -import { EventType } from '../../../store/timeline/model'; +import { EventType } from '../../../../timelines/store/timeline/model'; import * as i18n from './translations'; interface EventTypeOptionItem { diff --git a/x-pack/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx similarity index 93% rename from x-pack/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx index 0b8ed71135744f..388085d1361f37 100644 --- a/x-pack/plugins/siem/public/components/timeline/search_or_filter/search_or_filter.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx @@ -8,11 +8,15 @@ import { EuiFlexGroup, EuiFlexItem, EuiSuperSelect, EuiToolTip } from '@elastic/ import React from 'react'; import styled, { createGlobalStyle } from 'styled-components'; -import { Filter, FilterManager, IIndexPattern } from '../../../../../../../src/plugins/data/public'; -import { BrowserFields } from '../../../containers/source'; -import { KueryFilterQuery, KueryFilterQueryKind } from '../../../store'; -import { KqlMode, EventType } from '../../../store/timeline/model'; -import { DispatchUpdateReduxTime } from '../../super_date_picker'; +import { + Filter, + FilterManager, + IIndexPattern, +} from '../../../../../../../../src/plugins/data/public'; +import { BrowserFields } from '../../../../common/containers/source'; +import { KueryFilterQuery, KueryFilterQueryKind } from '../../../../common/store'; +import { KqlMode, EventType } from '../../../../timelines/store/timeline/model'; +import { DispatchUpdateReduxTime } from '../../../../common/components/super_date_picker'; import { DataProvider } from '../data_providers/data_provider'; import { QueryBarTimeline } from '../query_bar'; diff --git a/x-pack/plugins/siem/public/components/timeline/search_or_filter/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/search_or_filter/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/search_or_filter/translations.ts diff --git a/x-pack/plugins/siem/public/components/timeline/search_super_select/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/search_super_select/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/search_super_select/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/search_super_select/index.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/selectable_timeline/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/selectable_timeline/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/selectable_timeline/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/selectable_timeline/index.tsx index 964bb2061333d4..fb3cb3f177ca04 100644 --- a/x-pack/plugins/siem/public/components/timeline/selectable_timeline/index.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/selectable_timeline/index.tsx @@ -21,14 +21,14 @@ import React, { memo, useCallback, useMemo, useState, useEffect } from 'react'; import { ListProps } from 'react-virtualized'; import styled from 'styled-components'; -import { useGetAllTimeline } from '../../../containers/timeline/all'; -import { SortFieldTimeline, Direction } from '../../../graphql/types'; -import { TimelineType, TimelineTypeLiteralWithNull } from '../../../../common/types/timeline'; +import { TimelineType, TimelineTypeLiteralWithNull } from '../../../../../common/types/timeline'; +import { useGetAllTimeline } from '../../../containers/all'; +import { SortFieldTimeline, Direction } from '../../../../graphql/types'; import { isUntitled } from '../../open_timeline/helpers'; import * as i18nTimeline from '../../open_timeline/translations'; import { OpenTimelineResult } from '../../open_timeline/types'; -import { getEmptyTagValue } from '../../empty_value'; +import { getEmptyTagValue } from '../../../../common/components/empty_value'; import * as i18n from '../translations'; diff --git a/x-pack/plugins/siem/public/components/skeleton_row/__snapshots__/index.test.tsx.snap b/x-pack/plugins/siem/public/timelines/components/timeline/skeleton_row/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/siem/public/components/skeleton_row/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/siem/public/timelines/components/timeline/skeleton_row/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/siem/public/components/skeleton_row/index.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/skeleton_row/index.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/skeleton_row/index.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/skeleton_row/index.test.tsx index 0ee54a1a20003a..b63359077bf2c9 100644 --- a/x-pack/plugins/siem/public/components/skeleton_row/index.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/skeleton_row/index.test.tsx @@ -7,7 +7,7 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; -import { TestProviders } from '../../mock'; +import { TestProviders } from '../../../../common/mock'; import { SkeletonRow } from './index'; describe('SkeletonRow', () => { diff --git a/x-pack/plugins/siem/public/components/skeleton_row/index.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/skeleton_row/index.tsx similarity index 100% rename from x-pack/plugins/siem/public/components/skeleton_row/index.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/skeleton_row/index.tsx diff --git a/x-pack/plugins/siem/public/components/timeline/styles.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/styles.tsx similarity index 98% rename from x-pack/plugins/siem/public/components/timeline/styles.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/styles.tsx index 16fb57714829cc..aad80cbdfe3372 100644 --- a/x-pack/plugins/siem/public/components/timeline/styles.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/styles.tsx @@ -8,8 +8,8 @@ import { EuiLoadingSpinner } from '@elastic/eui'; import { rgba } from 'polished'; import styled, { createGlobalStyle } from 'styled-components'; -import { EventType } from '../../store/timeline/model'; -import { IS_TIMELINE_FIELD_DRAGGING_CLASS_NAME } from '../drag_and_drop/helpers'; +import { EventType } from '../../../timelines/store/timeline/model'; +import { IS_TIMELINE_FIELD_DRAGGING_CLASS_NAME } from '../../../common/components/drag_and_drop/helpers'; /** * TIMELINE BODY diff --git a/x-pack/plugins/siem/public/components/timeline/timeline.test.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/timeline.test.tsx similarity index 96% rename from x-pack/plugins/siem/public/components/timeline/timeline.test.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/timeline.test.tsx index 0d0ce79c77be7f..578f85fe9ddffe 100644 --- a/x-pack/plugins/siem/public/components/timeline/timeline.test.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/timeline.test.tsx @@ -9,11 +9,11 @@ import React from 'react'; import { MockedProvider } from 'react-apollo/test-utils'; import useResizeObserver from 'use-resize-observer/polyfilled'; -import { timelineQuery } from '../../containers/timeline/index.gql_query'; -import { mockBrowserFields } from '../../containers/source/mock'; -import { Direction } from '../../graphql/types'; -import { defaultHeaders, mockTimelineData, mockIndexPattern } from '../../mock'; -import { TestProviders } from '../../mock/test_providers'; +import { timelineQuery } from '../../containers/index.gql_query'; +import { mockBrowserFields } from '../../../common/containers/source/mock'; +import { Direction } from '../../../graphql/types'; +import { defaultHeaders, mockTimelineData, mockIndexPattern } from '../../../common/mock'; +import { TestProviders } from '../../../common/mock/test_providers'; import { DELETE_CLASS_NAME, @@ -23,9 +23,9 @@ import { import { TimelineComponent, Props as TimelineComponentProps } from './timeline'; import { Sort } from './body/sort'; import { mockDataProviders } from './data_providers/mock/mock_data_providers'; -import { useMountAppended } from '../../utils/use_mount_appended'; +import { useMountAppended } from '../../../common/utils/use_mount_appended'; -jest.mock('../../lib/kibana'); +jest.mock('../../../common/lib/kibana'); const mockUseResizeObserver: jest.Mock = useResizeObserver as jest.Mock; jest.mock('use-resize-observer/polyfilled'); diff --git a/x-pack/plugins/siem/public/components/timeline/timeline.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/timeline.tsx similarity index 95% rename from x-pack/plugins/siem/public/components/timeline/timeline.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/timeline.tsx index cc3116235557f7..79d86e5b556d84 100644 --- a/x-pack/plugins/siem/public/components/timeline/timeline.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/timeline.tsx @@ -10,11 +10,11 @@ import React, { useState, useMemo } from 'react'; import styled from 'styled-components'; import { FlyoutHeaderWithCloseButton } from '../flyout/header_with_close_button'; -import { BrowserFields } from '../../containers/source'; -import { TimelineQuery } from '../../containers/timeline'; -import { Direction } from '../../graphql/types'; -import { useKibana } from '../../lib/kibana'; -import { ColumnHeaderOptions, KqlMode, EventType } from '../../store/timeline/model'; +import { BrowserFields } from '../../../common/containers/source'; +import { TimelineQuery } from '../../containers/index'; +import { Direction } from '../../../graphql/types'; +import { useKibana } from '../../../common/lib/kibana'; +import { ColumnHeaderOptions, KqlMode, EventType } from '../../../timelines/store/timeline/model'; import { defaultHeaders } from './body/column_headers/default_headers'; import { Sort } from './body/sort'; import { StatefulBody } from './body/stateful_body'; @@ -37,7 +37,7 @@ import { Filter, FilterManager, IIndexPattern, -} from '../../../../../../src/plugins/data/public'; +} from '../../../../../../../src/plugins/data/public'; const TimelineContainer = styled.div` height: 100%; diff --git a/x-pack/plugins/siem/public/components/timeline/timeline_context.tsx b/x-pack/plugins/siem/public/timelines/components/timeline/timeline_context.tsx similarity index 97% rename from x-pack/plugins/siem/public/components/timeline/timeline_context.tsx rename to x-pack/plugins/siem/public/timelines/components/timeline/timeline_context.tsx index 25a0078b6066a6..7c1eadd8e8beda 100644 --- a/x-pack/plugins/siem/public/components/timeline/timeline_context.tsx +++ b/x-pack/plugins/siem/public/timelines/components/timeline/timeline_context.tsx @@ -6,7 +6,7 @@ import React, { createContext, memo, useContext, useEffect, useState } from 'react'; -import { FilterManager } from '../../../../../../src/plugins/data/public'; +import { FilterManager } from '../../../../../../../src/plugins/data/public'; import { TimelineAction } from './body/actions'; diff --git a/x-pack/plugins/siem/public/components/timeline/translations.ts b/x-pack/plugins/siem/public/timelines/components/timeline/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/components/timeline/translations.ts rename to x-pack/plugins/siem/public/timelines/components/timeline/translations.ts diff --git a/x-pack/plugins/siem/public/containers/timeline/all/index.gql_query.ts b/x-pack/plugins/siem/public/timelines/containers/all/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/timeline/all/index.gql_query.ts rename to x-pack/plugins/siem/public/timelines/containers/all/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/timeline/all/index.tsx b/x-pack/plugins/siem/public/timelines/containers/all/index.tsx similarity index 93% rename from x-pack/plugins/siem/public/containers/timeline/all/index.tsx rename to x-pack/plugins/siem/public/timelines/containers/all/index.tsx index e1d1edc1a8cecb..bdab29953a249f 100644 --- a/x-pack/plugins/siem/public/containers/timeline/all/index.tsx +++ b/x-pack/plugins/siem/public/timelines/containers/all/index.tsx @@ -9,19 +9,19 @@ import memoizeOne from 'memoize-one'; import { useCallback, useState, useEffect } from 'react'; import { useDispatch } from 'react-redux'; -import { OpenTimelineResult } from '../../../components/open_timeline/types'; -import { errorToToaster, useStateToaster } from '../../../components/toasters'; +import { OpenTimelineResult } from '../../components/open_timeline/types'; +import { errorToToaster, useStateToaster } from '../../../common/components/toasters'; import { GetAllTimeline, PageInfoTimeline, SortTimeline, TimelineResult, } from '../../../graphql/types'; -import { inputsActions } from '../../../store/inputs'; -import { useApolloClient } from '../../../utils/apollo_context'; +import { inputsActions } from '../../../common/store/inputs'; +import { useApolloClient } from '../../../common/utils/apollo_context'; import { allTimelinesQuery } from './index.gql_query'; -import * as i18n from '../../../pages/timelines/translations'; +import * as i18n from '../../pages/translations'; import { TimelineTypeLiteralWithNull } from '../../../../common/types/timeline'; export interface AllTimelinesArgs { diff --git a/x-pack/plugins/siem/public/containers/timeline/api.ts b/x-pack/plugins/siem/public/timelines/containers/api.ts similarity index 90% rename from x-pack/plugins/siem/public/containers/timeline/api.ts rename to x-pack/plugins/siem/public/timelines/containers/api.ts index 023e2e6af9f88e..8afbec05938eb8 100644 --- a/x-pack/plugins/siem/public/containers/timeline/api.ts +++ b/x-pack/plugins/siem/public/timelines/containers/api.ts @@ -15,11 +15,14 @@ import { } from '../../../common/types/timeline'; import { TIMELINE_URL, TIMELINE_IMPORT_URL, TIMELINE_EXPORT_URL } from '../../../common/constants'; -import { KibanaServices } from '../../lib/kibana'; -import { ExportSelectedData } from '../../components/generic_downloader'; +import { KibanaServices } from '../../common/lib/kibana'; +import { ExportSelectedData } from '../../common/components/generic_downloader'; -import { createToasterPlainError } from '../case/utils'; -import { ImportDataProps, ImportDataResponse } from '../detection_engine/rules'; +import { createToasterPlainError } from '../../cases/containers/utils'; +import { + ImportDataProps, + ImportDataResponse, +} from '../../alerts/containers/detection_engine/rules'; interface RequestPostTimeline { timeline: SavedTimeline; diff --git a/x-pack/plugins/siem/public/containers/timeline/delete/persist.gql_query.ts b/x-pack/plugins/siem/public/timelines/containers/delete/persist.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/timeline/delete/persist.gql_query.ts rename to x-pack/plugins/siem/public/timelines/containers/delete/persist.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/timeline/details/index.gql_query.ts b/x-pack/plugins/siem/public/timelines/containers/details/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/timeline/details/index.gql_query.ts rename to x-pack/plugins/siem/public/timelines/containers/details/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/timeline/details/index.tsx b/x-pack/plugins/siem/public/timelines/containers/details/index.tsx similarity index 97% rename from x-pack/plugins/siem/public/containers/timeline/details/index.tsx rename to x-pack/plugins/siem/public/timelines/containers/details/index.tsx index cf1b8954307e7b..1b84451b5cba62 100644 --- a/x-pack/plugins/siem/public/containers/timeline/details/index.tsx +++ b/x-pack/plugins/siem/public/timelines/containers/details/index.tsx @@ -11,7 +11,7 @@ import { Query } from 'react-apollo'; import { DEFAULT_INDEX_KEY } from '../../../../common/constants'; import { DetailItem, GetTimelineDetailsQuery } from '../../../graphql/types'; -import { useUiSetting } from '../../../lib/kibana'; +import { useUiSetting } from '../../../common/lib/kibana'; import { timelineDetailsQuery } from './index.gql_query'; diff --git a/x-pack/plugins/siem/public/containers/timeline/favorite/persist.gql_query.ts b/x-pack/plugins/siem/public/timelines/containers/favorite/persist.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/timeline/favorite/persist.gql_query.ts rename to x-pack/plugins/siem/public/timelines/containers/favorite/persist.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/timeline/index.gql_query.ts b/x-pack/plugins/siem/public/timelines/containers/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/timeline/index.gql_query.ts rename to x-pack/plugins/siem/public/timelines/containers/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/timeline/index.tsx b/x-pack/plugins/siem/public/timelines/containers/index.tsx similarity index 92% rename from x-pack/plugins/siem/public/containers/timeline/index.tsx rename to x-pack/plugins/siem/public/timelines/containers/index.tsx index 6e09e124696b6f..76f6bdd36ecec0 100644 --- a/x-pack/plugins/siem/public/containers/timeline/index.tsx +++ b/x-pack/plugins/siem/public/timelines/containers/index.tsx @@ -20,14 +20,14 @@ import { TimelineEdges, TimelineItem, } from '../../graphql/types'; -import { inputsModel, inputsSelectors, State } from '../../store'; -import { withKibana, WithKibanaProps } from '../../lib/kibana'; -import { createFilter } from '../helpers'; -import { QueryTemplate, QueryTemplateProps } from '../query_template'; -import { EventType } from '../../store/timeline/model'; +import { inputsModel, inputsSelectors, State } from '../../common/store'; +import { withKibana, WithKibanaProps } from '../../common/lib/kibana'; +import { createFilter } from '../../common/containers/helpers'; +import { QueryTemplate, QueryTemplateProps } from '../../common/containers/query_template'; +import { EventType } from '../../timelines/store/timeline/model'; import { timelineQuery } from './index.gql_query'; -import { timelineActions } from '../../store/timeline'; -import { SIGNALS_PAGE_TIMELINE_ID } from '../../pages/detection_engine/components/signals'; +import { timelineActions } from '../../timelines/store/timeline'; +import { SIGNALS_PAGE_TIMELINE_ID } from '../../alerts/components/signals'; export interface TimelineArgs { events: TimelineItem[]; diff --git a/x-pack/plugins/siem/public/containers/timeline/notes/persist.gql_query.ts b/x-pack/plugins/siem/public/timelines/containers/notes/persist.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/timeline/notes/persist.gql_query.ts rename to x-pack/plugins/siem/public/timelines/containers/notes/persist.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/timeline/one/index.gql_query.ts b/x-pack/plugins/siem/public/timelines/containers/one/index.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/timeline/one/index.gql_query.ts rename to x-pack/plugins/siem/public/timelines/containers/one/index.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/timeline/persist.gql_query.ts b/x-pack/plugins/siem/public/timelines/containers/persist.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/timeline/persist.gql_query.ts rename to x-pack/plugins/siem/public/timelines/containers/persist.gql_query.ts diff --git a/x-pack/plugins/siem/public/containers/timeline/pinned_event/persist.gql_query.ts b/x-pack/plugins/siem/public/timelines/containers/pinned_event/persist.gql_query.ts similarity index 100% rename from x-pack/plugins/siem/public/containers/timeline/pinned_event/persist.gql_query.ts rename to x-pack/plugins/siem/public/timelines/containers/pinned_event/persist.gql_query.ts diff --git a/x-pack/plugins/siem/public/timelines/index.ts b/x-pack/plugins/siem/public/timelines/index.ts new file mode 100644 index 00000000000000..5cce258b10d16e --- /dev/null +++ b/x-pack/plugins/siem/public/timelines/index.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SecuritySubPluginWithStore } from '../app/types'; +import { getTimelinesRoutes } from './routes'; +import { initialTimelineState, timelineReducer } from './store/timeline/reducer'; +import { TimelineState } from './store/timeline/types'; + +export class Timelines { + public setup() {} + + public start(): SecuritySubPluginWithStore<'timeline', TimelineState> { + return { + routes: getTimelinesRoutes(), + store: { + initialState: { timeline: initialTimelineState }, + reducer: { timeline: timelineReducer }, + }, + }; + } +} diff --git a/x-pack/plugins/siem/public/pages/timelines/index.tsx b/x-pack/plugins/siem/public/timelines/pages/index.tsx similarity index 84% rename from x-pack/plugins/siem/public/pages/timelines/index.tsx rename to x-pack/plugins/siem/public/timelines/pages/index.tsx index 343be5cbe3839e..55b4dc16c28410 100644 --- a/x-pack/plugins/siem/public/pages/timelines/index.tsx +++ b/x-pack/plugins/siem/public/timelines/pages/index.tsx @@ -11,15 +11,15 @@ import { Switch, Route, Redirect } from 'react-router-dom'; import { ChromeBreadcrumb } from '../../../../../../src/core/public'; import { TimelineType } from '../../../common/types/timeline'; -import { TAB_TIMELINES, TAB_TEMPLATES } from '../../components/open_timeline/translations'; -import { getTimelinesUrl } from '../../components/link_to'; -import { TimelineRouteSpyState } from '../../utils/route/types'; +import { TAB_TIMELINES, TAB_TEMPLATES } from '../components/open_timeline/translations'; +import { getTimelinesUrl } from '../../common/components/link_to'; +import { TimelineRouteSpyState } from '../../common/utils/route/types'; -import { SiemPageName } from '../home/types'; +import { SiemPageName } from '../../app/types'; import { TimelinesPage } from './timelines_page'; import { PAGE_TITLE } from './translations'; -import { appendSearch } from '../../components/link_to/helpers'; +import { appendSearch } from '../../common/components/link_to/helpers'; const timelinesPagePath = `/:pageName(${SiemPageName.timelines})/:tabName(${TimelineType.default}|${TimelineType.template})`; const timelinesDefaultPath = `/${SiemPageName.timelines}/${TimelineType.default}`; diff --git a/x-pack/plugins/siem/public/pages/timelines/timelines_page.test.tsx b/x-pack/plugins/siem/public/timelines/pages/timelines_page.test.tsx similarity index 92% rename from x-pack/plugins/siem/public/pages/timelines/timelines_page.test.tsx rename to x-pack/plugins/siem/public/timelines/pages/timelines_page.test.tsx index ae95a1316a6002..0338163d8b79fb 100644 --- a/x-pack/plugins/siem/public/pages/timelines/timelines_page.test.tsx +++ b/x-pack/plugins/siem/public/timelines/pages/timelines_page.test.tsx @@ -4,15 +4,16 @@ * you may not use this file except in compliance with the Elastic License. */ -import { TimelinesPageComponent } from './timelines_page'; -import { useKibana } from '../../lib/kibana'; +import ApolloClient from 'apollo-client'; import { shallow, ShallowWrapper } from 'enzyme'; import React from 'react'; -import ApolloClient from 'apollo-client'; -jest.mock('../../pages/overview/events_by_dataset'); +import { useKibana } from '../../common/lib/kibana'; +import { TimelinesPageComponent } from './timelines_page'; + +jest.mock('../../overview/components/events_by_dataset'); -jest.mock('../../lib/kibana', () => { +jest.mock('../../common/lib/kibana', () => { return { useKibana: jest.fn(), }; @@ -21,7 +22,7 @@ describe('TimelinesPageComponent', () => { const mockAppollloClient = {} as ApolloClient; let wrapper: ShallowWrapper; - describe('If the user is authorised', () => { + describe('If the user is authorized', () => { beforeAll(() => { ((useKibana as unknown) as jest.Mock).mockReturnValue({ services: { diff --git a/x-pack/plugins/siem/public/pages/timelines/timelines_page.tsx b/x-pack/plugins/siem/public/timelines/pages/timelines_page.tsx similarity index 85% rename from x-pack/plugins/siem/public/pages/timelines/timelines_page.tsx rename to x-pack/plugins/siem/public/timelines/pages/timelines_page.tsx index 73070d2b94aace..d00aef64204516 100644 --- a/x-pack/plugins/siem/public/pages/timelines/timelines_page.tsx +++ b/x-pack/plugins/siem/public/timelines/pages/timelines_page.tsx @@ -4,17 +4,16 @@ * you may not use this file except in compliance with the Elastic License. */ +import { EuiButton } from '@elastic/eui'; import ApolloClient from 'apollo-client'; -import React, { useState, useCallback } from 'react'; +import React, { useCallback, useState } from 'react'; import styled from 'styled-components'; - -import { EuiButton } from '@elastic/eui'; -import { HeaderPage } from '../../components/header_page'; -import { StatefulOpenTimeline } from '../../components/open_timeline'; -import { WrapperPage } from '../../components/wrapper_page'; -import { SpyRoute } from '../../utils/route/spy_routes'; +import { HeaderPage } from '../../common/components/header_page'; +import { WrapperPage } from '../../common/components/wrapper_page'; +import { useKibana } from '../../common/lib/kibana'; +import { SpyRoute } from '../../common/utils/route/spy_routes'; +import { StatefulOpenTimeline } from '../components/open_timeline'; import * as i18n from './translations'; -import { useKibana } from '../../lib/kibana'; const TimelinesContainer = styled.div` width: 100%; diff --git a/x-pack/plugins/siem/public/pages/timelines/translations.ts b/x-pack/plugins/siem/public/timelines/pages/translations.ts similarity index 100% rename from x-pack/plugins/siem/public/pages/timelines/translations.ts rename to x-pack/plugins/siem/public/timelines/pages/translations.ts diff --git a/x-pack/plugins/siem/public/timelines/routes.tsx b/x-pack/plugins/siem/public/timelines/routes.tsx new file mode 100644 index 00000000000000..50b8e1b8a71189 --- /dev/null +++ b/x-pack/plugins/siem/public/timelines/routes.tsx @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Route } from 'react-router-dom'; + +import { Timelines } from './pages'; +import { SiemPageName } from '../app/types'; + +export const getTimelinesRoutes = () => [ + } />, +]; diff --git a/x-pack/plugins/siem/public/store/timeline/actions.ts b/x-pack/plugins/siem/public/timelines/store/timeline/actions.ts similarity index 94% rename from x-pack/plugins/siem/public/store/timeline/actions.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/actions.ts index 12155decf40d44..ba62c5b93012d9 100644 --- a/x-pack/plugins/siem/public/store/timeline/actions.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/actions.ts @@ -6,16 +6,16 @@ import actionCreatorFactory from 'typescript-fsa'; -import { Filter } from '../../../../../../src/plugins/data/public'; -import { Sort } from '../../components/timeline/body/sort'; +import { Filter } from '../../../../../../../src/plugins/data/public'; +import { Sort } from '../../../timelines/components/timeline/body/sort'; import { DataProvider, QueryOperator, -} from '../../components/timeline/data_providers/data_provider'; -import { KueryFilterQuery, SerializedFilterQuery } from '../types'; +} from '../../../timelines/components/timeline/data_providers/data_provider'; +import { KueryFilterQuery, SerializedFilterQuery } from '../../../common/store/types'; import { EventType, KqlMode, TimelineModel, ColumnHeaderOptions } from './model'; -import { TimelineNonEcsData } from '../../graphql/types'; +import { TimelineNonEcsData } from '../../../graphql/types'; const actionCreator = actionCreatorFactory('x-pack/siem/local/timeline'); diff --git a/x-pack/plugins/siem/public/store/timeline/defaults.ts b/x-pack/plugins/siem/public/timelines/store/timeline/defaults.ts similarity index 80% rename from x-pack/plugins/siem/public/store/timeline/defaults.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/defaults.ts index 9203720e2e28ce..e0f142bd61d03f 100644 --- a/x-pack/plugins/siem/public/store/timeline/defaults.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/defaults.ts @@ -4,11 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ -import { TimelineType } from '../../../common/types/timeline'; - -import { Direction } from '../../graphql/types'; -import { DEFAULT_TIMELINE_WIDTH } from '../../components/timeline/body/constants'; -import { defaultHeaders } from '../../components/timeline/body/column_headers/default_headers'; +import { TimelineType } from '../../../../common/types/timeline'; +import { Direction } from '../../../graphql/types'; +import { DEFAULT_TIMELINE_WIDTH } from '../../../timelines/components/timeline/body/constants'; +import { defaultHeaders } from '../../../timelines/components/timeline/body/column_headers/default_headers'; import { SubsetTimelineModel, TimelineModel } from './model'; export const timelineDefaults: SubsetTimelineModel & Pick = { diff --git a/x-pack/plugins/siem/public/store/timeline/epic.test.ts b/x-pack/plugins/siem/public/timelines/store/timeline/epic.test.ts similarity index 97% rename from x-pack/plugins/siem/public/store/timeline/epic.test.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/epic.test.ts index 00aa20e0786009..6bee579206de45 100644 --- a/x-pack/plugins/siem/public/store/timeline/epic.test.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/epic.test.ts @@ -4,14 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Filter, esFilters } from '../../../../../../src/plugins/data/public'; - -import { TimelineType } from '../../../common/types/timeline'; - -import { Direction } from '../../graphql/types'; - -import { TimelineModel } from './model'; +import { Filter, esFilters } from '../../../../../../../src/plugins/data/public'; +import { TimelineType } from '../../../../common/types/timeline'; +import { Direction } from '../../../graphql/types'; import { convertTimelineAsInput } from './epic'; +import { TimelineModel } from './model'; describe('Epic Timeline', () => { describe('#convertTimelineAsInput ', () => { diff --git a/x-pack/plugins/siem/public/store/timeline/epic.ts b/x-pack/plugins/siem/public/timelines/store/timeline/epic.ts similarity index 96% rename from x-pack/plugins/siem/public/store/timeline/epic.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/epic.ts index a7b8c48b45068e..7bb890292adf47 100644 --- a/x-pack/plugins/siem/public/store/timeline/epic.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/epic.ts @@ -28,13 +28,13 @@ import { takeUntil, } from 'rxjs/operators'; -import { esFilters, Filter, MatchAllFilter } from '../../../../../../src/plugins/data/public'; -import { TimelineType } from '../../../common/types/timeline'; -import { TimelineInput, ResponseTimeline, TimelineResult } from '../../graphql/types'; -import { AppApolloClient } from '../../lib/lib'; -import { addError } from '../app/actions'; -import { NotesById } from '../app/model'; -import { inputsModel } from '../inputs'; +import { esFilters, Filter, MatchAllFilter } from '../../../../../../../src/plugins/data/public'; +import { TimelineType } from '../../../../common/types/timeline'; +import { TimelineInput, ResponseTimeline, TimelineResult } from '../../../graphql/types'; +import { AppApolloClient } from '../../../common/lib/lib'; +import { addError } from '../../../common/store/app/actions'; +import { NotesById } from '../../../common/store/app/model'; +import { inputsModel } from '../../../common/store/inputs'; import { applyKqlFilterQuery, @@ -72,8 +72,8 @@ import { isNotNull } from './helpers'; import { dispatcherTimelinePersistQueue } from './epic_dispatcher_timeline_persistence_queue'; import { myEpicTimelineId } from './my_epic_timeline_id'; import { ActionTimeline, TimelineById } from './types'; -import { persistTimeline } from '../../containers/timeline/api'; -import { ALL_TIMELINE_QUERY_ID } from '../../containers/timeline/all'; +import { persistTimeline } from '../../containers/api'; +import { ALL_TIMELINE_QUERY_ID } from '../../containers/all'; interface TimelineEpicDependencies { timelineByIdSelector: (state: State) => TimelineById; diff --git a/x-pack/plugins/siem/public/store/timeline/epic_dispatcher_timeline_persistence_queue.ts b/x-pack/plugins/siem/public/timelines/store/timeline/epic_dispatcher_timeline_persistence_queue.ts similarity index 100% rename from x-pack/plugins/siem/public/store/timeline/epic_dispatcher_timeline_persistence_queue.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/epic_dispatcher_timeline_persistence_queue.ts diff --git a/x-pack/plugins/siem/public/store/timeline/epic_favorite.ts b/x-pack/plugins/siem/public/timelines/store/timeline/epic_favorite.ts similarity index 95% rename from x-pack/plugins/siem/public/store/timeline/epic_favorite.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/epic_favorite.ts index 6a1dadb8a59f59..0fd8e983085f7f 100644 --- a/x-pack/plugins/siem/public/store/timeline/epic_favorite.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/epic_favorite.ts @@ -12,9 +12,9 @@ import { Epic } from 'redux-observable'; import { from, Observable, empty } from 'rxjs'; import { filter, mergeMap, withLatestFrom, startWith, takeUntil } from 'rxjs/operators'; -import { persistTimelineFavoriteMutation } from '../../containers/timeline/favorite/persist.gql_query'; -import { PersistTimelineFavoriteMutation, ResponseFavoriteTimeline } from '../../graphql/types'; -import { addError } from '../app/actions'; +import { persistTimelineFavoriteMutation } from '../../containers/favorite/persist.gql_query'; +import { PersistTimelineFavoriteMutation, ResponseFavoriteTimeline } from '../../../graphql/types'; +import { addError } from '../../../common/store/app/actions'; import { endTimelineSaving, updateIsFavorite, @@ -26,7 +26,7 @@ import { dispatcherTimelinePersistQueue } from './epic_dispatcher_timeline_persi import { refetchQueries } from './refetch_queries'; import { myEpicTimelineId } from './my_epic_timeline_id'; import { ActionTimeline, TimelineById } from './types'; -import { inputsModel } from '../inputs'; +import { inputsModel } from '../../../common/store/inputs'; export const timelineFavoriteActionsType = [updateIsFavorite.type]; diff --git a/x-pack/plugins/siem/public/store/timeline/epic_note.ts b/x-pack/plugins/siem/public/timelines/store/timeline/epic_note.ts similarity index 93% rename from x-pack/plugins/siem/public/store/timeline/epic_note.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/epic_note.ts index 3722a6ad8036ca..30b2566de1468f 100644 --- a/x-pack/plugins/siem/public/store/timeline/epic_note.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/epic_note.ts @@ -12,11 +12,11 @@ import { Epic } from 'redux-observable'; import { from, empty, Observable } from 'rxjs'; import { filter, mergeMap, switchMap, withLatestFrom, startWith, takeUntil } from 'rxjs/operators'; -import { persistTimelineNoteMutation } from '../../containers/timeline/notes/persist.gql_query'; -import { PersistTimelineNoteMutation, ResponseNote } from '../../graphql/types'; -import { updateNote, addError } from '../app/actions'; -import { NotesById } from '../app/model'; -import { inputsModel } from '../inputs'; +import { persistTimelineNoteMutation } from '../../../timelines/containers/notes/persist.gql_query'; +import { PersistTimelineNoteMutation, ResponseNote } from '../../../graphql/types'; +import { updateNote, addError } from '../../../common/store/app/actions'; +import { NotesById } from '../../../common/store/app/model'; +import { inputsModel } from '../../../common/store/inputs'; import { addNote, diff --git a/x-pack/plugins/siem/public/store/timeline/epic_pinned_event.ts b/x-pack/plugins/siem/public/timelines/store/timeline/epic_pinned_event.ts similarity index 95% rename from x-pack/plugins/siem/public/store/timeline/epic_pinned_event.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/epic_pinned_event.ts index a1281250ba72af..88c080bb78ccab 100644 --- a/x-pack/plugins/siem/public/store/timeline/epic_pinned_event.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/epic_pinned_event.ts @@ -12,10 +12,10 @@ import { Epic } from 'redux-observable'; import { from, Observable, empty } from 'rxjs'; import { filter, mergeMap, startWith, withLatestFrom, takeUntil } from 'rxjs/operators'; -import { persistTimelinePinnedEventMutation } from '../../containers/timeline/pinned_event/persist.gql_query'; -import { PersistTimelinePinnedEventMutation, PinnedEvent } from '../../graphql/types'; -import { addError } from '../app/actions'; -import { inputsModel } from '../inputs'; +import { persistTimelinePinnedEventMutation } from '../../../timelines/containers/pinned_event/persist.gql_query'; +import { PersistTimelinePinnedEventMutation, PinnedEvent } from '../../../graphql/types'; +import { addError } from '../../../common/store/app/actions'; +import { inputsModel } from '../../../common/store/inputs'; import { pinEvent, diff --git a/x-pack/plugins/siem/public/store/timeline/helpers.ts b/x-pack/plugins/siem/public/timelines/store/timeline/helpers.ts similarity index 98% rename from x-pack/plugins/siem/public/store/timeline/helpers.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/helpers.ts index adab029c11150d..a8821779169c70 100644 --- a/x-pack/plugins/siem/public/store/timeline/helpers.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/helpers.ts @@ -6,21 +6,20 @@ import { getOr, omit, uniq, isEmpty, isEqualWith, union } from 'lodash/fp'; -import { Filter } from '../../../../../../src/plugins/data/public'; - -import { getColumnWidthFromType } from '../../components/timeline/body/column_headers/helpers'; -import { Sort } from '../../components/timeline/body/sort'; +import { Filter } from '../../../../../../../src/plugins/data/public'; +import { getColumnWidthFromType } from '../../../timelines/components/timeline/body/column_headers/helpers'; +import { Sort } from '../../../timelines/components/timeline/body/sort'; import { DataProvider, QueryOperator, QueryMatch, -} from '../../components/timeline/data_providers/data_provider'; -import { KueryFilterQuery, SerializedFilterQuery } from '../model'; +} from '../../../timelines/components/timeline/data_providers/data_provider'; +import { KueryFilterQuery, SerializedFilterQuery } from '../../../common/store/model'; import { timelineDefaults } from './defaults'; import { ColumnHeaderOptions, KqlMode, TimelineModel, EventType } from './model'; import { TimelineById, TimelineState } from './types'; -import { TimelineNonEcsData } from '../../graphql/types'; +import { TimelineNonEcsData } from '../../../graphql/types'; const EMPTY_TIMELINE_BY_ID: TimelineById = {}; // stable reference diff --git a/x-pack/plugins/siem/public/store/timeline/index.ts b/x-pack/plugins/siem/public/timelines/store/timeline/index.ts similarity index 61% rename from x-pack/plugins/siem/public/store/timeline/index.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/index.ts index a1c51905e8d0bf..48042ddf899108 100644 --- a/x-pack/plugins/siem/public/store/timeline/index.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/index.ts @@ -4,7 +4,17 @@ * you may not use this file except in compliance with the Elastic License. */ +import { AnyAction, Reducer } from 'redux'; import * as timelineActions from './actions'; import * as timelineSelectors from './selectors'; +import { TimelineState } from './types'; export { timelineActions, timelineSelectors }; + +export interface TimelinePluginState { + timeline: TimelineState; +} + +export interface TimelinePluginReducer { + timeline: Reducer; +} diff --git a/x-pack/plugins/siem/public/store/timeline/manage_timeline_id.tsx b/x-pack/plugins/siem/public/timelines/store/timeline/manage_timeline_id.tsx similarity index 100% rename from x-pack/plugins/siem/public/store/timeline/manage_timeline_id.tsx rename to x-pack/plugins/siem/public/timelines/store/timeline/manage_timeline_id.tsx diff --git a/x-pack/plugins/siem/public/store/timeline/model.ts b/x-pack/plugins/siem/public/timelines/store/timeline/model.ts similarity index 91% rename from x-pack/plugins/siem/public/store/timeline/model.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/model.ts index 54e19812634ac2..1957abafbcc716 100644 --- a/x-pack/plugins/siem/public/store/timeline/model.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/model.ts @@ -4,14 +4,13 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Filter } from '../../../../../../src/plugins/data/public'; +import { Filter } from '../../../../../../../src/plugins/data/public'; -import { TimelineTypeLiteralWithNull } from '../../../common/types/timeline'; - -import { DataProvider } from '../../components/timeline/data_providers/data_provider'; -import { Sort } from '../../components/timeline/body/sort'; -import { PinnedEvent, TimelineNonEcsData } from '../../graphql/types'; -import { KueryFilterQuery, SerializedFilterQuery } from '../model'; +import { TimelineTypeLiteralWithNull } from '../../../../common/types/timeline'; +import { DataProvider } from '../../../timelines/components/timeline/data_providers/data_provider'; +import { Sort } from '../../../timelines/components/timeline/body/sort'; +import { PinnedEvent, TimelineNonEcsData } from '../../../graphql/types'; +import { KueryFilterQuery, SerializedFilterQuery } from '../../../common/store/model'; export const DEFAULT_PAGE_COUNT = 2; // Eui Pager will not render unless this is a minimum of 2 pages export type KqlMode = 'filter' | 'search'; diff --git a/x-pack/plugins/siem/public/store/timeline/my_epic_timeline_id.ts b/x-pack/plugins/siem/public/timelines/store/timeline/my_epic_timeline_id.ts similarity index 100% rename from x-pack/plugins/siem/public/store/timeline/my_epic_timeline_id.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/my_epic_timeline_id.ts diff --git a/x-pack/plugins/siem/public/store/timeline/reducer.test.ts b/x-pack/plugins/siem/public/timelines/store/timeline/reducer.test.ts similarity index 99% rename from x-pack/plugins/siem/public/store/timeline/reducer.test.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/reducer.test.ts index 42c6d6ecb0e51b..65c78ca8efdb2a 100644 --- a/x-pack/plugins/siem/public/store/timeline/reducer.test.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/reducer.test.ts @@ -6,21 +6,21 @@ import { cloneDeep, set } from 'lodash/fp'; -import { TimelineType } from '../../../common/types/timeline'; +import { TimelineType } from '../../../../common/types/timeline'; import { IS_OPERATOR, DataProvider, DataProvidersAnd, -} from '../../components/timeline/data_providers/data_provider'; -import { defaultColumnHeaderType } from '../../components/timeline/body/column_headers/default_headers'; +} from '../../../timelines/components/timeline/data_providers/data_provider'; +import { defaultColumnHeaderType } from '../../../timelines/components/timeline/body/column_headers/default_headers'; import { DEFAULT_COLUMN_MIN_WIDTH, DEFAULT_TIMELINE_WIDTH, -} from '../../components/timeline/body/constants'; -import { getColumnWidthFromType } from '../../components/timeline/body/column_headers/helpers'; -import { Direction } from '../../graphql/types'; -import { defaultHeaders } from '../../mock'; +} from '../../../timelines/components/timeline/body/constants'; +import { getColumnWidthFromType } from '../../../timelines/components/timeline/body/column_headers/helpers'; +import { Direction } from '../../../graphql/types'; +import { defaultHeaders } from '../../../common/mock'; import { addNewTimeline, diff --git a/x-pack/plugins/siem/public/store/timeline/reducer.ts b/x-pack/plugins/siem/public/timelines/store/timeline/reducer.ts similarity index 100% rename from x-pack/plugins/siem/public/store/timeline/reducer.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/reducer.ts diff --git a/x-pack/plugins/siem/public/store/timeline/refetch_queries.ts b/x-pack/plugins/siem/public/timelines/store/timeline/refetch_queries.ts similarity index 69% rename from x-pack/plugins/siem/public/store/timeline/refetch_queries.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/refetch_queries.ts index a19f91aa530e8c..f5a30ed831bd68 100644 --- a/x-pack/plugins/siem/public/store/timeline/refetch_queries.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/refetch_queries.ts @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { allTimelinesQuery } from '../../containers/timeline/all/index.gql_query'; -import { Direction } from '../../graphql/types'; -import { DEFAULT_SORT_FIELD } from '../../components/open_timeline/constants'; +import { allTimelinesQuery } from '../../../timelines/containers/all/index.gql_query'; +import { Direction } from '../../../graphql/types'; +import { DEFAULT_SORT_FIELD } from '../../../timelines/components/open_timeline/constants'; export const refetchQueries = [ { diff --git a/x-pack/plugins/siem/public/store/timeline/selectors.ts b/x-pack/plugins/siem/public/timelines/store/timeline/selectors.ts similarity index 95% rename from x-pack/plugins/siem/public/store/timeline/selectors.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/selectors.ts index 780145ebfa54c6..03e9d722ac93e6 100644 --- a/x-pack/plugins/siem/public/store/timeline/selectors.ts +++ b/x-pack/plugins/siem/public/timelines/store/timeline/selectors.ts @@ -6,8 +6,8 @@ import { createSelector } from 'reselect'; -import { isFromKueryExpressionValid } from '../../lib/keury'; -import { State } from '../reducer'; +import { isFromKueryExpressionValid } from '../../../common/lib/keury'; +import { State } from '../../../common/store/reducer'; import { TimelineModel } from './model'; import { AutoSavedWarningMsg, TimelineById } from './types'; diff --git a/x-pack/plugins/siem/public/store/timeline/types.ts b/x-pack/plugins/siem/public/timelines/store/timeline/types.ts similarity index 100% rename from x-pack/plugins/siem/public/store/timeline/types.ts rename to x-pack/plugins/siem/public/timelines/store/timeline/types.ts diff --git a/x-pack/test/api_integration/apis/siem/authentications.ts b/x-pack/test/api_integration/apis/siem/authentications.ts index b89a1448d5fe6f..2a9a6d669f3fd0 100644 --- a/x-pack/test/api_integration/apis/siem/authentications.ts +++ b/x-pack/test/api_integration/apis/siem/authentications.ts @@ -6,7 +6,7 @@ import expect from '@kbn/expect'; -import { authenticationsQuery } from '../../../../plugins/siem/public/containers/authentications/index.gql_query'; +import { authenticationsQuery } from '../../../../plugins/siem/public/hosts/containers/authentications/index.gql_query'; import { GetAuthenticationsQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/hosts.ts b/x-pack/test/api_integration/apis/siem/hosts.ts index 0a2ee9c82bce22..8acf87d88c5fa8 100644 --- a/x-pack/test/api_integration/apis/siem/hosts.ts +++ b/x-pack/test/api_integration/apis/siem/hosts.ts @@ -13,9 +13,9 @@ import { GetHostsTableQuery, HostsFields, } from '../../../../plugins/siem/public/graphql/types'; -import { HostOverviewQuery } from '../../../../plugins/siem/public/containers/hosts/overview/host_overview.gql_query'; -import { HostFirstLastSeenGqlQuery } from '../../../../plugins/siem/public/containers/hosts/first_last_seen/first_last_seen.gql_query'; -import { HostsTableQuery } from '../../../../plugins/siem/public/containers/hosts/hosts_table.gql_query'; +import { HostOverviewQuery } from '../../../../plugins/siem/public/hosts/containers/hosts/overview/host_overview.gql_query'; +import { HostFirstLastSeenGqlQuery } from '../../../../plugins/siem/public/hosts/containers/hosts/first_last_seen/first_last_seen.gql_query'; +import { HostsTableQuery } from '../../../../plugins/siem/public/hosts/containers/hosts/hosts_table.gql_query'; import { FtrProviderContext } from '../../ftr_provider_context'; const FROM = new Date('2000-01-01T00:00:00.000Z').valueOf(); diff --git a/x-pack/test/api_integration/apis/siem/ip_overview.ts b/x-pack/test/api_integration/apis/siem/ip_overview.ts index 2f1a792aff25bf..c0ed9cd2da8427 100644 --- a/x-pack/test/api_integration/apis/siem/ip_overview.ts +++ b/x-pack/test/api_integration/apis/siem/ip_overview.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { ipOverviewQuery } from '../../../../plugins/siem/public/containers/ip_overview/index.gql_query'; +import { ipOverviewQuery } from '../../../../plugins/siem/public/network/containers/ip_overview/index.gql_query'; import { GetIpOverviewQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/kpi_host_details.ts b/x-pack/test/api_integration/apis/siem/kpi_host_details.ts index 30f9f6f04a2423..c108a6dcbc7497 100644 --- a/x-pack/test/api_integration/apis/siem/kpi_host_details.ts +++ b/x-pack/test/api_integration/apis/siem/kpi_host_details.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { kpiHostDetailsQuery } from '../../../../plugins/siem/public/containers/kpi_host_details/index.gql_query'; +import { kpiHostDetailsQuery } from '../../../../plugins/siem/public/hosts/containers/kpi_host_details/index.gql_query'; import { GetKpiHostDetailsQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/kpi_hosts.ts b/x-pack/test/api_integration/apis/siem/kpi_hosts.ts index 2303b9ecfb78fd..ed4a19f2d7d996 100644 --- a/x-pack/test/api_integration/apis/siem/kpi_hosts.ts +++ b/x-pack/test/api_integration/apis/siem/kpi_hosts.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { kpiHostsQuery } from '../../../../plugins/siem/public/containers/kpi_hosts/index.gql_query'; +import { kpiHostsQuery } from '../../../../plugins/siem/public/hosts/containers/kpi_hosts/index.gql_query'; import { GetKpiHostsQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/kpi_network.ts b/x-pack/test/api_integration/apis/siem/kpi_network.ts index 22e133e48bbd2b..28f7c80eb32042 100644 --- a/x-pack/test/api_integration/apis/siem/kpi_network.ts +++ b/x-pack/test/api_integration/apis/siem/kpi_network.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { kpiNetworkQuery } from '../../../../plugins/siem/public/containers/kpi_network/index.gql_query'; +import { kpiNetworkQuery } from '../../../../plugins/siem/public/network/containers/kpi_network/index.gql_query'; import { GetKpiNetworkQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/network_dns.ts b/x-pack/test/api_integration/apis/siem/network_dns.ts index 1eba41e238c819..590727362d7ae8 100644 --- a/x-pack/test/api_integration/apis/siem/network_dns.ts +++ b/x-pack/test/api_integration/apis/siem/network_dns.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { networkDnsQuery } from '../../../../plugins/siem/public/containers/network_dns/index.gql_query'; +import { networkDnsQuery } from '../../../../plugins/siem/public/network/containers/network_dns/index.gql_query'; import { Direction, GetNetworkDnsQuery, diff --git a/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts b/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts index 6ab7945e9000d6..19948967c18090 100644 --- a/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts +++ b/x-pack/test/api_integration/apis/siem/network_top_n_flow.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { networkTopNFlowQuery } from '../../../../plugins/siem/public/containers/network_top_n_flow/index.gql_query'; +import { networkTopNFlowQuery } from '../../../../plugins/siem/public/network/containers/network_top_n_flow/index.gql_query'; import { Direction, FlowTargetSourceDest, diff --git a/x-pack/test/api_integration/apis/siem/overview_host.ts b/x-pack/test/api_integration/apis/siem/overview_host.ts index 95dbb44e30c41c..fe9d04a16c626f 100644 --- a/x-pack/test/api_integration/apis/siem/overview_host.ts +++ b/x-pack/test/api_integration/apis/siem/overview_host.ts @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; import { DEFAULT_INDEX_PATTERN } from '../../../../plugins/siem/common/constants'; -import { overviewHostQuery } from '../../../../plugins/siem/public/containers/overview/overview_host/index.gql_query'; +import { overviewHostQuery } from '../../../../plugins/siem/public/overview/containers//overview_host/index.gql_query'; import { GetOverviewHostQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/overview_network.ts b/x-pack/test/api_integration/apis/siem/overview_network.ts index ef7d82d2ea8d96..1b8354e0632f1c 100644 --- a/x-pack/test/api_integration/apis/siem/overview_network.ts +++ b/x-pack/test/api_integration/apis/siem/overview_network.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { overviewNetworkQuery } from '../../../../plugins/siem/public/containers/overview/overview_network/index.gql_query'; +import { overviewNetworkQuery } from '../../../../plugins/siem/public/overview/containers/overview_network/index.gql_query'; import { GetOverviewNetworkQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts b/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts index 75670374b6f632..76c4afb08466e0 100644 --- a/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts +++ b/x-pack/test/api_integration/apis/siem/saved_objects/notes.ts @@ -8,7 +8,7 @@ import expect from '@kbn/expect'; import gql from 'graphql-tag'; import { FtrProviderContext } from '../../../ftr_provider_context'; -import { persistTimelineNoteMutation } from '../../../../../plugins/siem/public/containers/timeline/notes/persist.gql_query'; +import { persistTimelineNoteMutation } from '../../../../../plugins/siem/public/timelines/containers/notes/persist.gql_query'; export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts b/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts index 39055e971d1185..4d24ea98821529 100644 --- a/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts +++ b/x-pack/test/api_integration/apis/siem/saved_objects/pinned_events.ts @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; import { FtrProviderContext } from '../../../ftr_provider_context'; -import { persistTimelinePinnedEventMutation } from '../../../../../plugins/siem/public/containers/timeline/pinned_event/persist.gql_query'; +import { persistTimelinePinnedEventMutation } from '../../../../../plugins/siem/public/timelines/containers/pinned_event/persist.gql_query'; export default function({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); diff --git a/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts b/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts index 2d9f576ef37e95..b6f272b8d75408 100644 --- a/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts +++ b/x-pack/test/api_integration/apis/siem/saved_objects/timeline.ts @@ -15,9 +15,9 @@ import ApolloClient from 'apollo-client'; import { FtrProviderContext } from '../../../ftr_provider_context'; -import { deleteTimelineMutation } from '../../../../../plugins/siem/public/containers/timeline/delete/persist.gql_query'; -import { persistTimelineFavoriteMutation } from '../../../../../plugins/siem/public/containers/timeline/favorite/persist.gql_query'; -import { persistTimelineMutation } from '../../../../../plugins/siem/public/containers/timeline/persist.gql_query'; +import { deleteTimelineMutation } from '../../../../../plugins/siem/public/timelines/containers/delete/persist.gql_query'; +import { persistTimelineFavoriteMutation } from '../../../../../plugins/siem/public/timelines/containers/favorite/persist.gql_query'; +import { persistTimelineMutation } from '../../../../../plugins/siem/public/timelines/containers/persist.gql_query'; import { TimelineResult } from '../../../../../plugins/siem/public/graphql/types'; export default function({ getService }: FtrProviderContext) { diff --git a/x-pack/test/api_integration/apis/siem/sources.ts b/x-pack/test/api_integration/apis/siem/sources.ts index 2338d4ce45c8db..b17280703c9463 100644 --- a/x-pack/test/api_integration/apis/siem/sources.ts +++ b/x-pack/test/api_integration/apis/siem/sources.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { sourceQuery } from '../../../../plugins/siem/public/containers/source/index.gql_query'; +import { sourceQuery } from '../../../../plugins/siem/public/common/containers/source/index.gql_query'; import { SourceQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/timeline.ts b/x-pack/test/api_integration/apis/siem/timeline.ts index de57b0c3f469fb..14cc957d98eb8f 100644 --- a/x-pack/test/api_integration/apis/siem/timeline.ts +++ b/x-pack/test/api_integration/apis/siem/timeline.ts @@ -6,7 +6,7 @@ import expect from '@kbn/expect'; -import { timelineQuery } from '../../../../plugins/siem/public/containers/timeline/index.gql_query'; +import { timelineQuery } from '../../../../plugins/siem/public/timelines/containers/index.gql_query'; import { Direction, GetTimelineQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/timeline_details.ts b/x-pack/test/api_integration/apis/siem/timeline_details.ts index f88d5355f22c1c..920879cf9cf3ef 100644 --- a/x-pack/test/api_integration/apis/siem/timeline_details.ts +++ b/x-pack/test/api_integration/apis/siem/timeline_details.ts @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; import { sortBy } from 'lodash'; -import { timelineDetailsQuery } from '../../../../plugins/siem/public/containers/timeline/details/index.gql_query'; +import { timelineDetailsQuery } from '../../../../plugins/siem/public/timelines/containers/details/index.gql_query'; import { DetailItem, GetTimelineDetailsQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/tls.ts b/x-pack/test/api_integration/apis/siem/tls.ts index e4e8b5db3d7e38..8ee2ef43efe386 100644 --- a/x-pack/test/api_integration/apis/siem/tls.ts +++ b/x-pack/test/api_integration/apis/siem/tls.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { tlsQuery } from '../../../../plugins/siem/public/containers/tls/index.gql_query'; +import { tlsQuery } from '../../../../plugins/siem/public/network/containers/tls/index.gql_query'; import { Direction, TlsFields, diff --git a/x-pack/test/api_integration/apis/siem/uncommon_processes.ts b/x-pack/test/api_integration/apis/siem/uncommon_processes.ts index c9674e740f76d9..325f2f83e53df6 100644 --- a/x-pack/test/api_integration/apis/siem/uncommon_processes.ts +++ b/x-pack/test/api_integration/apis/siem/uncommon_processes.ts @@ -6,7 +6,7 @@ import expect from '@kbn/expect'; -import { uncommonProcessesQuery } from '../../../../plugins/siem/public/containers/uncommon_processes/index.gql_query'; +import { uncommonProcessesQuery } from '../../../../plugins/siem/public/hosts/containers/uncommon_processes/index.gql_query'; import { GetUncommonProcessesQuery } from '../../../../plugins/siem/public/graphql/types'; import { FtrProviderContext } from '../../ftr_provider_context'; diff --git a/x-pack/test/api_integration/apis/siem/users.ts b/x-pack/test/api_integration/apis/siem/users.ts index c8ea1be7d3f11d..c6ac571e86eb33 100644 --- a/x-pack/test/api_integration/apis/siem/users.ts +++ b/x-pack/test/api_integration/apis/siem/users.ts @@ -5,7 +5,7 @@ */ import expect from '@kbn/expect'; -import { usersQuery } from '../../../../plugins/siem/public/containers/users/index.gql_query'; +import { usersQuery } from '../../../../plugins/siem/public/network/containers/users/index.gql_query'; import { Direction, UsersFields, From 96bc66386201b503dc94c8497fed2c5784559635 Mon Sep 17 00:00:00 2001 From: Alexey Antonov Date: Tue, 12 May 2020 10:35:39 +0300 Subject: [PATCH 62/65] [Flights] Delay Bucket - Error notification on opening sample visualization (#66028) Closes: #66024 --- .../data/common/es_query/es_query/migrate_filter.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/plugins/data/common/es_query/es_query/migrate_filter.ts b/src/plugins/data/common/es_query/es_query/migrate_filter.ts index 22fbfe0e1ab083..a0529d585879eb 100644 --- a/src/plugins/data/common/es_query/es_query/migrate_filter.ts +++ b/src/plugins/data/common/es_query/es_query/migrate_filter.ts @@ -43,18 +43,25 @@ export function migrateFilter(filter: Filter, indexPattern?: IIndexPattern) { if (isDeprecatedMatchPhraseFilter(filter)) { const fieldName = Object.keys(filter.query.match)[0]; const params: Record = get(filter, ['query', 'match', fieldName]); + let query = params.query; if (indexPattern) { const field = indexPattern.fields.find(f => f.name === fieldName); if (field) { - params.query = getConvertedValueForField(field, params.query); + query = getConvertedValueForField(field, params.query); } } return { ...filter, query: { match_phrase: { - [fieldName]: omit(params, 'type'), + [fieldName]: omit( + { + ...params, + query, + }, + 'type' + ), }, }, }; From 2ad2bfa9069e66d183e3ce9c3146d953af56bdc2 Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Tue, 12 May 2020 09:37:03 +0200 Subject: [PATCH 63/65] Fix heigt calc in calc issue for ie11 (#66010) --- src/plugins/console/public/styles/_app.scss | 5 ++++- x-pack/plugins/painless_lab/public/styles/_index.scss | 7 +++++-- x-pack/plugins/searchprofiler/public/styles/_index.scss | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/plugins/console/public/styles/_app.scss b/src/plugins/console/public/styles/_app.scss index 047db6e3ad877c..c41df24912c2a7 100644 --- a/src/plugins/console/public/styles/_app.scss +++ b/src/plugins/console/public/styles/_app.scss @@ -1,8 +1,11 @@ // TODO: Move all of the styles here (should be modularised by, e.g., CSS-in-JS or CSS modules). @import '@elastic/eui/src/components/header/variables'; +// This value is calculated to static value using SCSS because calc in calc has issues in IE11 +$headerHeightOffset: $euiHeaderHeightCompensation * 2; + #consoleRoot { - height: calc(100vh - calc(#{$euiHeaderChildSize} * 2)); + height: calc(100vh - #{$headerHeightOffset}); display: flex; flex: 1 1 auto; // Make sure the editor actions don't create scrollbars on this container diff --git a/x-pack/plugins/painless_lab/public/styles/_index.scss b/x-pack/plugins/painless_lab/public/styles/_index.scss index df68a6450c1917..e6c9574161fd8b 100644 --- a/x-pack/plugins/painless_lab/public/styles/_index.scss +++ b/x-pack/plugins/painless_lab/public/styles/_index.scss @@ -5,7 +5,7 @@ * This is a very brittle way of preventing the editor and other content from disappearing * behind the bottom bar. */ -$bottomBarHeight: calc(#{$euiSize} * 3); +$bottomBarHeight: $euiSize * 3; .painlessLabBottomBarPlaceholder { height: $bottomBarHeight; @@ -40,8 +40,11 @@ $bottomBarHeight: calc(#{$euiSize} * 3); line-height: 0; } +// This value is calculated to static value using SCSS because calc in calc has issues in IE11 +$headerHeightOffset: $euiHeaderHeightCompensation * 2; + .painlessLabMainContainer { - height: calc(100vh - calc(#{$euiHeaderChildSize} * 2) - #{$bottomBarHeight}); + height: calc(100vh - #{$headerHeightOffset} - #{$bottomBarHeight}); } .painlessLabPanelsContainer { diff --git a/x-pack/plugins/searchprofiler/public/styles/_index.scss b/x-pack/plugins/searchprofiler/public/styles/_index.scss index 5c35e9a23b8a1a..e63042cf8fe2f7 100644 --- a/x-pack/plugins/searchprofiler/public/styles/_index.scss +++ b/x-pack/plugins/searchprofiler/public/styles/_index.scss @@ -47,8 +47,11 @@ } } +// This value is calculated to static value using SCSS because calc in calc has issues in IE11 +$headerHeightOffset: $euiHeaderHeightCompensation * 2; + .appRoot { - height: calc(100vh - calc(#{$euiHeaderChildSize} * 2)); + height: calc(100vh - #{$headerHeightOffset}); overflow: hidden; flex-shrink: 1; } From f3548d6c838776b2e84138c7cc7500c46560d867 Mon Sep 17 00:00:00 2001 From: Alexey Antonov Date: Tue, 12 May 2020 11:24:03 +0300 Subject: [PATCH 64/65] Inspect action shows on dashboard for every chart (#65998) Closes: #60372 --- .../public/embeddable/visualize_embeddable.ts | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts index 10704514ab8d5d..f5a840c480aa1e 100644 --- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts +++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts @@ -71,6 +71,8 @@ export interface VisualizeOutput extends EmbeddableOutput { type ExpressionLoader = InstanceType; +const visTypesWithoutInspector = ['markdown', 'input_control_vis', 'metrics', 'vega', 'timelion']; + export class VisualizeEmbeddable extends Embeddable { private handler?: ExpressionLoader; private timefilter: TimefilterContract; @@ -126,7 +128,7 @@ export class VisualizeEmbeddable extends Embeddable { - if (!this.handler) { + if (!this.handler || visTypesWithoutInspector.includes(this.vis.type.name)) { return undefined; } return this.handler.inspect(); @@ -215,19 +217,7 @@ export class VisualizeEmbeddable extends Embeddable { - const visTypesWithoutInspector = [ - 'markdown', - 'input_control_vis', - 'metrics', - 'vega', - 'timelion', - ]; - if (visTypesWithoutInspector.includes(this.vis.type.name)) { - return false; - } - return this.getInspectorAdapters(); - }; + hasInspector = () => Boolean(this.getInspectorAdapters()); /** * From 724f2820599963708c58ccb4de265ab177f47898 Mon Sep 17 00:00:00 2001 From: Anton Dosov Date: Tue, 12 May 2020 10:30:19 +0200 Subject: [PATCH 65/65] [Drilldowns][IE] fix welcome bar layout in IE (#65676) * fix drilldown hello bar in IE * fix comment * use children instead of title for EuiCallOut content Co-authored-by: Elastic Machine --- .../drilldown_hello_bar.tsx | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx index 48e17dadc810f0..99885e5cc40fe2 100644 --- a/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx +++ b/x-pack/plugins/drilldowns/public/components/drilldown_hello_bar/drilldown_hello_bar.tsx @@ -30,33 +30,30 @@ export const DrilldownHelloBar: React.FC = ({ onHideClick = () => {}, }) => { return ( - - -
- -
- - - - {txtHelpText} - - {docsLink && ( - <> - - {txtViewDocsLinkLabel} - - )} - - - - {txtHideHelpButtonLabel} - - - - } - /> + + + +
+ +
+ + + + {txtHelpText} + + {docsLink && ( + <> + + {txtViewDocsLinkLabel} + + )} + + + + {txtHideHelpButtonLabel} + + + + ); };