[TIP] Plugin reorg and cleanup (#143602)

- move indicators type into indicators module
- move constants file into public/common
- optimize imports

x-pack/plugins/threat_intelligence/common/test/utils.ts

@@ -1,14 +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
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-/**
- * Use this to query elements by test-subj
- * @param testSubject test subject to query elements by
- * @returns
- */
-export const getByTestSubj = (testSubject: string): HTMLElement =>
-  document.querySelector(`[data-test-subj="${testSubject}"]`) as HTMLElement;

x-pack/plugins/threat_intelligence/public/common/mocks/mock_kibana_ui_settings_service.ts

@@ -6,7 +6,7 @@
  */
 
 import { IUiSettingsClient } from '@kbn/core/public';
-import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../../../common/constants';
+import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../constants';
 
 /**
  * Creates an object to pass to the uiSettings property when creating a KibanaReacrContext (see src/plugins/kibana_react/public/context/context.tsx).

x-pack/plugins/threat_intelligence/public/common/mocks/mock_use_kibana_for_filters.ts

@@ -7,7 +7,7 @@
 
 import { Filter } from '@kbn/es-query';
 import { BehaviorSubject } from 'rxjs';
-import * as hook from '../../hooks/use_kibana';
+import * as hook from '../../hooks';
 
 jest.mock('../../hooks/use_kibana');
 

x-pack/plugins/threat_intelligence/public/common/mocks/test_providers.tsx

@@ -19,7 +19,7 @@ import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { MemoryRouter } from 'react-router-dom';
-import { KibanaContext } from '../../hooks/use_kibana';
+import { KibanaContext } from '../../hooks';
 import { SecuritySolutionPluginContext } from '../../types';
 import { getSecuritySolutionContextMock } from './mock_security_context';
 import { mockUiSetting } from './mock_kibana_ui_settings_service';

x-pack/plugins/threat_intelligence/public/common/navigation/constants.ts

@@ -6,7 +6,7 @@
  */
 
 import { TIPage, TIPageProperties } from './types';
-import { INDICATORS, INTELLIGENCE, DESCRIPTION } from './translations';
+import { DESCRIPTION, INDICATORS, INTELLIGENCE } from './translations';
 
 /**
  * Base path for all the pages within the Threat Intelligence plugin.

x-pack/plugins/threat_intelligence/public/common/utils/dates.test.ts

@@ -8,12 +8,12 @@
 import moment from 'moment-timezone';
 import { TimeRangeBounds } from '@kbn/data-plugin/common';
 import {
-  dateFormatter,
-  getDateDifferenceInDays,
   barChartTimeAxisLabelFormatter,
   calculateBarchartColumnTimeInterval,
+  dateFormatter,
+  getDateDifferenceInDays,
 } from './dates';
-import { EMPTY_VALUE } from '../../../common/constants';
+import { EMPTY_VALUE } from '../constants';
 
 const mockValidStringDate = '1 Jan 2022 00:00:00 GMT';
 const mockInvalidStringDate = 'invalid date';

x-pack/plugins/threat_intelligence/public/common/utils/dates.tsx

@@ -6,11 +6,12 @@
  */
 
 import moment from 'moment';
-moment.suppressDeprecationWarnings = true;
 import { TimeRangeBounds } from '@kbn/data-plugin/common';
 import { niceTimeFormatByDay, timeFormatter } from '@elastic/charts';
 import { TickFormatter } from '@elastic/charts/dist/chart_types/xy_chart/utils/specs';
-import { EMPTY_VALUE } from '../../../common/constants';
+import { EMPTY_VALUE } from '../constants';
+
+moment.suppressDeprecationWarnings = true;
 
 export const FULL_DATE = 'MMMM Do YYYY @ HH:mm:ss';
 export const BARCHART_NUMBER_OF_COLUMNS = 16;

x-pack/plugins/threat_intelligence/public/components/date_formatter/date_formatter.tsx

@@ -6,12 +6,13 @@
  */
 
 import moment from 'moment';
-moment.suppressDeprecationWarnings = true;
 import React, { VFC } from 'react';
-import { EMPTY_VALUE } from '../../../common/constants';
+import { EMPTY_VALUE } from '../../common/constants';
 import { dateFormatter } from '../../common/utils/dates';
 import { useDateFormat, useTimeZone } from '../../hooks/use_kibana_ui_settings';
 
+moment.suppressDeprecationWarnings = true;
+
 export interface DateFormatterProps {
   date: string | moment.Moment;
   dateFormat?: string;

x-pack/plugins/threat_intelligence/public/components/empty_state/empty_state.tsx

@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { EuiPanel, EuiFlexGroup, EuiFlexItem, EuiImage, EuiText, EuiTitle } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiImage, EuiPanel, EuiText, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import icon from './no_results.svg';
 

x-pack/plugins/threat_intelligence/public/containers/enterprise_guard/enterprise_guard.tsx

@@ -5,11 +5,9 @@
  * 2.0.
  */
 
-import React from 'react';
-import { FC } from 'react';
+import React, { FC } from 'react';
 import { Paywall } from '../../components/paywall';
-import { useKibana } from '../../hooks/use_kibana';
-import { useSecurityContext } from '../../hooks/use_security_context';
+import { useKibana, useSecurityContext } from '../../hooks';
 import { SecuritySolutionPluginTemplateWrapper } from '../security_solution_plugin_template_wrapper';
 
 export const EnterpriseGuard: FC = ({ children }) => {

x-pack/plugins/threat_intelligence/public/containers/filters_global.tsx

@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import React from 'react';
-import { FC } from 'react';
+import React, { FC } from 'react';
 import { useSecurityContext } from '../hooks/use_security_context';
 
 export const FiltersGlobal: FC = ({ children }) => {

x-pack/plugins/threat_intelligence/public/containers/integrations_guard/integrations_guard.test.tsx

@@ -9,8 +9,7 @@ import { render } from '@testing-library/react';
 import React from 'react';
 import { IntegrationsGuard } from '.';
 import { TestProvidersComponent } from '../../common/mocks/test_providers';
-import { useTIDocumentationLink } from '../../hooks/use_documentation_link';
-import { useIntegrationsPageLink } from '../../hooks/use_integrations_page_link';
+import { useIntegrationsPageLink, useTIDocumentationLink } from '../../hooks';
 import { useIndicatorsTotalCount } from '../../modules/indicators';
 
 jest.mock('../../modules/indicators/hooks/use_total_count');

x-pack/plugins/threat_intelligence/public/containers/security_solution_page_wrapper.tsx

@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import React from 'react';
-import { FC } from 'react';
+import React, { FC } from 'react';
 import { useSecurityContext } from '../hooks/use_security_context';
 
 /**

x-pack/plugins/threat_intelligence/public/containers/security_solution_plugin_template_wrapper.tsx

@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import React from 'react';
 import type { FC } from 'react';
+import React from 'react';
 import type { KibanaPageTemplateProps } from '@kbn/shared-ux-page-kibana-template-types';
-import { useKibana } from '../hooks/use_kibana';
+import { useKibana } from '../hooks';
 
 /**
  * Uses securityLayout service to retrieve shared plugin wrapper component and renders plugin routes / children inside of it.

x-pack/plugins/threat_intelligence/public/hooks/index.ts

@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './use_documentation_link';
+export * from './use_field_types';
+export * from './use_inspector';
+export * from './use_integrations_page_link';
+export * from './use_kibana';
+export * from './use_security_context';

x-pack/plugins/threat_intelligence/public/hooks/use_documentation_link.tsx

@@ -6,7 +6,7 @@
  */
 
 import { DocLinks } from '@kbn/doc-links';
-import { useKibana } from './use_kibana';
+import { useKibana } from '.';
 
 const useKibanaDocumentationLinks = (): DocLinks => useKibana().services.docLinks.links;
 

x-pack/plugins/threat_intelligence/public/hooks/use_inspector.ts

@@ -8,7 +8,7 @@
 import { useCallback, useContext, useEffect, useState } from 'react';
 import { InspectorSession } from '@kbn/inspector-plugin/public';
 import { i18n } from '@kbn/i18n';
-import { useKibana } from './use_kibana';
+import { useKibana } from '.';
 import { InspectorContext } from '../containers/inspector';
 
 const INSPECTOR_FLYOUT_TITLE = i18n.translate('xpack.threatIntelligence.inspectorFlyoutTitle', {

x-pack/plugins/threat_intelligence/public/hooks/use_integrations_page_link.tsx

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useKibana } from './use_kibana';
+import { useKibana } from '.';
 
 const useKibanaBasePath = (): string => useKibana().services.http.basePath.get();
 

x-pack/plugins/threat_intelligence/public/hooks/use_kibana.ts

@@ -6,9 +6,9 @@
  */
 
 import {
+  context as KibanaContext,
   KibanaContextProvider,
   useKibana,
-  context as KibanaContext,
 } from '@kbn/kibana-react-plugin/public';
 import { Services } from '../types';
 

x-pack/plugins/threat_intelligence/public/hooks/use_kibana_ui_settings.tsx

@@ -7,7 +7,7 @@
 
 import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import moment from 'moment-timezone';
-import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../../common/constants';
+import { DEFAULT_DATE_FORMAT, DEFAULT_DATE_FORMAT_TZ } from '../common/constants';
 
 export const useDateFormat = (): string => useUiSetting<string>(DEFAULT_DATE_FORMAT);
 

x-pack/plugins/threat_intelligence/public/modules/empty_page/empty_page.test.tsx

@@ -8,9 +8,8 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { TestProvidersComponent } from '../../common/mocks/test_providers';
-import { EmptyPage, INTEGRATION_LINK_ID, DOCS_LINK_TEST_ID } from './empty_page';
-import { useIntegrationsPageLink } from '../../hooks/use_integrations_page_link';
-import { useTIDocumentationLink } from '../../hooks/use_documentation_link';
+import { DOCS_LINK_TEST_ID, EmptyPage, INTEGRATION_LINK_ID } from './empty_page';
+import { useIntegrationsPageLink, useTIDocumentationLink } from '../../hooks';
 
 jest.mock('../../hooks/use_integrations_page_link');
 jest.mock('../../hooks/use_documentation_link');

x-pack/plugins/threat_intelligence/public/modules/empty_page/empty_page.tsx

@@ -7,11 +7,10 @@
 
 import React, { VFC } from 'react';
 
-import { EuiEmptyPrompt, EuiImage, EuiButton, EuiLink } from '@elastic/eui';
+import { EuiButton, EuiEmptyPrompt, EuiImage, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { useTIDocumentationLink } from '../../hooks/use_documentation_link';
-import { useIntegrationsPageLink } from '../../hooks/use_integrations_page_link';
+import { useIntegrationsPageLink, useTIDocumentationLink } from '../../hooks';
 import illustration from './integrations_light.svg';
 import { SecuritySolutionPluginTemplateWrapper } from '../../containers/security_solution_plugin_template_wrapper';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/field_selector/field_selector.stories.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import { Story } from '@storybook/react';
 import { DataView, DataViewField } from '@kbn/data-views-plugin/common';
-import { RawIndicatorFieldId } from '../../../../../../common/types/indicator';
+import { RawIndicatorFieldId } from '../../../types';
 import { IndicatorsFieldSelector } from '.';
 
 const mockIndexPattern: DataView = {

x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/field_selector/field_selector.tsx

@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { DataViewField } from '@kbn/data-views-plugin/common';
 import { EuiComboBoxOptionOption } from '@elastic/eui/src/components/combo_box/types';
 import { SecuritySolutionDataViewBase } from '../../../../../types';
-import { RawIndicatorFieldId } from '../../../../../../common/types/indicator';
+import { RawIndicatorFieldId } from '../../../types';
 import { useStyles } from './styles';
 
 export const DROPDOWN_TEST_ID = 'tiIndicatorFieldSelectorDropdown';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/wrapper.tsx

@@ -18,7 +18,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { TimeRange } from '@kbn/es-query';
 import { TimeRangeBounds } from '@kbn/data-plugin/common';
 import { SecuritySolutionDataViewBase } from '../../../../types';
-import { RawIndicatorFieldId } from '../../../../../common/types/indicator';
+import { RawIndicatorFieldId } from '../../types';
 import { IndicatorsFieldSelector } from './field_selector';
 import { IndicatorsBarChart } from './barchart';
 import { ChartSeries } from '../../services';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/field_label/field_label.tsx

@@ -7,7 +7,7 @@
 
 import React, { VFC } from 'react';
 import { i18n } from '@kbn/i18n';
-import { RawIndicatorFieldId } from '../../../../../common/types/indicator';
+import { RawIndicatorFieldId } from '../../types';
 
 interface IndicatorFieldLabelProps {
   field: string;

x-pack/plugins/threat_intelligence/public/modules/indicators/components/field_value/field.stories.tsx

@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { StoryProvidersComponent } from '../../../../common/mocks/story_providers';
-import { generateMockIndicator } from '../../../../../common/types/indicator';
+import { generateMockIndicator } from '../../types';
 import { IndicatorFieldValue } from '.';
 
 export default {

x-pack/plugins/threat_intelligence/public/modules/indicators/components/field_value/field.test.tsx

@@ -8,8 +8,8 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { IndicatorFieldValue } from '.';
-import { generateMockIndicator } from '../../../../../common/types/indicator';
-import { EMPTY_VALUE } from '../../../../../common/constants';
+import { generateMockIndicator } from '../../types';
+import { EMPTY_VALUE } from '../../../../common/constants';
 import { TestProvidersComponent } from '../../../../common/mocks/test_providers';
 
 const mockIndicator = generateMockIndicator();

x-pack/plugins/threat_intelligence/public/modules/indicators/components/field_value/field_value.tsx

@@ -6,9 +6,9 @@
  */
 
 import React, { VFC } from 'react';
-import { useFieldTypes } from '../../../../hooks/use_field_types';
-import { EMPTY_VALUE } from '../../../../../common/constants';
-import { Indicator, RawIndicatorFieldId } from '../../../../../common/types/indicator';
+import { useFieldTypes } from '../../../../hooks';
+import { EMPTY_VALUE } from '../../../../common/constants';
+import { Indicator, RawIndicatorFieldId } from '../../types';
 import { DateFormatter } from '../../../../components/date_formatter';
 import { unwrapValue } from '../../utils';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/fields_table/fields_table.stories.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import { mockIndicatorsFiltersContext } from '../../../../../common/mocks/mock_indicators_filters_context';
 import { IndicatorFieldsTable } from '.';
-import { generateMockIndicator } from '../../../../../../common/types/indicator';
+import { generateMockIndicator } from '../../../types';
 import { StoryProvidersComponent } from '../../../../../common/mocks/story_providers';
 import { IndicatorsFiltersContext } from '../../../containers/filters';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/fields_table/fields_table.tsx

@@ -8,7 +8,7 @@
 import { EuiBasicTableColumn, EuiInMemoryTable, EuiInMemoryTableProps } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useMemo, VFC } from 'react';
-import { Indicator } from '../../../../../../common/types/indicator';
+import { Indicator } from '../../../types';
 import { IndicatorFieldValue } from '../../field_value';
 import { IndicatorValueActions } from '../indicator_value_actions';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/flyout.stories.tsx

@@ -12,7 +12,7 @@ import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { mockIndicatorsFiltersContext } from '../../../../common/mocks/mock_indicators_filters_context';
 import { mockUiSettingsService } from '../../../../common/mocks/mock_kibana_ui_settings_service';
 import { mockKibanaTimelinesService } from '../../../../common/mocks/mock_kibana_timelines_service';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../types';
 import { IndicatorsFlyout } from '.';
 import { IndicatorsFiltersContext } from '../../containers/filters';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/flyout.test.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import { cleanup, render, screen } from '@testing-library/react';
 import { IndicatorsFlyout, SUBTITLE_TEST_ID, TITLE_TEST_ID } from '.';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../types';
 import { TestProvidersComponent } from '../../../../common/mocks/test_providers';
 
 const mockIndicator = generateMockIndicator();

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/flyout.tsx

@@ -23,7 +23,7 @@ import {
 import { FormattedMessage } from '@kbn/i18n-react';
 import { InvestigateInTimelineButton } from '../../../timeline';
 import { DateFormatter } from '../../../../components/date_formatter/date_formatter';
-import { Indicator, RawIndicatorFieldId } from '../../../../../common/types/indicator';
+import { Indicator, RawIndicatorFieldId } from '../../types';
 import { IndicatorsFlyoutJson } from './json_tab';
 import { IndicatorsFlyoutTable } from './table_tab';
 import { unwrapValue } from '../../utils';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/indicator_value_actions/indicator_value_actions.tsx

@@ -14,7 +14,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Indicator } from '../../../../../../common/types/indicator';
+import { Indicator } from '../../../types';
 import { FilterInButtonIcon, FilterOutButtonIcon } from '../../../../query_bar';
 import { AddToTimelineContextMenu } from '../../../../timeline';
 import { fieldAndValueValid, getIndicatorFieldAndValue } from '../../../utils';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/json_tab/json_tab.stories.tsx

@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { Story } from '@storybook/react';
-import { generateMockIndicator, Indicator } from '../../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../../types';
 import { IndicatorsFlyoutJson } from '.';
 
 export default {

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/json_tab/json_tab.test.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { TestProvidersComponent } from '../../../../../common/mocks/test_providers';
-import { generateMockIndicator, Indicator } from '../../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../../types';
 import { CODE_BLOCK_TEST_ID, IndicatorsFlyoutJson } from '.';
 import { EMPTY_PROMPT_TEST_ID } from '../empty_prompt';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/json_tab/json_tab.tsx

@@ -7,7 +7,7 @@
 
 import React, { VFC } from 'react';
 import { EuiCodeBlock } from '@elastic/eui';
-import { Indicator } from '../../../../../../common/types/indicator';
+import { Indicator } from '../../../types';
 import { IndicatorEmptyPrompt } from '../empty_prompt';
 
 export const CODE_BLOCK_TEST_ID = 'tiFlyoutJsonCodeBlock';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/block/block.stories.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import { IndicatorsFiltersContext } from '../../../../containers/filters';
 import { StoryProvidersComponent } from '../../../../../../common/mocks/story_providers';
-import { generateMockIndicator } from '../../../../../../../common/types/indicator';
+import { generateMockIndicator } from '../../../../types';
 import { IndicatorBlock } from '.';
 
 export default {

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/block/block.tsx

@@ -8,7 +8,7 @@
 import { EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
 import React, { VFC } from 'react';
 import { css, euiStyled } from '@kbn/kibana-react-plugin/common';
-import { Indicator } from '../../../../../../../common/types/indicator';
+import { Indicator } from '../../../../types';
 import { IndicatorFieldValue } from '../../../field_value';
 import { IndicatorFieldLabel } from '../../../field_label';
 import { IndicatorValueActions } from '../../indicator_value_actions';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/highlighted_values_table/highlighted_values_table.tsx

@@ -6,7 +6,7 @@
  */
 
 import React, { useMemo, VFC } from 'react';
-import { Indicator, RawIndicatorFieldId } from '../../../../../../../common/types/indicator';
+import { Indicator, RawIndicatorFieldId } from '../../../../types';
 import { unwrapValue } from '../../../../utils';
 import { IndicatorFieldsTable } from '../../fields_table';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/overview_tab.stories.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import { Story } from '@storybook/react';
 import { StoryProvidersComponent } from '../../../../../common/mocks/story_providers';
-import { generateMockIndicator, Indicator } from '../../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../../types';
 import { IndicatorsFlyoutOverview } from '.';
 import { IndicatorsFiltersContext } from '../../../containers/filters';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/overview_tab.test.tsx

@@ -8,7 +8,7 @@
 import { TestProvidersComponent } from '../../../../../common/mocks/test_providers';
 import { render, screen } from '@testing-library/react';
 import React from 'react';
-import { generateMockIndicator, Indicator } from '../../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../../types';
 import {
   IndicatorsFlyoutOverview,
   TI_FLYOUT_OVERVIEW_HIGH_LEVEL_BLOCKS,

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/overview_tab/overview_tab.tsx

@@ -16,8 +16,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { useMemo, VFC } from 'react';
-import { EMPTY_VALUE } from '../../../../../../common/constants';
-import { Indicator, RawIndicatorFieldId } from '../../../../../../common/types/indicator';
+import { EMPTY_VALUE } from '../../../../../common/constants';
+import { Indicator, RawIndicatorFieldId } from '../../../types';
 import { unwrapValue } from '../../../utils';
 import { IndicatorEmptyPrompt } from '../empty_prompt';
 import { IndicatorBlock } from './block';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/table_tab/table_tab.stories.tsx

@@ -12,7 +12,7 @@ import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { mockIndicatorsFiltersContext } from '../../../../../common/mocks/mock_indicators_filters_context';
 import { mockUiSettingsService } from '../../../../../common/mocks/mock_kibana_ui_settings_service';
 import { mockKibanaTimelinesService } from '../../../../../common/mocks/mock_kibana_timelines_service';
-import { generateMockIndicator, Indicator } from '../../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../../types';
 import { IndicatorsFlyoutTable } from '.';
 import { IndicatorsFiltersContext } from '../../../containers/filters';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/table_tab/table_tab.test.tsx

@@ -8,11 +8,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { TestProvidersComponent } from '../../../../../common/mocks/test_providers';
-import {
-  generateMockIndicator,
-  Indicator,
-  RawIndicatorFieldId,
-} from '../../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator, RawIndicatorFieldId } from '../../../types';
 import { IndicatorsFlyoutTable, TABLE_TEST_ID } from '.';
 import { unwrapValue } from '../../../utils';
 import { EMPTY_PROMPT_TEST_ID } from '../empty_prompt';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/flyout/table_tab/table_tab.tsx

@@ -6,7 +6,7 @@
  */
 
 import React, { VFC } from 'react';
-import { Indicator } from '../../../../../../common/types/indicator';
+import { Indicator } from '../../../types';
 import { IndicatorEmptyPrompt } from '../empty_prompt';
 import { IndicatorFieldsTable } from '../fields_table';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/components/actions_row_cell.tsx

@@ -8,7 +8,7 @@
 import React, { useContext, VFC } from 'react';
 import { EuiFlexGroup } from '@elastic/eui';
 import { InvestigateInTimelineButtonIcon } from '../../../../timeline';
-import { Indicator } from '../../../../../../common/types/indicator';
+import { Indicator } from '../../../types';
 import { OpenIndicatorFlyoutButton } from './open_flyout_button';
 import { IndicatorsTableContext } from '../contexts';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/components/cell_actions.tsx

@@ -7,7 +7,7 @@
 
 import React, { VFC } from 'react';
 import { EuiDataGridColumnCellActionProps } from '@elastic/eui/src/components/datagrid/data_grid_types';
-import { Indicator } from '../../../../../../common/types/indicator';
+import { Indicator } from '../../../types';
 import { AddToTimelineCellAction } from '../../../../timeline';
 import { FilterInCellAction, FilterOutCellAction } from '../../../../query_bar';
 import { fieldAndValueValid, getIndicatorFieldAndValue } from '../../../utils';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/components/cell_popover_renderer.tsx

@@ -16,7 +16,7 @@ import { CopyToClipboardButtonEmpty } from '../../copy_to_clipboard/copy_to_clip
 import { FilterInButtonEmpty, FilterOutButtonEmpty } from '../../../../query_bar';
 import { AddToTimelineButtonEmpty } from '../../../../timeline';
 import { fieldAndValueValid, getIndicatorFieldAndValue } from '../../../utils/field_value';
-import { Indicator } from '../../../../../../common/types/indicator';
+import { Indicator } from '../../../types';
 import { Pagination } from '../../../services/fetch_indicators';
 import { useStyles } from './styles';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/components/cell_renderer.tsx

@@ -8,8 +8,8 @@
 import { EuiDataGridCellValueElementProps } from '@elastic/eui';
 import React, { useContext, useEffect } from 'react';
 import { euiDarkVars as themeDark, euiLightVars as themeLight } from '@kbn/ui-theme';
-import { useKibana } from '../../../../../hooks/use_kibana';
-import { Indicator } from '../../../../../../common/types/indicator';
+import { useKibana } from '../../../../../hooks';
+import { Indicator } from '../../../types';
 import { IndicatorFieldValue } from '../../field_value';
 import { IndicatorsTableContext } from '../contexts';
 import { ActionsRowCell } from '.';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/components/field_browser/field_browser.tsx

@@ -7,7 +7,7 @@
 
 import { BrowserField } from '@kbn/rule-registry-plugin/common';
 import { VFC } from 'react';
-import { useKibana } from '../../../../../../hooks/use_kibana';
+import { useKibana } from '../../../../../../hooks';
 
 export interface IndicatorsFieldBrowserProps {
   browserFields: Readonly<Record<string, Partial<BrowserField>>>;

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/components/open_flyout_button/open_flyout_button.stories.tsx

@@ -9,7 +9,7 @@ import React from 'react';
 import { ComponentStory } from '@storybook/react';
 import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { mockUiSettingsService } from '../../../../../../common/mocks/mock_kibana_ui_settings_service';
-import { generateMockIndicator, Indicator } from '../../../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../../../types';
 import { OpenIndicatorFlyoutButton } from '.';
 
 export default {

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/components/open_flyout_button/open_flyout_button.test.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { BUTTON_TEST_ID, OpenIndicatorFlyoutButton } from '.';
-import { generateMockIndicator } from '../../../../../../../common/types/indicator';
+import { generateMockIndicator } from '../../../../types';
 import { TestProvidersComponent } from '../../../../../../common/mocks/test_providers';
 
 const mockIndicator = generateMockIndicator();

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/components/open_flyout_button/open_flyout_button.tsx

@@ -8,7 +8,7 @@
 import React, { VFC } from 'react';
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Indicator } from '../../../../../../../common/types/indicator';
+import { Indicator } from '../../../../types';
 
 export const BUTTON_TEST_ID = 'tiToggleIndicatorFlyoutButton';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/contexts/context.ts

@@ -6,7 +6,7 @@
  */
 
 import { createContext, Dispatch, SetStateAction } from 'react';
-import { Indicator } from '../../../../../../common/types/indicator';
+import { Indicator } from '../../../types';
 
 export interface IndicatorsTableContextValue {
   expanded: Indicator | undefined;

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/hooks/use_column_settings.ts

@@ -8,8 +8,8 @@
 import { EuiDataGridColumn, EuiDataGridSorting } from '@elastic/eui';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import negate from 'lodash/negate';
-import { RawIndicatorFieldId } from '../../../../../../common/types/indicator';
-import { useKibana } from '../../../../../hooks/use_kibana';
+import { RawIndicatorFieldId } from '../../../types';
+import { useKibana } from '../../../../../hooks';
 import { translateFieldLabel } from '../../field_label';
 
 export const DEFAULT_COLUMNS: EuiDataGridColumn[] = [

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/hooks/use_toolbar_options.tsx

@@ -9,7 +9,7 @@ import React, { useMemo } from 'react';
 import { EuiButtonIcon, EuiDataGridColumn, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { BrowserField } from '@kbn/rule-registry-plugin/common';
-import { useInspector } from '../../../../../hooks/use_inspector';
+import { useInspector } from '../../../../../hooks';
 import { IndicatorsFieldBrowser } from '../components';
 
 const INSPECT_BUTTON_TEST_ID = 'tiIndicatorsGridInspect';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/table.stories.tsx

@@ -9,7 +9,7 @@ import React from 'react';
 import { DataView } from '@kbn/data-views-plugin/common';
 import { mockIndicatorsFiltersContext } from '../../../../common/mocks/mock_indicators_filters_context';
 import { StoryProvidersComponent } from '../../../../common/mocks/story_providers';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../types';
 import { IndicatorsTable } from '.';
 import { IndicatorsFiltersContext } from '../../containers/filters/context';
 import { DEFAULT_COLUMNS } from './hooks';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/table.test.tsx

@@ -9,7 +9,7 @@ import { act, render, screen } from '@testing-library/react';
 import React from 'react';
 import { IndicatorsTable, IndicatorsTableProps, TABLE_UPDATE_PROGRESS_TEST_ID } from '.';
 import { TestProvidersComponent } from '../../../../common/mocks/test_providers';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../types';
 import { BUTTON_TEST_ID } from './components/open_flyout_button';
 import { TITLE_TEST_ID } from '../flyout';
 import { SecuritySolutionDataViewBase } from '../../../../types';

x-pack/plugins/threat_intelligence/public/modules/indicators/components/table/table.tsx

@@ -21,12 +21,12 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiDataGridColumn } from '@elastic/eui/src/components/datagrid/data_grid_types';
 import { CellActions, cellPopoverRendererFactory, cellRendererFactory } from './components';
 import { BrowserFields, SecuritySolutionDataViewBase } from '../../../../types';
-import { Indicator, RawIndicatorFieldId } from '../../../../../common/types/indicator';
+import { Indicator, RawIndicatorFieldId } from '../../types';
 import { EmptyState } from '../../../../components/empty_state';
 import { IndicatorsTableContext, IndicatorsTableContextValue } from './contexts';
 import { IndicatorsFlyout } from '../flyout';
 import { ColumnSettingsValue, useToolbarOptions } from './hooks';
-import { useFieldTypes } from '../../../../hooks/use_field_types';
+import { useFieldTypes } from '../../../../hooks';
 import { getFieldSchema } from '../../utils';
 import { Pagination } from '../../services';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/containers/filters/filters.tsx

@@ -6,8 +6,7 @@
  */
 
 import React, { FC, useMemo } from 'react';
-import { useKibana } from '../../../../hooks/use_kibana';
-import { useSecurityContext } from '../../../../hooks/use_security_context';
+import { useKibana, useSecurityContext } from '../../../../hooks';
 import { IndicatorsFiltersContext, IndicatorsFiltersContextValue } from '.';
 
 /**

x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_aggregated_indicators.ts

@@ -9,9 +9,8 @@ import { useQuery } from '@tanstack/react-query';
 import { Filter, Query, TimeRange } from '@kbn/es-query';
 import { useMemo, useState } from 'react';
 import { TimeRangeBounds } from '@kbn/data-plugin/common';
-import { useInspector } from '../../../hooks/use_inspector';
-import { RawIndicatorFieldId } from '../../../../common/types/indicator';
-import { useKibana } from '../../../hooks/use_kibana';
+import { useInspector, useKibana } from '../../../hooks';
+import { RawIndicatorFieldId } from '../types';
 import { useSourcererDataView } from '.';
 import {
   ChartSeries,

x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_indicators.ts

@@ -9,9 +9,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Filter, Query, TimeRange } from '@kbn/es-query';
 import { useQuery } from '@tanstack/react-query';
 import { EuiDataGridSorting } from '@elastic/eui';
-import { useInspector } from '../../../hooks/use_inspector';
-import { Indicator } from '../../../../common/types/indicator';
-import { useKibana } from '../../../hooks/use_kibana';
+import { useInspector, useKibana } from '../../../hooks';
+import { Indicator } from '../types';
 import { useSourcererDataView } from './use_sourcerer_data_view';
 import { createFetchIndicators, FetchParams, Pagination } from '../services/fetch_indicators';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_sourcerer_data_view.ts

@@ -7,7 +7,7 @@
 
 import { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
-import { RawIndicatorFieldId } from '../../../../common/types/indicator';
+import { RawIndicatorFieldId } from '../types';
 import { SecuritySolutionDataViewBase } from '../../../types';
 import { useSecurityContext } from '../../../hooks/use_security_context';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/hooks/use_total_count.tsx

@@ -11,7 +11,7 @@ import {
   IKibanaSearchResponse,
   isCompleteResponse,
 } from '@kbn/data-plugin/common';
-import { useKibana } from '../../../hooks/use_kibana';
+import { useKibana } from '../../../hooks';
 import { useSourcererDataView } from './use_sourcerer_data_view';
 import type { RawIndicatorsResponse } from '../services/fetch_indicators';
 

x-pack/plugins/threat_intelligence/public/modules/indicators/index.ts

@@ -11,3 +11,4 @@ export * from './hooks/use_sourcerer_data_view';
 export * from './hooks/use_total_count';
 export * from './utils/field_value';
 export * from './utils/unwrap_value';
+export * from './types/indicator';

x-pack/plugins/threat_intelligence/public/modules/indicators/services/fetch_aggregated_indicators.ts

@@ -10,7 +10,7 @@ import type { ISearchStart, QueryStart } from '@kbn/data-plugin/public';
 import type { Filter, Query, TimeRange } from '@kbn/es-query';
 import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { calculateBarchartColumnTimeInterval } from '../../../common/utils/dates';
-import { RawIndicatorFieldId } from '../../../../common/types/indicator';
+import { RawIndicatorFieldId } from '../types';
 import { getIndicatorQueryParams, search } from '../utils';
 
 const TIMESTAMP_FIELD = RawIndicatorFieldId.TimeStamp;

x-pack/plugins/threat_intelligence/public/modules/indicators/services/fetch_indicators.ts

@@ -8,7 +8,7 @@
 import { ISearchStart } from '@kbn/data-plugin/public';
 import type { Filter, Query, TimeRange } from '@kbn/es-query';
 import { RequestAdapter } from '@kbn/inspector-plugin/common';
-import { Indicator } from '../../../../common/types/indicator';
+import { Indicator } from '../types';
 import { getIndicatorQueryParams, search } from '../utils';
 
 export interface RawIndicatorsResponse {

x-pack/plugins/threat_intelligence/public/modules/indicators/types/index.ts

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './indicator';

x-pack/plugins/threat_intelligence/public/modules/indicators/utils/display_name.ts

@@ -6,7 +6,7 @@
  */
 
 import dedent from 'dedent';
-import { RawIndicatorFieldId } from '../../../../common/types/indicator';
+import { RawIndicatorFieldId } from '../types';
 
 /**
  * Mapping connects one ore more types to field values that should be used to generate threat.indicator.name field.

x-pack/plugins/threat_intelligence/public/modules/indicators/utils/field_value.test.ts

@@ -6,11 +6,8 @@
  */
 
 import { fieldAndValueValid, getIndicatorFieldAndValue } from './field_value';
-import {
-  generateMockFileIndicator,
-  generateMockUrlIndicator,
-} from '../../../../common/types/indicator';
-import { EMPTY_VALUE } from '../../../../common/constants';
+import { generateMockFileIndicator, generateMockUrlIndicator } from '../types';
+import { EMPTY_VALUE } from '../../../common/constants';
 
 describe('field_value', () => {
   describe('getIndicatorFieldAndValue()', () => {

x-pack/plugins/threat_intelligence/public/modules/indicators/utils/field_value.ts

@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { EMPTY_VALUE } from '../../../../common/constants';
+import { EMPTY_VALUE } from '../../../common/constants';
 import { unwrapValue } from './unwrap_value';
-import { Indicator, RawIndicatorFieldId } from '../../../../common/types/indicator';
+import { Indicator, RawIndicatorFieldId } from '../types';
 
 /**
  * Retrieves a field/value pair from an Indicator

x-pack/plugins/threat_intelligence/public/modules/indicators/utils/get_indicator_query_params.ts

@@ -6,8 +6,8 @@
  */
 
 import { buildEsQuery, Filter, Query, TimeRange } from '@kbn/es-query';
-import { THREAT_QUERY_BASE } from '../../../../common/constants';
-import { RawIndicatorFieldId } from '../../../../common/types/indicator';
+import { THREAT_QUERY_BASE } from '../../../common/constants';
+import { RawIndicatorFieldId } from '..';
 import { threatIndicatorNamesOriginScript, threatIndicatorNamesScript } from './display_name';
 
 const TIMESTAMP_FIELD = RawIndicatorFieldId.TimeStamp;

x-pack/plugins/threat_intelligence/public/modules/indicators/utils/unwrap_value.test.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RawIndicatorFieldId } from '../../../../common/types/indicator';
+import { RawIndicatorFieldId } from '../types';
 import { unwrapValue } from './unwrap_value';
 
 describe('unwrapValue()', () => {

x-pack/plugins/threat_intelligence/public/modules/indicators/utils/unwrap_value.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Indicator, RawIndicatorFieldId } from '../../../../common/types/indicator';
+import { Indicator, RawIndicatorFieldId } from '../types';
 
 /**
  * Unpacks field value from raw indicator fields. Will return null if fields are missing entirely

x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/filter_in.stories.tsx

@@ -10,9 +10,8 @@ import { Story } from '@storybook/react';
 import { EuiContextMenuPanel, EuiDataGrid, EuiDataGridColumn } from '@elastic/eui';
 import { EuiDataGridColumnVisibility } from '@elastic/eui/src/components/datagrid/data_grid_types';
 import { mockIndicatorsFiltersContext } from '../../../../common/mocks/mock_indicators_filters_context';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator, IndicatorsFiltersContext } from '../../../indicators';
 import { FilterInButtonIcon, FilterInCellAction, FilterInContextMenu } from '.';
-import { IndicatorsFiltersContext } from '../../../indicators';
 
 export default {
   title: 'FilterIn',

x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/filter_in.test.tsx

@@ -8,8 +8,7 @@
 import React, { FunctionComponent } from 'react';
 import { render } from '@testing-library/react';
 import { EuiButtonIcon } from '@elastic/eui';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
-import { useIndicatorsFiltersContext } from '../../../indicators';
+import { generateMockIndicator, Indicator, useIndicatorsFiltersContext } from '../../../indicators';
 import { mockIndicatorsFiltersContext } from '../../../../common/mocks/mock_indicators_filters_context';
 import {
   FilterInButtonEmpty,

x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in/filter_in.tsx

@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty, EuiButtonIcon, EuiContextMenuItem, EuiToolTip } from '@elastic/eui';
 import { useFilterInOut } from '../../hooks';
 import { FilterIn } from '../../utils';
-import { Indicator } from '../../../../../common/types/indicator';
+import { Indicator } from '../../../indicators';
 import { useStyles } from './styles';
 
 const ICON_TYPE = 'plusInCircle';

x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/filter_out.stories.tsx

@@ -10,9 +10,8 @@ import { Story } from '@storybook/react';
 import { EuiContextMenuPanel, EuiDataGrid, EuiDataGridColumn } from '@elastic/eui';
 import { EuiDataGridColumnVisibility } from '@elastic/eui/src/components/datagrid/data_grid_types';
 import { mockIndicatorsFiltersContext } from '../../../../common/mocks/mock_indicators_filters_context';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator, IndicatorsFiltersContext } from '../../../indicators';
 import { FilterOutButtonIcon, FilterOutCellAction, FilterOutContextMenu } from '.';
-import { IndicatorsFiltersContext } from '../../../indicators';
 
 export default {
   title: 'FilterOut',

x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/filter_out.test.tsx

@@ -8,8 +8,7 @@
 import React, { FunctionComponent } from 'react';
 import { render } from '@testing-library/react';
 import { EuiButtonIcon } from '@elastic/eui';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
-import { useIndicatorsFiltersContext } from '../../../indicators';
+import { generateMockIndicator, Indicator, useIndicatorsFiltersContext } from '../../../indicators';
 import { mockIndicatorsFiltersContext } from '../../../../common/mocks/mock_indicators_filters_context';
 import {
   FilterOutButtonEmpty,

x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out/filter_out.tsx

@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiButtonEmpty, EuiButtonIcon, EuiContextMenuItem, EuiToolTip } from '@elastic/eui';
 import { useFilterInOut } from '../../hooks';
 import { FilterOut } from '../../utils';
-import { Indicator } from '../../../../../common/types/indicator';
+import { Indicator } from '../../../indicators';
 import { useStyles } from './styles';
 
 const ICON_TYPE = 'minusInCircle';

x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.test.ts

@@ -6,11 +6,7 @@
  */
 
 import { Renderer, renderHook, RenderHookResult } from '@testing-library/react-hooks';
-import {
-  generateMockIndicator,
-  generateMockUrlIndicator,
-  Indicator,
-} from '../../../../common/types/indicator';
+import { generateMockIndicator, generateMockUrlIndicator, Indicator } from '../../indicators';
 import { TestProvidersComponent } from '../../../common/mocks/test_providers';
 import { useFilterInOut, UseFilterInValue } from '.';
 import { FilterIn } from '../utils';

x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.ts

@@ -10,10 +10,10 @@ import { Filter } from '@kbn/es-query';
 import {
   fieldAndValueValid,
   getIndicatorFieldAndValue,
+  Indicator,
   useIndicatorsFiltersContext,
 } from '../../indicators';
 import { FilterIn, FilterOut, updateFiltersArray } from '../utils';
-import { Indicator } from '../../../../common/types/indicator';
 
 export interface UseFilterInParam {
   /**

x-pack/plugins/threat_intelligence/public/modules/timeline/components/add_to_timeline/add_to_timeline.stories.tsx

@@ -11,7 +11,7 @@ import { CoreStart } from '@kbn/core/public';
 import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
 import { EuiContextMenuPanel } from '@elastic/eui';
 import { mockKibanaTimelinesService } from '../../../../common/mocks/mock_kibana_timelines_service';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
+import { generateMockIndicator, Indicator } from '../../../indicators';
 import { AddToTimelineButtonIcon, AddToTimelineContextMenu } from '.';
 
 export default {

x-pack/plugins/threat_intelligence/public/modules/timeline/components/add_to_timeline/add_to_timeline.test.tsx

@@ -7,8 +7,8 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import { generateMockIndicator, Indicator } from '../../../../../common/types/indicator';
-import { EMPTY_VALUE } from '../../../../../common/constants';
+import { generateMockIndicator, Indicator } from '../../../indicators';
+import { EMPTY_VALUE } from '../../../../common/constants';
 import { AddToTimelineButtonIcon } from '.';
 import { TestProvidersComponent } from '../../../../common/mocks/test_providers';
 

x-pack/plugins/threat_intelligence/public/modules/timeline/components/add_to_timeline/add_to_timeline.tsx

@@ -17,9 +17,8 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { generateDataProvider } from '../../utils';
-import { fieldAndValueValid, getIndicatorFieldAndValue } from '../../../indicators';
-import { useKibana } from '../../../../hooks/use_kibana';
-import { Indicator } from '../../../../../common/types/indicator';
+import { fieldAndValueValid, getIndicatorFieldAndValue, Indicator } from '../../../indicators';
+import { useKibana } from '../../../../hooks';
 import { useStyles } from './styles';
 import { useAddToTimeline } from '../../hooks';
 

x-pack/plugins/threat_intelligence/public/modules/timeline/components/investigate_in_timeline/investigate_in_timeline.stories.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import { Story } from '@storybook/react';
 import { StoryProvidersComponent } from '../../../../common/mocks/story_providers';
-import { generateMockUrlIndicator } from '../../../../../common/types/indicator';
+import { generateMockUrlIndicator } from '../../../indicators';
 import { InvestigateInTimelineButton, InvestigateInTimelineButtonIcon } from '.';
 
 export default {

x-pack/plugins/threat_intelligence/public/modules/timeline/components/investigate_in_timeline/investigate_in_timeline.test.tsx

@@ -7,14 +7,10 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import {
-  generateMockIndicator,
-  generateMockUrlIndicator,
-  Indicator,
-} from '../../../../../common/types/indicator';
+import { generateMockIndicator, generateMockUrlIndicator, Indicator } from '../../../indicators';
 import { TestProvidersComponent } from '../../../../common/mocks/test_providers';
 import { InvestigateInTimelineButton, InvestigateInTimelineButtonIcon } from '.';
-import { EMPTY_VALUE } from '../../../../../common/constants';
+import { EMPTY_VALUE } from '../../../../common/constants';
 
 describe('<InvestigateInTimeline />', () => {
   describe('<InvestigateInTimelineButton />', () => {

x-pack/plugins/threat_intelligence/public/modules/timeline/components/investigate_in_timeline/investigate_in_timeline.tsx

@@ -10,7 +10,7 @@ import { EuiButton, EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { useInvestigateInTimeline } from '../../hooks';
-import { Indicator } from '../../../../../common/types/indicator';
+import { Indicator } from '../../../indicators';
 
 const BUTTON_ICON_LABEL: string = i18n.translate(
   'xpack.threatIntelligence.timeline.investigateInTimelineButtonIcon',

x-pack/plugins/threat_intelligence/public/modules/timeline/hooks/use_add_to_timeline.test.tsx

@@ -5,13 +5,9 @@
  * 2.0.
  */
 
-import { EMPTY_VALUE } from '../../../../common/constants';
+import { EMPTY_VALUE } from '../../../common/constants';
 import { Renderer, renderHook, RenderHookResult } from '@testing-library/react-hooks';
-import {
-  generateMockIndicator,
-  generateMockUrlIndicator,
-  Indicator,
-} from '../../../../common/types/indicator';
+import { generateMockIndicator, generateMockUrlIndicator, Indicator } from '../../indicators';
 import { TestProvidersComponent } from '../../../common/mocks/test_providers';
 import { useAddToTimeline, UseAddToTimelineValue } from '.';
 

x-pack/plugins/threat_intelligence/public/modules/timeline/hooks/use_add_to_timeline.ts

@@ -8,8 +8,7 @@
 import { DataProvider } from '@kbn/timelines-plugin/common';
 import { AddToTimelineButtonProps } from '@kbn/timelines-plugin/public';
 import { generateDataProvider } from '../utils';
-import { fieldAndValueValid, getIndicatorFieldAndValue } from '../../indicators';
-import { Indicator } from '../../../../common/types/indicator';
+import { fieldAndValueValid, getIndicatorFieldAndValue, Indicator } from '../../indicators';
 
 export interface UseAddToTimelineParam {
   /**