[7.x] [Logs UI] Move alerting components to public/alerting (#79035) (#79131)

Zacqary · elasticmachine · web-flow · commit ad40cf2cad4e · 2020-10-01T11:31:36.000-05:00
Co-authored-by: Elastic Machine &lt;elasticmachine@users.noreply.github.com&gt;

Co-authored-by: Elastic Machine &lt;elasticmachine@users.noreply.github.com&gt;
diff --git a/x-pack/plugins/infra/public/alerting/common/criterion_preview_chart/criterion_preview_chart.tsx b/x-pack/plugins/infra/public/alerting/common/criterion_preview_chart/criterion_preview_chart.tsx
@@ -11,8 +11,8 @@ import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { formatNumber } from '../../../../../common/formatters/number';
-import { GetLogAlertsChartPreviewDataSuccessResponsePayload } from '../../../../../common/http_api';
+import { formatNumber } from '../../../../common/formatters/number';
+import { GetLogAlertsChartPreviewDataSuccessResponsePayload } from '../../../../common/http_api';
 
 type Series = GetLogAlertsChartPreviewDataSuccessResponsePayload['data']['series'];
 
diff --git a/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx b/x-pack/plugins/infra/public/alerting/common/group_by_expression/group_by_expression.tsx
diff --git a/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx b/x-pack/plugins/infra/public/alerting/common/group_by_expression/selector.tsx
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_dropdown.tsx
@@ -8,7 +8,7 @@ import React, { useState, useCallback, useMemo } from 'react';
 import { EuiPopover, EuiButtonEmpty, EuiContextMenuItem, EuiContextMenuPanel } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { AlertFlyout } from './alert_flyout';
-import { useLinkProps } from '../../../../hooks/use_link_props';
+import { useLinkProps } from '../../../hooks/use_link_props';
 
 export const AlertDropdown = () => {
   const [popoverOpen, setPopoverOpen] = useState(false);
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/alert_flyout.tsx
@@ -6,10 +6,10 @@
 
 import React, { useContext } from 'react';
 import { ApplicationStart, DocLinksStart, HttpStart, NotificationsStart } from 'src/core/public';
-import { AlertsContextProvider, AlertAdd } from '../../../../../../triggers_actions_ui/public';
-import { TriggerActionsContext } from '../../../../utils/triggers_actions_context';
-import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
-import { LOG_DOCUMENT_COUNT_ALERT_TYPE_ID } from '../../../../../common/alerting/logs/log_threshold/types';
+import { AlertsContextProvider, AlertAdd } from '../../../../../triggers_actions_ui/public';
+import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { LOG_DOCUMENT_COUNT_ALERT_TYPE_ID } from '../../../../common/alerting/logs/log_threshold/types';
 
 interface Props {
   visible?: boolean;
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criteria.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criteria.tsx
@@ -20,10 +20,10 @@ import {
   isRatioAlert,
   getNumerator,
   getDenominator,
-} from '../../../../../../common/alerting/logs/log_threshold/types';
+} from '../../../../../common/alerting/logs/log_threshold/types';
+import { Errors, CriterionErrors } from '../../validation';
 import { AlertsContext, ExpressionLike } from './editor';
 import { CriterionPreview } from './criterion_preview_chart';
-import { Errors, CriterionErrors } from '../validation';
 
 const DEFAULT_CRITERIA = { field: 'log.level', comparator: Comparator.EQ, value: 'error' };
 
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion.tsx
@@ -21,12 +21,12 @@ import { i18n } from '@kbn/i18n';
 import { isNumber, isFinite } from 'lodash';
 import { IFieldType } from 'src/plugins/data/public';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { IErrorObject } from '../../../../../../../triggers_actions_ui/public/types';
+import { IErrorObject } from '../../../../../../triggers_actions_ui/public/types';
 import {
   Comparator,
   Criterion as CriterionType,
   ComparatorToi18nMap,
-} from '../../../../../../common/alerting/logs/log_threshold/types';
+} from '../../../../../common/alerting/logs/log_threshold/types';
 
 const firstCriterionFieldPrefix = i18n.translate(
   'xpack.infra.logs.alertFlyout.firstCriterionFieldPrefix',
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/criterion_preview_chart.tsx
@@ -31,21 +31,21 @@ import {
   getChartTheme,
   yAxisFormatter,
   NUM_BUCKETS,
-} from '../../../shared/criterion_preview_chart/criterion_preview_chart';
+} from '../../../common/criterion_preview_chart/criterion_preview_chart';
 import {
   AlertParams,
   Threshold,
   Criterion,
   Comparator,
-} from '../../../../../../common/alerting/logs/log_threshold/types';
-import { Color, colorTransformer } from '../../../../../../common/color_palette';
+} from '../../../../../common/alerting/logs/log_threshold/types';
+import { Color, colorTransformer } from '../../../../../common/color_palette';
 import {
   GetLogAlertsChartPreviewDataAlertParamsSubset,
   getLogAlertsChartPreviewDataAlertParamsSubsetRT,
-} from '../../../../../../common/http_api/log_alerts/';
+} from '../../../../../common/http_api/log_alerts/';
 import { AlertsContext } from './editor';
 import { useChartPreviewData } from './hooks/use_chart_preview_data';
-import { decodeOrThrow } from '../../../../../../common/runtime_types';
+import { decodeOrThrow } from '../../../../../common/runtime_types';
 
 const GROUP_LIMIT = 5;
 
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/editor.tsx
@@ -8,25 +8,23 @@ import React, { useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner, EuiSpacer, EuiButton, EuiCallOut } from '@elastic/eui';
 import { useMount } from 'react-use';
+import { GroupByExpression } from '../../../common/group_by_expression/group_by_expression';
 import {
   ForLastExpression,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../../triggers_actions_ui/public/common';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { AlertsContextValue } from '../../../../../../../triggers_actions_ui/public/application/context/alerts_context';
+  AlertsContextValue,
+} from '../../../../../../triggers_actions_ui/public';
 import {
   AlertParams,
   Comparator,
   ThresholdType,
   isRatioAlert,
-} from '../../../../../../common/alerting/logs/log_threshold/types';
+} from '../../../../../common/alerting/logs/log_threshold/types';
 import { Threshold } from './threshold';
 import { Criteria } from './criteria';
 import { TypeSwitcher } from './type_switcher';
-import { useSourceId } from '../../../../../containers/source_id';
-import { LogSourceProvider, useLogSourceContext } from '../../../../../containers/logs/log_source';
-import { GroupByExpression } from '../../../shared/group_by_expression/group_by_expression';
-import { Errors } from '../validation';
+import { useSourceId } from '../../../../containers/source_id';
+import { LogSourceProvider, useLogSourceContext } from '../../../../containers/logs/log_source';
+import { Errors } from '../../validation';
 
 export interface ExpressionCriteria {
   field?: string;
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/hooks/use_chart_preview_data.tsx
@@ -5,15 +5,15 @@
  */
 import { useState, useMemo } from 'react';
 import { AlertsContext } from '../editor';
-import { useTrackedPromise } from '../../../../../../utils/use_tracked_promise';
+import { useTrackedPromise } from '../../../../../utils/use_tracked_promise';
 import {
   GetLogAlertsChartPreviewDataSuccessResponsePayload,
   getLogAlertsChartPreviewDataSuccessResponsePayloadRT,
   getLogAlertsChartPreviewDataRequestPayloadRT,
   LOG_ALERTS_CHART_PREVIEW_DATA_PATH,
-} from '../../../../../../../common/http_api';
-import { decodeOrThrow } from '../../../../../../../common/runtime_types';
-import { GetLogAlertsChartPreviewDataAlertParamsSubset } from '../../../../../../../common/http_api/log_alerts/';
+} from '../../../../../../common/http_api';
+import { decodeOrThrow } from '../../../../../../common/runtime_types';
+import { GetLogAlertsChartPreviewDataAlertParamsSubset } from '../../../../../../common/http_api/log_alerts/';
 
 interface Options {
   sourceId: string;
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/index.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/index.tsx
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/threshold.tsx
@@ -18,12 +18,12 @@ import {
   EuiFormRow,
 } from '@elastic/eui';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { IErrorObject } from '../../../../../../../triggers_actions_ui/public/types';
+import { IErrorObject } from '../../../../../../triggers_actions_ui/public/types';
 import {
   Comparator,
   ComparatorToi18nMap,
   AlertParams,
-} from '../../../../../../common/alerting/logs/log_threshold/types';
+} from '../../../../../common/alerting/logs/log_threshold/types';
 
 const thresholdPrefix = i18n.translate('xpack.infra.logs.alertFlyout.thresholdPrefix', {
   defaultMessage: 'is',
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/type_switcher.tsx b/x-pack/plugins/infra/public/alerting/log_threshold/components/expression_editor/type_switcher.tsx
@@ -11,7 +11,7 @@ import {
   AlertParams,
   ThresholdType,
   isRatioAlert,
-} from '../../../../../../common/alerting/logs/log_threshold/types';
+} from '../../../../../common/alerting/logs/log_threshold/types';
 import { ExpressionLike } from './editor';
 
 const typePrefix = i18n.translate('xpack.infra.logs.alertFlyout.thresholdTypePrefix', {
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/index.ts b/x-pack/plugins/infra/public/alerting/log_threshold/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;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { getAlertType } from './log_threshold_alert_type';
+export { AlertDropdown } from './components/alert_dropdown';
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_alert_type.ts b/x-pack/plugins/infra/public/alerting/log_threshold/log_threshold_alert_type.ts
@@ -5,9 +5,8 @@
  */
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { AlertTypeModel } from '../../../../../../triggers_actions_ui/public/types';
-import { LOG_DOCUMENT_COUNT_ALERT_TYPE_ID } from '../../../../../common/alerting/logs/log_threshold/types';
+import { AlertTypeModel } from '../../../../triggers_actions_ui/public';
+import { LOG_DOCUMENT_COUNT_ALERT_TYPE_ID } from '../../../common/alerting/logs/log_threshold/types';
 import { validateExpression } from './validation';
 
 export function getAlertType(): AlertTypeModel {
@@ -17,7 +16,7 @@ export function getAlertType(): AlertTypeModel {
       defaultMessage: 'Log threshold',
     }),
     iconClass: 'bell',
-    alertParamsExpression: React.lazy(() => import('./expression_editor/editor')),
+    alertParamsExpression: React.lazy(() => import('./components/expression_editor/editor')),
     validate: validateExpression,
     defaultActionMessage: i18n.translate(
       'xpack.infra.logs.alerting.threshold.defaultActionMessage',
diff --git a/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts b/x-pack/plugins/infra/public/alerting/log_threshold/validation.ts
@@ -6,16 +6,15 @@
 
 import { i18n } from '@kbn/i18n';
 import { isNumber, isFinite } from 'lodash';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ValidationResult } from '../../../../../../triggers_actions_ui/public/types';
+import { ValidationResult } from '../../../../triggers_actions_ui/public';
 import {
   AlertParams,
   Criteria,
   RatioCriteria,
   isRatioAlert,
   getNumerator,
   getDenominator,
-} from '../../../../../common/alerting/logs/log_threshold/types';
+} from '../../../common/alerting/logs/log_threshold/types';
 
 export interface CriterionErrors {
   [id: string]: {
diff --git a/x-pack/plugins/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
@@ -10,6 +10,7 @@ import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 import { useMount } from 'react-use';
 
+import { AlertDropdown } from '../../alerting/log_threshold';
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { DocumentTitle } from '../../components/document_title';
 import { Header } from '../../components/header';
@@ -23,7 +24,6 @@ import { LogEntryCategoriesPage } from './log_entry_categories';
 import { LogEntryRatePage } from './log_entry_rate';
 import { LogsSettingsPage } from './settings';
 import { StreamPage } from './stream';
-import { AlertDropdown } from '../../components/alerting/logs/log_threshold/alert_dropdown';
 
 export const LogsPageContent: React.FunctionComponent = () => {
   const uiCapabilities = useKibana().services.application?.capabilities;
diff --git a/x-pack/plugins/infra/public/plugin.ts b/x-pack/plugins/infra/public/plugin.ts
@@ -8,7 +8,7 @@ import { AppMountParameters, PluginInitializerContext } from 'kibana/public';
 import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
 import { createMetricThresholdAlertType } from './alerting/metric_threshold';
 import { createInventoryMetricAlertType } from './alerting/inventory';
-import { getAlertType as getLogsAlertType } from './components/alerting/logs/log_threshold/log_threshold_alert_type';
+import { getAlertType as getLogsAlertType } from './alerting/log_threshold';
 import { registerStartSingleton } from './legacy_singletons';
 import { registerFeatures } from './register_feature';
 import {
diff --git a/x-pack/plugins/triggers_actions_ui/public/index.ts b/x-pack/plugins/triggers_actions_ui/public/index.ts
@@ -7,7 +7,7 @@
 import { PluginInitializerContext } from 'src/core/public';
 import { Plugin } from './plugin';
 
-export { AlertsContextProvider } from './application/context/alerts_context';
+export { AlertsContextProvider, AlertsContextValue } from './application/context/alerts_context';
 export { ActionsConnectorsContextProvider } from './application/context/actions_connectors_context';
 export { AlertAdd } from './application/sections/alert_form';
 export { AlertEdit } from './application/sections';
