diff --git a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/flyout_body.tsx b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/flyout_body.tsx
index 3f493ef7d4355..f7de84a9c1ad0 100644
--- a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/flyout_body.tsx
+++ b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/flyout_body.tsx
@@ -9,7 +9,6 @@ import { EuiButtonEmpty, EuiSpacer } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { LayerWizardSelect } from './layer_wizard_select';
import { LayerWizard, RenderWizardArguments } from '../../../classes/layers/layer_wizard_registry';
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
type Props = RenderWizardArguments & {
layerWizard: LayerWizard | null;
diff --git a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.test.tsx b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.test.tsx
index e802c5259e5ed..d64e38cf49dea 100644
--- a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.test.tsx
@@ -17,6 +17,7 @@ const defaultProps = {
describe('LayerWizardSelect', () => {
beforeAll(() => {
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
require('../../../classes/layers/layer_wizard_registry').getLayerWizards = async () => {
return [
{
diff --git a/x-pack/plugins/maps/public/index_pattern_util.test.ts b/x-pack/plugins/maps/public/index_pattern_util.test.ts
index 27b0a4aac9bf7..ffcc6da52677a 100644
--- a/x-pack/plugins/maps/public/index_pattern_util.test.ts
+++ b/x-pack/plugins/maps/public/index_pattern_util.test.ts
@@ -68,6 +68,7 @@ describe('Gold+ licensing', () => {
describe('basic license', () => {
beforeEach(() => {
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
require('./kibana_services').getIsGoldPlus = () => false;
});
@@ -90,6 +91,7 @@ describe('Gold+ licensing', () => {
describe('gold license', () => {
beforeEach(() => {
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
require('./kibana_services').getIsGoldPlus = () => true;
});
describe('getAggregatableGeoFieldTypes', () => {
diff --git a/x-pack/plugins/maps_legacy_licensing/public/plugin.ts b/x-pack/plugins/maps_legacy_licensing/public/plugin.ts
index 69c25efd96e75..eaf527f856bc5 100644
--- a/x-pack/plugins/maps_legacy_licensing/public/plugin.ts
+++ b/x-pack/plugins/maps_legacy_licensing/public/plugin.ts
@@ -13,7 +13,6 @@ import { LicensingPluginSetup, ILicense } from '../../licensing/public';
* @public
*/
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface MapsLegacyLicensingSetupDependencies {
licensing: LicensingPluginSetup;
mapsLegacy: any;
diff --git a/x-pack/plugins/ml/public/application/_index.scss b/x-pack/plugins/ml/public/application/_index.scss
index 65e914a1ac923..45b14543946c7 100644
--- a/x-pack/plugins/ml/public/application/_index.scss
+++ b/x-pack/plugins/ml/public/application/_index.scss
@@ -1,11 +1,6 @@
// ML has it's own variables for coloring
@import 'variables';
-// Kibana management page ML section
-#kibanaManagementMLSection {
- @import 'management/index';
-}
-
// Protect the rest of Kibana from ML generic namespacing
// SASSTODO: Prefix ml selectors instead
.ml-app {
@@ -24,7 +19,6 @@
// Components
@import 'components/annotations/annotation_description_list/index'; // SASSTODO: This file overwrites EUI directly
@import 'components/anomalies_table/index'; // SASSTODO: This file overwrites EUI directly
- @import 'components/chart_tooltip/index';
@import 'components/color_range_legend/index';
@import 'components/controls/index';
@import 'components/entity_cell/index';
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index cc3af9d7f4980..42c462fa9d869 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -5,6 +5,7 @@
*/
import React, { FC } from 'react';
+import './_index.scss';
import ReactDOM from 'react-dom';
import { AppMountParameters, CoreStart, HttpStart } from 'kibana/public';
diff --git a/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx b/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
index a354612a348dc..07e33a43d3ff9 100644
--- a/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
+++ b/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
@@ -69,7 +69,7 @@ const Tooltip: FC<{ service: ChartTooltipService }> = React.memo(({ service }) =
.slice(1)
.map(({ label, value, color, isHighlighted, seriesIdentifier, valueAccessor }) => {
const classes = classNames('mlChartTooltip__item', {
- /* eslint @typescript-eslint/camelcase:0 */
+ // eslint-disable-next-line @typescript-eslint/naming-convention
echTooltip__rowHighlighted: isHighlighted,
});
return (
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx
index 00e2d5b14a96b..a3a67fbb8bb75 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx
+++ b/x-pack/plugins/ml/public/application/components/data_grid/column_chart.tsx
@@ -61,6 +61,7 @@ export const ColumnChart: FC
= ({ chartData, columnType, dataTestSubj })
)}
{
setVisibleColumns(defaultVisibleColumns);
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [defaultVisibleColumns.join()]);
const [invalidSortingColumnns, setInvalidSortingColumnns] = useState
([]);
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
index 3bc3b8c2c6dfd..e3da9b509e620 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/kibana_context.ts
@@ -23,6 +23,5 @@ interface StartPlugins {
}
export type StartServices = CoreStart &
StartPlugins & { kibanaVersion: string } & MlServicesContext;
-// eslint-disable-next-line react-hooks/rules-of-hooks
export const useMlKibana = () => useKibana();
export type MlKibanaReactContextValue = KibanaReactContextValue;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/_index.scss b/x-pack/plugins/ml/public/application/data_frame_analytics/_index.scss
index 140593cb17f6e..231d0f6a0d8c5 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/_index.scss
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/_index.scss
@@ -1,3 +1,4 @@
@import 'pages/analytics_exploration/components/regression_exploration/index';
@import 'pages/analytics_management/components/analytics_list/index';
@import 'pages/analytics_management/components/create_analytics_button/index';
+@import 'pages/analytics_creation/components/index';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
index 1b28875a624f8..1b99aac812fcd 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts
@@ -47,6 +47,7 @@ export const EXTENDED_NUMERICAL_TYPES = new Set([
ES_FIELD_TYPES.SCALED_FLOAT,
]);
+// eslint-disable-next-line @typescript-eslint/naming-convention
export const ML__ID_COPY = 'ml__id_copy';
export const isKeywordAndTextType = (fieldName: string): boolean => {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/_index.scss b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/_index.scss
new file mode 100644
index 0000000000000..28d0928eb4d35
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/_index.scss
@@ -0,0 +1,3 @@
+.dfAnalyticsCreationWizard__card {
+ width: 300px;
+}
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx
index 183cbe084f9b3..babb557105270 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx
@@ -5,7 +5,7 @@
*/
import React, { FC, Fragment } from 'react';
-import { EuiCard, EuiHorizontalRule, EuiIcon } from '@elastic/eui';
+import { EuiCard, EuiIcon } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { useNavigateToPath } from '../../../../../contexts/kibana';
@@ -18,10 +18,8 @@ export const BackToListPanel: FC = () => {
return (
-
}
title={i18n.translate('xpack.ml.dataframe.analytics.create.analyticsListCardTitle', {
defaultMessage: 'Data Frame Analytics',
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx
index a229a79d316d7..a52cbb99d7f48 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/analysis_fields_table.tsx
@@ -54,7 +54,7 @@ const columns = [
id: 'is_included',
alignment: LEFT_ALIGNMENT,
isSortable: true,
- // eslint-disable-next-line @typescript-eslint/camelcase
+ // eslint-disable-next-line @typescript-eslint/naming-convention
render: ({ is_included }: { is_included: boolean }) => (is_included ? 'Yes' : 'No'),
},
{
@@ -64,7 +64,7 @@ const columns = [
id: 'is_required',
alignment: LEFT_ALIGNMENT,
isSortable: true,
- // eslint-disable-next-line @typescript-eslint/camelcase
+ // eslint-disable-next-line @typescript-eslint/naming-convention
render: ({ is_required }: { is_required: boolean }) => (is_required ? 'Yes' : 'No'),
},
{
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step/create_step.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step/create_step.tsx
index 8ad49b84134cb..dc9f1bd586d9f 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step/create_step.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step/create_step.tsx
@@ -18,8 +18,7 @@ import { i18n } from '@kbn/i18n';
import { CreateAnalyticsFormProps } from '../../../analytics_management/hooks/use_create_analytics_form';
import { Messages } from '../shared';
import { ANALYTICS_STEPS } from '../../page';
-import { BackToListPanel } from '../back_to_list_panel';
-import { ProgressStats } from './progress_stats';
+import { CreateStepFooter } from '../create_step_footer';
interface Props extends CreateAnalyticsFormProps {
step: ANALYTICS_STEPS;
@@ -28,7 +27,7 @@ interface Props extends CreateAnalyticsFormProps {
export const CreateStep: FC = ({ actions, state, step }) => {
const { createAnalyticsJob, startAnalyticsJob } = actions;
const { isAdvancedEditorValidJson, isJobCreated, isJobStarted, isValid, requestMessages } = state;
- const { jobId } = state.form;
+ const { jobId, jobType } = state.form;
const [checked, setChecked] = useState(true);
const [showProgress, setShowProgress] = useState(false);
@@ -86,8 +85,9 @@ export const CreateStep: FC = ({ actions, state, step }) => {
)}
- {isJobCreated === true && showProgress && }
- {isJobCreated === true && }
+ {isJobCreated === true && (
+
+ )}
{failedJobMessage}
-
-
-
- )}
-
-
- {i18n.translate('xpack.ml.dataframe.analytics.create.analyticsProgressTitle', {
- defaultMessage: 'Progress',
- })}
-
-
-
-
-
-
-
- {i18n.translate('xpack.ml.dataframe.analytics.create.analyticsProgressPhaseTitle', {
- defaultMessage: 'Phase',
- })}{' '}
- {currentProgress.currentPhase}/{currentProgress.totalPhases}
-
-
-
-
-
-
-
- {`${currentProgress.progress}%`}
-
-
-
+
+
+ {showProgress && (
+
+ )}
+
+
+
+
+
+
+
+ {jobFinished === true && (
+
+
+
+ )}
+
+
+
);
};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step_footer/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step_footer/index.ts
new file mode 100644
index 0000000000000..fc4e230ba1034
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step_footer/index.ts
@@ -0,0 +1,7 @@
+/*
+ * 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 { CreateStepFooter } from './create_step_footer';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step_footer/progress_stats.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step_footer/progress_stats.tsx
new file mode 100644
index 0000000000000..522bafa54a270
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_step_footer/progress_stats.tsx
@@ -0,0 +1,83 @@
+/*
+ * 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, { FC } from 'react';
+import {
+ EuiCallOut,
+ EuiFlexGroup,
+ EuiFlexItem,
+ EuiProgress,
+ EuiSpacer,
+ EuiText,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { AnalyticsProgressStats } from './create_step_footer';
+
+interface Props {
+ currentProgress?: AnalyticsProgressStats;
+ failedJobMessage: string | undefined;
+}
+
+export const ProgressStats: FC = ({ currentProgress, failedJobMessage }) => {
+ if (currentProgress === undefined) return null;
+
+ return (
+ <>
+
+ {failedJobMessage !== undefined && (
+ <>
+
+ {failedJobMessage}
+
+
+
+ )}
+
+
+ {i18n.translate('xpack.ml.dataframe.analytics.create.analyticsProgressTitle', {
+ defaultMessage: 'Progress',
+ })}
+
+
+
+
+
+
+
+ {i18n.translate('xpack.ml.dataframe.analytics.create.analyticsProgressPhaseTitle', {
+ defaultMessage: 'Phase',
+ })}{' '}
+ {currentProgress.currentPhase}/{currentProgress.totalPhases}
+
+
+
+
+
+
+
+ {`${currentProgress.progress}%`}
+
+
+
+ );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/index.ts
new file mode 100644
index 0000000000000..ef3c0cce38652
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/index.ts
@@ -0,0 +1,7 @@
+/*
+ * 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 { ViewResultsPanel } from './view_results_panel';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx
new file mode 100644
index 0000000000000..13706eb548ec8
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx
@@ -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 React, { FC, Fragment } from 'react';
+import { EuiCard, EuiIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { useNavigateToPath } from '../../../../../contexts/kibana';
+import { getResultsUrl } from '../../../analytics_management/components/analytics_list/common';
+import { ANALYSIS_CONFIG_TYPE } from '../../../../common/analytics';
+
+interface Props {
+ jobId: string;
+ analysisType: ANALYSIS_CONFIG_TYPE;
+}
+
+export const ViewResultsPanel: FC = ({ jobId, analysisType }) => {
+ const navigateToPath = useNavigateToPath();
+
+ const redirectToAnalyticsManagementPage = async () => {
+ const path = getResultsUrl(jobId, analysisType);
+ await navigateToPath(path);
+ };
+
+ return (
+
+ }
+ title={i18n.translate('xpack.ml.dataframe.analytics.create.viewResultsCardTitle', {
+ defaultMessage: 'View Results',
+ })}
+ description={i18n.translate(
+ 'xpack.ml.dataframe.analytics.create.viewResultsCardDescription',
+ {
+ defaultMessage: 'View results for the analytics job.',
+ }
+ )}
+ onClick={redirectToAnalyticsManagementPage}
+ data-test-subj="analyticsWizardViewResultsCard"
+ />
+
+ );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
index 2cecffc993257..eab5165a42137 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/hooks/use_index_data.ts
@@ -63,7 +63,6 @@ export const useIndexData = (
useEffect(() => {
resetPagination();
// custom comparison
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [JSON.stringify(query)]);
const getIndexData = async function () {
@@ -103,7 +102,6 @@ export const useIndexData = (
useEffect(() => {
getIndexData();
// custom comparison
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [indexPattern.title, JSON.stringify([query, pagination, sortingColumns])]);
const dataLoader = useMemo(() => new DataLoader(indexPattern, toastNotifications), [
@@ -132,7 +130,6 @@ export const useIndexData = (
fetchColumnChartsData();
}
// custom comparison
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [
dataGrid.chartsVisible,
indexPattern.title,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
index 98dd40986e32b..8d53214d23d47 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/exploration_results_table/use_exploration_results.ts
@@ -70,7 +70,6 @@ export const useExplorationResults = (
useEffect(() => {
getIndexData(jobConfig, dataGrid, searchQuery);
// custom comparison
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [jobConfig && jobConfig.id, dataGrid.pagination, searchQuery, dataGrid.sortingColumns]);
const dataLoader = useMemo(
@@ -103,7 +102,6 @@ export const useExplorationResults = (
fetchColumnChartsData();
}
// custom comparison
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [
dataGrid.chartsVisible,
jobConfig?.dest.index,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.tsx
index 4c4731d0dad5f..2b1c40f0eb734 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/outlier_exploration.tsx
@@ -56,7 +56,6 @@ export const OutlierExploration: FC = React.memo(({ jobId }) =
const { columnsWithCharts, errorMessage, status, tableItems } = outlierData;
- /* eslint-disable-next-line react-hooks/rules-of-hooks */
const colorRange = useColorRange(
COLOR_RANGE.BLUE,
COLOR_RANGE_SCALE.INFLUENCER,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
index 90294a09c0adc..24649ae5f1e71 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/outlier_exploration/use_outlier_data.ts
@@ -77,7 +77,6 @@ export const useOutlierData = (
useEffect(() => {
getIndexData(jobConfig, dataGrid, searchQuery);
// custom comparison
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [jobConfig && jobConfig.id, dataGrid.pagination, searchQuery, dataGrid.sortingColumns]);
const dataLoader = useMemo(
@@ -112,7 +111,6 @@ export const useOutlierData = (
fetchColumnChartsData();
}
// custom comparison
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [
dataGrid.chartsVisible,
jobConfig?.dest.index,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
index 75c41c097192e..895d217555ef4 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/regression_exploration/evaluate_panel.tsx
@@ -94,6 +94,7 @@ export const EvaluatePanel: FC = ({ jobConfig, jobStatus, searchQuery })
genErrorEval.eval &&
isRegressionEvaluateResponse(genErrorEval.eval)
) {
+ // eslint-disable-next-line @typescript-eslint/naming-convention
const { mse, msle, huber, r_squared } = getValuesFromResponse(genErrorEval.eval);
setGeneralizationEval({
mse,
@@ -131,6 +132,7 @@ export const EvaluatePanel: FC = ({ jobConfig, jobStatus, searchQuery })
trainingErrorEval.eval &&
isRegressionEvaluateResponse(trainingErrorEval.eval)
) {
+ // eslint-disable-next-line @typescript-eslint/naming-convention
const { mse, msle, huber, r_squared } = getValuesFromResponse(trainingErrorEval.eval);
setTrainingEval({
mse,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.tsx
index 010aa7b8513b5..d78e1bcc1a913 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_button.tsx
@@ -314,6 +314,7 @@ export type CloneDataFrameAnalyticsConfig = Omit<
export function extractCloningConfig({
id,
version,
+ // eslint-disable-next-line @typescript-eslint/naming-convention
create_time,
...configToClone
}: DeepReadonly): CloneDataFrameAnalyticsConfig {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx
index 86b1c879417bb..14b743997f30a 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_button_flyout.tsx
@@ -133,7 +133,7 @@ export const EditButtonFlyout: FC> = ({ closeFlyout, item }
onClose={closeFlyout}
hideCloseButton
aria-labelledby="analyticsEditFlyoutTitle"
- data-test-subj="analyticsEditFlyout"
+ data-test-subj="mlAnalyticsEditFlyout"
>
@@ -297,7 +297,7 @@ export const EditButtonFlyout: FC> = ({ closeFlyout, item }
= ({
return (
<>
{i18n.translate('xpack.ml.dataFrame.analyticsList.emptyPromptTitle', {
- defaultMessage: 'No data frame analytics jobs found',
+ defaultMessage: 'Create your first data frame analytics job',
})}
}
actions={
!isManagementTable
? [
- setIsSourceIndexModalVisible(true)}
isDisabled={disabled}
+ color="primary"
+ iconType="plusInCircle"
+ fill
data-test-subj="mlAnalyticsCreateFirstButton"
>
{i18n.translate('xpack.ml.dataFrame.analyticsList.emptyPromptButtonText', {
- defaultMessage: 'Create your first data frame analytics job',
+ defaultMessage: 'Create job',
})}
- ,
+ ,
]
: []
}
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
index e2d9ecccf0626..cc52138d7c7b7 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
@@ -130,6 +130,6 @@ export function isCompletedAnalyticsJob(stats: DataFrameAnalyticsStats) {
return stats.state === DATA_FRAME_TASK_STATE.STOPPED && progress === 100;
}
-export function getResultsUrl(jobId: string, analysisType: string) {
+export function getResultsUrl(jobId: string, analysisType: ANALYSIS_CONFIG_TYPE | string) {
return `#/data_frame_analytics/exploration?_g=(ml:(jobId:${jobId},analysisType:${analysisType}))`;
}
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx
index 5276fedff0fde..645c6c276a6f9 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx
@@ -95,6 +95,7 @@ export const ExpandedRow: FC = ({ item }) => {
genErrorEval.eval &&
isRegressionEvaluateResponse(genErrorEval.eval)
) {
+ // eslint-disable-next-line @typescript-eslint/naming-convention
const { mse, msle, huber, r_squared } = getValuesFromResponse(genErrorEval.eval);
setGeneralizationEval({
mse,
@@ -129,6 +130,7 @@ export const ExpandedRow: FC = ({ item }) => {
trainingErrorEval.eval &&
isRegressionEvaluateResponse(trainingErrorEval.eval)
) {
+ // eslint-disable-next-line @typescript-eslint/naming-convention
const { mse, msle, huber, r_squared } = getValuesFromResponse(trainingErrorEval.eval);
setTrainingEval({
mse,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
index 123fdada44866..1b115496c2091 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
@@ -258,6 +258,7 @@ export const useColumns = (
}),
actions,
width: isManagementTable === true ? '100px' : '150px',
+ 'data-test-subj': 'mlAnalyticsTableColumnActions',
},
];
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
index 69599f43ef297..f932e4d0db7d7 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts
@@ -18,7 +18,6 @@ import { CloneDataFrameAnalyticsConfig } from '../../components/action_clone';
export enum DEFAULT_MODEL_MEMORY_LIMIT {
regression = '100mb',
- // eslint-disable-next-line @typescript-eslint/camelcase
outlier_detection = '50mb',
classification = '100mb',
}
diff --git a/x-pack/plugins/ml/public/application/explorer/add_to_dashboard_control.tsx b/x-pack/plugins/ml/public/application/explorer/add_to_dashboard_control.tsx
index 3ad749c9d0631..04ce7f79e1c02 100644
--- a/x-pack/plugins/ml/public/application/explorer/add_to_dashboard_control.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/add_to_dashboard_control.tsx
@@ -25,13 +25,11 @@ import { EuiInMemoryTable } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { useMlKibana } from '../contexts/kibana';
import { SavedObjectDashboard } from '../../../../../../src/plugins/dashboard/public';
-import {
- ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
- getDefaultPanelTitle,
-} from '../../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
+import { getDefaultPanelTitle } from '../../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
import { useDashboardService } from '../services/dashboard_service';
import { SWIMLANE_TYPE, SwimlaneType } from './explorer_constants';
import { JobId } from '../../../common/types/anomaly_detection_jobs';
+import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE } from '../../embeddables';
export interface DashboardItem {
id: string;
diff --git a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
index 51ea0f00d5f6a..0fefa71dea48b 100644
--- a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
@@ -15,12 +15,9 @@ import {
} from '@elastic/eui';
import { throttle } from 'lodash';
-import {
- ExplorerSwimlane,
- ExplorerSwimlaneProps,
-} from '../../application/explorer/explorer_swimlane';
+import { ExplorerSwimlane, ExplorerSwimlaneProps } from './explorer_swimlane';
-import { MlTooltipComponent } from '../../application/components/chart_tooltip';
+import { MlTooltipComponent } from '../components/chart_tooltip';
import { SwimLanePagination } from './swimlane_pagination';
import { SWIMLANE_TYPE } from './explorer_constants';
import { ViewBySwimLaneData } from './explorer_utils';
diff --git a/x-pack/plugins/ml/public/application/management/_index.scss b/x-pack/plugins/ml/public/application/management/_index.scss
deleted file mode 100644
index e14df2d7c2039..0000000000000
--- a/x-pack/plugins/ml/public/application/management/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'jobs_list/index';
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/_index.scss b/x-pack/plugins/ml/public/application/management/jobs_list/_index.scss
index 841415620d691..d4928a4126c1b 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/_index.scss
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/_index.scss
@@ -1 +1,4 @@
-@import 'components/index';
+// Kibana management page ML section
+#kibanaManagementMLSection {
+ @import 'components/index';
+}
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/index.ts b/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
index b16f680a2a362..81190a412abc0 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/index.ts
@@ -12,6 +12,7 @@ import { MlStartDependencies } from '../../../plugin';
import { JobsListPage } from './components';
import { getJobsListBreadcrumbs } from '../breadcrumbs';
import { setDependencyCache, clearCache } from '../../util/dependency_cache';
+import './_index.scss';
const renderApp = (element: HTMLElement, coreStart: CoreStart) => {
ReactDOM.render(React.createElement(JobsListPage, { coreStart }), element);
diff --git a/x-pack/plugins/ml/public/application/routing/routes/jobs_list.tsx b/x-pack/plugins/ml/public/application/routing/routes/jobs_list.tsx
index db58b6a537e06..38a7900916ba8 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/jobs_list.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/jobs_list.tsx
@@ -5,7 +5,7 @@
*/
import React, { useEffect, FC } from 'react';
-import { useObservable } from 'react-use';
+import useObservable from 'react-use/lib/useObservable';
import { i18n } from '@kbn/i18n';
import { NavigateToPath } from '../../contexts/kibana';
diff --git a/x-pack/plugins/ml/public/application/routing/routes/timeseriesexplorer.tsx b/x-pack/plugins/ml/public/application/routing/routes/timeseriesexplorer.tsx
index 6486db818e113..1f122ed18a851 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/timeseriesexplorer.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/timeseriesexplorer.tsx
@@ -6,7 +6,7 @@
import { isEqual } from 'lodash';
import React, { FC, useCallback, useEffect, useState } from 'react';
-import { usePrevious } from 'react-use';
+import usePrevious from 'react-use/lib/usePrevious';
import moment from 'moment';
import { i18n } from '@kbn/i18n';
diff --git a/x-pack/plugins/ml/public/application/routing/use_refresh.ts b/x-pack/plugins/ml/public/application/routing/use_refresh.ts
index 539ce6f88a421..332677e3c5796 100644
--- a/x-pack/plugins/ml/public/application/routing/use_refresh.ts
+++ b/x-pack/plugins/ml/public/application/routing/use_refresh.ts
@@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { useObservable } from 'react-use';
+import useObservable from 'react-use/lib/useObservable';
import { merge } from 'rxjs';
import { map } from 'rxjs/operators';
diff --git a/x-pack/plugins/ml/public/application/services/results_service/index.ts b/x-pack/plugins/ml/public/application/services/results_service/index.ts
index 6c508422e7063..5547c4096e3de 100644
--- a/x-pack/plugins/ml/public/application/services/results_service/index.ts
+++ b/x-pack/plugins/ml/public/application/services/results_service/index.ts
@@ -10,9 +10,9 @@ import { ml, MlApiServices } from '../ml_api_service';
export type MlResultsService = typeof mlResultsService;
-type time = string;
+type Time = string;
export interface ModelPlotOutputResults {
- results: Record;
+ results: Record;
}
export interface CriteriaField {
diff --git a/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts b/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts
index 428060dd2c31b..2912aad6819cf 100644
--- a/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts
+++ b/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts
@@ -211,7 +211,6 @@ describe('ML - custom URL utils', () => {
);
});
- // eslint-disable-next-line ban/ban
test('truncates long queries', () => {
const TEST_DOC_WITH_METHOD: AnomalyRecordDoc = {
...TEST_DOC,
diff --git a/x-pack/plugins/ml/public/application/util/string_utils.ts b/x-pack/plugins/ml/public/application/util/string_utils.ts
index 55dd16082a07c..88900c8b0ce71 100644
--- a/x-pack/plugins/ml/public/application/util/string_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/string_utils.ts
@@ -7,7 +7,6 @@
/*
* Contains utility functions for performing operations on Strings.
*/
-import _ from 'lodash';
import d3 from 'd3';
import he from 'he';
@@ -28,7 +27,8 @@ export function replaceStringTokens(
) {
return String(str).replace(/\$([^?&$\'"]+)\$/g, (match, name) => {
// Use lodash get to allow nested JSON fields to be retrieved.
- let tokenValue = _.get(valuesByTokenName, name, null);
+ let tokenValue =
+ valuesByTokenName && valuesByTokenName[name] !== undefined ? valuesByTokenName[name] : null;
if (encodeForURI === true && tokenValue !== null) {
tokenValue = encodeURIComponent(tokenValue);
}
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx
index 9f96b73d67c57..e837cabf0b494 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable.tsx
@@ -9,29 +9,17 @@ import ReactDOM from 'react-dom';
import { CoreStart } from 'kibana/public';
import { i18n } from '@kbn/i18n';
import { Subject } from 'rxjs';
-import {
- Embeddable,
- EmbeddableInput,
- EmbeddableOutput,
- IContainer,
- IEmbeddable,
-} from '../../../../../../src/plugins/embeddable/public';
+import { Embeddable, IContainer } from '../../../../../../src/plugins/embeddable/public';
import { EmbeddableSwimLaneContainer } from './embeddable_swim_lane_container';
-import { AnomalyDetectorService } from '../../application/services/anomaly_detector_service';
import { JobId } from '../../../common/types/anomaly_detection_jobs';
-import { AnomalyTimelineService } from '../../application/services/anomaly_timeline_service';
-import {
- Filter,
- Query,
- RefreshInterval,
- TimeRange,
-} from '../../../../../../src/plugins/data/common';
-import { SwimlaneType } from '../../application/explorer/explorer_constants';
import { MlDependencies } from '../../application/app';
-import { AppStateSelectedCells } from '../../application/explorer/explorer_utils';
-import { SWIM_LANE_SELECTION_TRIGGER } from '../../ui_actions/triggers';
-
-export const ANOMALY_SWIMLANE_EMBEDDABLE_TYPE = 'ml_anomaly_swimlane';
+import { SWIM_LANE_SELECTION_TRIGGER } from '../../ui_actions';
+import {
+ ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
+ AnomalySwimlaneEmbeddableInput,
+ AnomalySwimlaneEmbeddableOutput,
+ AnomalySwimlaneServices,
+} from '..';
export const getDefaultPanelTitle = (jobIds: JobId[]) =>
i18n.translate('xpack.ml.swimlaneEmbeddable.title', {
@@ -39,51 +27,7 @@ export const getDefaultPanelTitle = (jobIds: JobId[]) =>
values: { jobIds: jobIds.join(', ') },
});
-export interface AnomalySwimlaneEmbeddableCustomInput {
- jobIds: JobId[];
- swimlaneType: SwimlaneType;
- viewBy?: string;
- perPage?: number;
-
- // Embeddable inputs which are not included in the default interface
- filters: Filter[];
- query: Query;
- refreshConfig: RefreshInterval;
- timeRange: TimeRange;
-}
-
-export interface EditSwimlanePanelContext {
- embeddable: IEmbeddable;
-}
-
-export interface SwimLaneDrilldownContext extends EditSwimlanePanelContext {
- /**
- * Optional data provided by swim lane selection
- */
- data?: AppStateSelectedCells;
-}
-
-export type AnomalySwimlaneEmbeddableInput = EmbeddableInput & AnomalySwimlaneEmbeddableCustomInput;
-
-export type AnomalySwimlaneEmbeddableOutput = EmbeddableOutput &
- AnomalySwimlaneEmbeddableCustomOutput;
-
-export interface AnomalySwimlaneEmbeddableCustomOutput {
- perPage?: number;
- fromPage?: number;
- interval?: number;
-}
-
-export interface AnomalySwimlaneServices {
- anomalyDetectorService: AnomalyDetectorService;
- anomalyTimelineService: AnomalyTimelineService;
-}
-
-export type AnomalySwimlaneEmbeddableServices = [
- CoreStart,
- MlDependencies,
- AnomalySwimlaneServices
-];
+export type IAnomalySwimlaneEmbeddable = typeof AnomalySwimlaneEmbeddable;
export class AnomalySwimlaneEmbeddable extends Embeddable<
AnomalySwimlaneEmbeddableInput,
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx
index 243369982ac1f..12813ad6277aa 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.test.tsx
@@ -7,10 +7,8 @@
import { AnomalySwimlaneEmbeddableFactory } from './anomaly_swimlane_embeddable_factory';
import { coreMock } from '../../../../../../src/core/public/mocks';
import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import {
- AnomalySwimlaneEmbeddable,
- AnomalySwimlaneEmbeddableInput,
-} from './anomaly_swimlane_embeddable';
+import { AnomalySwimlaneEmbeddable } from './anomaly_swimlane_embeddable';
+import { AnomalySwimlaneEmbeddableInput } from '..';
jest.mock('./anomaly_swimlane_embeddable', () => ({
AnomalySwimlaneEmbeddable: jest.fn(),
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts
index 14fbf77544b21..9d2fd07e11be5 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_embeddable_factory.ts
@@ -10,23 +10,16 @@ import { StartServicesAccessor } from 'kibana/public';
import {
EmbeddableFactoryDefinition,
- ErrorEmbeddable,
IContainer,
} from '../../../../../../src/plugins/embeddable/public';
+import { HttpService } from '../../application/services/http_service';
+import { MlPluginStart, MlStartDependencies } from '../../plugin';
+import { MlDependencies } from '../../application/app';
import {
ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
- AnomalySwimlaneEmbeddable,
AnomalySwimlaneEmbeddableInput,
AnomalySwimlaneEmbeddableServices,
-} from './anomaly_swimlane_embeddable';
-import { HttpService } from '../../application/services/http_service';
-import { AnomalyDetectorService } from '../../application/services/anomaly_detector_service';
-import { AnomalyTimelineService } from '../../application/services/anomaly_timeline_service';
-import { mlResultsServiceProvider } from '../../application/services/results_service';
-import { resolveAnomalySwimlaneUserInput } from './anomaly_swimlane_setup_flyout';
-import { mlApiServicesProvider } from '../../application/services/ml_api_service';
-import { MlPluginStart, MlStartDependencies } from '../../plugin';
-import { MlDependencies } from '../../application/app';
+} from '..';
export class AnomalySwimlaneEmbeddableFactory
implements EmbeddableFactoryDefinition {
@@ -50,6 +43,7 @@ export class AnomalySwimlaneEmbeddableFactory
const [coreStart] = await this.getServices();
try {
+ const { resolveAnomalySwimlaneUserInput } = await import('./anomaly_swimlane_setup_flyout');
return await resolveAnomalySwimlaneUserInput(coreStart);
} catch (e) {
return Promise.reject();
@@ -59,6 +53,15 @@ export class AnomalySwimlaneEmbeddableFactory
private async getServices(): Promise {
const [coreStart, pluginsStart] = await this.getStartServices();
+ const { AnomalyDetectorService } = await import(
+ '../../application/services/anomaly_detector_service'
+ );
+ const { AnomalyTimelineService } = await import(
+ '../../application/services/anomaly_timeline_service'
+ );
+ const { mlApiServicesProvider } = await import('../../application/services/ml_api_service');
+ const { mlResultsServiceProvider } = await import('../../application/services/results_service');
+
const httpService = new HttpService(coreStart.http);
const anomalyDetectorService = new AnomalyDetectorService(httpService);
const anomalyTimelineService = new AnomalyTimelineService(
@@ -77,8 +80,9 @@ export class AnomalySwimlaneEmbeddableFactory
public async create(
initialInput: AnomalySwimlaneEmbeddableInput,
parent?: IContainer
- ): Promise {
+ ): Promise {
const services = await this.getServices();
+ const { AnomalySwimlaneEmbeddable } = await import('./anomaly_swimlane_embeddable');
return new AnomalySwimlaneEmbeddable(initialInput, services, parent);
}
}
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_initializer.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_initializer.tsx
index e5a13adca05db..026d4e225f45b 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_initializer.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_initializer.tsx
@@ -22,7 +22,7 @@ import {
import { FormattedMessage } from '@kbn/i18n/react';
import { i18n } from '@kbn/i18n';
import { SWIMLANE_TYPE, SwimlaneType } from '../../application/explorer/explorer_constants';
-import { AnomalySwimlaneEmbeddableInput } from './anomaly_swimlane_embeddable';
+import { AnomalySwimlaneEmbeddableInput } from '..';
export interface AnomalySwimlaneInitializerProps {
defaultTitle: string;
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
index 1ffdadb60aaa3..3a3597a7fa927 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout.tsx
@@ -16,12 +16,10 @@ import { AnomalySwimlaneInitializer } from './anomaly_swimlane_initializer';
import { JobSelectorFlyout } from '../../application/components/job_selector/job_selector_flyout';
import { AnomalyDetectorService } from '../../application/services/anomaly_detector_service';
import { getInitialGroupsMap } from '../../application/components/job_selector/job_selector';
-import {
- AnomalySwimlaneEmbeddableInput,
- getDefaultPanelTitle,
-} from './anomaly_swimlane_embeddable';
+import { getDefaultPanelTitle } from './anomaly_swimlane_embeddable';
import { getMlGlobalServices } from '../../application/app';
import { HttpService } from '../../application/services/http_service';
+import { AnomalySwimlaneEmbeddableInput } from '..';
export async function resolveAnomalySwimlaneUserInput(
coreStart: CoreStart,
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx
index 23045834eae5f..ff621953cc577 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.test.tsx
@@ -12,11 +12,7 @@ import {
} from './embeddable_swim_lane_container';
import { BehaviorSubject, Observable } from 'rxjs';
import { I18nProvider } from '@kbn/i18n/react';
-import {
- AnomalySwimlaneEmbeddable,
- AnomalySwimlaneEmbeddableInput,
- AnomalySwimlaneServices,
-} from './anomaly_swimlane_embeddable';
+import { AnomalySwimlaneEmbeddable } from './anomaly_swimlane_embeddable';
import { CoreStart } from 'kibana/public';
import { useSwimlaneInputResolver } from './swimlane_input_resolver';
import { SWIMLANE_TYPE } from '../../application/explorer/explorer_constants';
@@ -25,6 +21,7 @@ import { MlDependencies } from '../../application/app';
import { uiActionsPluginMock } from 'src/plugins/ui_actions/public/mocks';
import { TriggerContract } from 'src/plugins/ui_actions/public/triggers';
import { TriggerId } from 'src/plugins/ui_actions/public';
+import { AnomalySwimlaneEmbeddableInput, AnomalySwimlaneServices } from '..';
jest.mock('./swimlane_input_resolver', () => ({
useSwimlaneInputResolver: jest.fn(() => {
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx
index 8ee4e391fcdde..60681446ac7aa 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/embeddable_swim_lane_container.tsx
@@ -10,12 +10,7 @@ import { Observable } from 'rxjs';
import { CoreStart } from 'kibana/public';
import { FormattedMessage } from '@kbn/i18n/react';
-import {
- AnomalySwimlaneEmbeddable,
- AnomalySwimlaneEmbeddableInput,
- AnomalySwimlaneEmbeddableOutput,
- AnomalySwimlaneServices,
-} from './anomaly_swimlane_embeddable';
+import { IAnomalySwimlaneEmbeddable } from './anomaly_swimlane_embeddable';
import { useSwimlaneInputResolver } from './swimlane_input_resolver';
import { SwimlaneType } from '../../application/explorer/explorer_constants';
import {
@@ -24,11 +19,16 @@ import {
} from '../../application/explorer/swimlane_container';
import { AppStateSelectedCells } from '../../application/explorer/explorer_utils';
import { MlDependencies } from '../../application/app';
-import { SWIM_LANE_SELECTION_TRIGGER } from '../../ui_actions/triggers';
+import { SWIM_LANE_SELECTION_TRIGGER } from '../../ui_actions';
+import {
+ AnomalySwimlaneEmbeddableInput,
+ AnomalySwimlaneEmbeddableOutput,
+ AnomalySwimlaneServices,
+} from '..';
export interface ExplorerSwimlaneContainerProps {
id: string;
- embeddableContext: AnomalySwimlaneEmbeddable;
+ embeddableContext: InstanceType;
embeddableInput: Observable;
services: [CoreStart, MlDependencies, AnomalySwimlaneServices];
refresh: Observable;
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/index.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/index.ts
index c0b02960d5144..ba2e1c88b3ea8 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/index.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/index.ts
@@ -5,4 +5,3 @@
*/
export { AnomalySwimlaneEmbeddableFactory } from './anomaly_swimlane_embeddable_factory';
-export { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE } from './anomaly_swimlane_embeddable';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts
index a34955adebf62..258b72067cddd 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.test.ts
@@ -8,12 +8,9 @@ import { renderHook, act } from '@testing-library/react-hooks';
import { processFilters, useSwimlaneInputResolver } from './swimlane_input_resolver';
import { BehaviorSubject, Observable, of, Subject } from 'rxjs';
import { SWIMLANE_TYPE } from '../../application/explorer/explorer_constants';
-import {
- AnomalySwimlaneEmbeddableInput,
- AnomalySwimlaneServices,
-} from './anomaly_swimlane_embeddable';
import { CoreStart, IUiSettingsClient } from 'kibana/public';
import { MlStartDependencies } from '../../plugin';
+import { AnomalySwimlaneEmbeddableInput, AnomalySwimlaneServices } from '..';
describe('useSwimlaneInputResolver', () => {
let embeddableInput: BehaviorSubject>;
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
index f17c779a00252..6ddb1e954e57b 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
@@ -20,11 +20,6 @@ import {
} from 'rxjs/operators';
import { CoreStart } from 'kibana/public';
import { TimeBuckets } from '../../application/util/time_buckets';
-import {
- AnomalySwimlaneEmbeddableInput,
- AnomalySwimlaneEmbeddableOutput,
- AnomalySwimlaneServices,
-} from './anomaly_swimlane_embeddable';
import { MlStartDependencies } from '../../plugin';
import {
ANOMALY_SWIM_LANE_HARD_LIMIT,
@@ -41,6 +36,11 @@ import { AnomalyDetectorService } from '../../application/services/anomaly_detec
import { isViewBySwimLaneData } from '../../application/explorer/swimlane_container';
import { ViewMode } from '../../../../../../src/plugins/embeddable/public';
import { CONTROLLED_BY_SWIM_LANE_FILTER } from '../../ui_actions/apply_influencer_filters_action';
+import {
+ AnomalySwimlaneEmbeddableInput,
+ AnomalySwimlaneEmbeddableOutput,
+ AnomalySwimlaneServices,
+} from '..';
const FETCH_RESULTS_DEBOUNCE_MS = 500;
diff --git a/x-pack/plugins/ml/public/embeddables/constants.ts b/x-pack/plugins/ml/public/embeddables/constants.ts
new file mode 100644
index 0000000000000..054cb8ba4b0bc
--- /dev/null
+++ b/x-pack/plugins/ml/public/embeddables/constants.ts
@@ -0,0 +1,7 @@
+/*
+ * 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 const ANOMALY_SWIMLANE_EMBEDDABLE_TYPE = 'ml_anomaly_swimlane';
diff --git a/x-pack/plugins/ml/public/embeddables/index.ts b/x-pack/plugins/ml/public/embeddables/index.ts
index db9f094d5721e..cc4bec0b67836 100644
--- a/x-pack/plugins/ml/public/embeddables/index.ts
+++ b/x-pack/plugins/ml/public/embeddables/index.ts
@@ -8,6 +8,9 @@ import { AnomalySwimlaneEmbeddableFactory } from './anomaly_swimlane';
import { MlCoreSetup } from '../plugin';
import { EmbeddableSetup } from '../../../../../src/plugins/embeddable/public';
+export * from './constants';
+export * from './types';
+
export function registerEmbeddables(embeddable: EmbeddableSetup, core: MlCoreSetup) {
const anomalySwimlaneEmbeddableFactory = new AnomalySwimlaneEmbeddableFactory(
core.getStartServices
diff --git a/x-pack/plugins/ml/public/embeddables/types.ts b/x-pack/plugins/ml/public/embeddables/types.ts
new file mode 100644
index 0000000000000..93ec79d9b8310
--- /dev/null
+++ b/x-pack/plugins/ml/public/embeddables/types.ts
@@ -0,0 +1,66 @@
+/*
+ * 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 { CoreStart } from 'kibana/public';
+import { JobId } from '../../common/types/anomaly_detection_jobs';
+import { SwimlaneType } from '../application/explorer/explorer_constants';
+import { Filter } from '../../../../../src/plugins/data/common/es_query/filters';
+import { Query, RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common/query';
+import {
+ EmbeddableInput,
+ EmbeddableOutput,
+ IEmbeddable,
+} from '../../../../../src/plugins/embeddable/public';
+import { AnomalyDetectorService } from '../application/services/anomaly_detector_service';
+import { AnomalyTimelineService } from '../application/services/anomaly_timeline_service';
+import { MlDependencies } from '../application/app';
+import { AppStateSelectedCells } from '../application/explorer/explorer_utils';
+
+export interface AnomalySwimlaneEmbeddableCustomInput {
+ jobIds: JobId[];
+ swimlaneType: SwimlaneType;
+ viewBy?: string;
+ perPage?: number;
+
+ // Embeddable inputs which are not included in the default interface
+ filters: Filter[];
+ query: Query;
+ refreshConfig: RefreshInterval;
+ timeRange: TimeRange;
+}
+
+export type AnomalySwimlaneEmbeddableInput = EmbeddableInput & AnomalySwimlaneEmbeddableCustomInput;
+
+export interface AnomalySwimlaneServices {
+ anomalyDetectorService: AnomalyDetectorService;
+ anomalyTimelineService: AnomalyTimelineService;
+}
+
+export type AnomalySwimlaneEmbeddableServices = [
+ CoreStart,
+ MlDependencies,
+ AnomalySwimlaneServices
+];
+
+export interface AnomalySwimlaneEmbeddableCustomOutput {
+ perPage?: number;
+ fromPage?: number;
+ interval?: number;
+}
+
+export type AnomalySwimlaneEmbeddableOutput = EmbeddableOutput &
+ AnomalySwimlaneEmbeddableCustomOutput;
+
+export interface EditSwimlanePanelContext {
+ embeddable: IEmbeddable;
+}
+
+export interface SwimLaneDrilldownContext extends EditSwimlanePanelContext {
+ /**
+ * Optional data provided by swim lane selection
+ */
+ data?: AppStateSelectedCells;
+}
diff --git a/x-pack/plugins/ml/public/index.scss b/x-pack/plugins/ml/public/index.scss
deleted file mode 100644
index 9bd47b6473372..0000000000000
--- a/x-pack/plugins/ml/public/index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './application/index';
diff --git a/x-pack/plugins/ml/public/index.ts b/x-pack/plugins/ml/public/index.ts
index 5a956651c86d8..80308977735d2 100755
--- a/x-pack/plugins/ml/public/index.ts
+++ b/x-pack/plugins/ml/public/index.ts
@@ -5,7 +5,6 @@
*/
import { PluginInitializer, PluginInitializerContext } from 'kibana/public';
-import './index.scss';
import {
MlPlugin,
MlPluginSetup,
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index a8e1e804c2fe3..aa6163379f9c0 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -6,36 +6,35 @@
import { i18n } from '@kbn/i18n';
import {
- Plugin,
- CoreStart,
- CoreSetup,
AppMountParameters,
+ CoreSetup,
+ CoreStart,
+ Plugin,
PluginInitializerContext,
} from 'kibana/public';
import { BehaviorSubject } from 'rxjs';
import { take } from 'rxjs/operators';
import { ManagementSetup } from 'src/plugins/management/public';
-import { SharePluginSetup, SharePluginStart, UrlGeneratorState } from 'src/plugins/share/public';
+import { SharePluginSetup, SharePluginStart } from 'src/plugins/share/public';
import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
import { DataPublicPluginStart } from 'src/plugins/data/public';
import { HomePublicPluginSetup } from 'src/plugins/home/public';
import { EmbeddableSetup } from 'src/plugins/embeddable/public';
-import { AppStatus, AppUpdater } from '../../../../src/core/public';
+import { AppStatus, AppUpdater, DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
import { SecurityPluginSetup } from '../../security/public';
import { LicensingPluginSetup } from '../../licensing/public';
import { registerManagementSection } from './application/management';
import { LicenseManagementUIPluginSetup } from '../../license_management/public';
import { setDependencyCache } from './application/util/dependency_cache';
-import { PLUGIN_ID, PLUGIN_ICON } from '../common/constants/app';
+import { PLUGIN_ICON, PLUGIN_ID } from '../common/constants/app';
import { registerFeature } from './register_feature';
-import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
-import { registerEmbeddables } from './embeddables';
import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
import { registerMlUiActions } from './ui_actions';
import { KibanaLegacyStart } from '../../../../src/plugins/kibana_legacy/public';
-import { registerUrlGenerator, MlUrlGeneratorState, ML_APP_URL_GENERATOR } from './url_generator';
-import { isMlEnabled, isFullLicense } from '../common/license';
+import { registerUrlGenerator } from './url_generator';
+import { isFullLicense, isMlEnabled } from '../common/license';
+import { registerEmbeddables } from './embeddables';
export interface MlStartDependencies {
data: DataPublicPluginStart;
@@ -56,12 +55,6 @@ export interface MlSetupDependencies {
share: SharePluginSetup;
}
-declare module '../../../../src/plugins/share/public' {
- export interface UrlGeneratorStateMapping {
- [ML_APP_URL_GENERATOR]: UrlGeneratorState;
- }
-}
-
export type MlCoreSetup = CoreSetup;
export class MlPlugin implements Plugin {
diff --git a/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx b/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx
index 3af39993d39fd..9e50410751c37 100644
--- a/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/apply_influencer_filters_action.tsx
@@ -6,13 +6,10 @@
import { i18n } from '@kbn/i18n';
import { ActionContextMapping, createAction } from '../../../../../src/plugins/ui_actions/public';
-import {
- AnomalySwimlaneEmbeddable,
- SwimLaneDrilldownContext,
-} from '../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
import { MlCoreSetup } from '../plugin';
import { SWIMLANE_TYPE, VIEW_BY_JOB_LABEL } from '../application/explorer/explorer_constants';
import { Filter, FilterStateStore } from '../../../../../src/plugins/data/common';
+import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, SwimLaneDrilldownContext } from '../embeddables';
export const APPLY_INFLUENCER_FILTERS_ACTION = 'applyInfluencerFiltersAction';
@@ -73,7 +70,7 @@ export function createApplyInfluencerFiltersAction(
async isCompatible({ embeddable, data }: SwimLaneDrilldownContext) {
// Only compatible with view by influencer swim lanes and single selection
return (
- embeddable instanceof AnomalySwimlaneEmbeddable &&
+ embeddable.type === ANOMALY_SWIMLANE_EMBEDDABLE_TYPE &&
data !== undefined &&
data.type === SWIMLANE_TYPE.VIEW_BY &&
data.viewByFieldName !== VIEW_BY_JOB_LABEL &&
diff --git a/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx b/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx
index ec59ba20acf98..325e903de0e2d 100644
--- a/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/apply_time_range_action.tsx
@@ -7,11 +7,8 @@
import { i18n } from '@kbn/i18n';
import moment from 'moment';
import { ActionContextMapping, createAction } from '../../../../../src/plugins/ui_actions/public';
-import {
- AnomalySwimlaneEmbeddable,
- SwimLaneDrilldownContext,
-} from '../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
import { MlCoreSetup } from '../plugin';
+import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, SwimLaneDrilldownContext } from '../embeddables';
export const APPLY_TIME_RANGE_SELECTION_ACTION = 'applyTimeRangeSelectionAction';
@@ -52,7 +49,7 @@ export function createApplyTimeRangeSelectionAction(
});
},
async isCompatible({ embeddable, data }: SwimLaneDrilldownContext) {
- return embeddable instanceof AnomalySwimlaneEmbeddable && data !== undefined;
+ return embeddable.type === ANOMALY_SWIMLANE_EMBEDDABLE_TYPE && data !== undefined;
},
});
}
diff --git a/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx b/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx
index cfd90f92e3238..c40d1e175ec77 100644
--- a/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/edit_swimlane_panel_action.tsx
@@ -6,13 +6,9 @@
import { i18n } from '@kbn/i18n';
import { ActionContextMapping, createAction } from '../../../../../src/plugins/ui_actions/public';
-import {
- AnomalySwimlaneEmbeddable,
- EditSwimlanePanelContext,
-} from '../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
-import { resolveAnomalySwimlaneUserInput } from '../embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout';
import { ViewMode } from '../../../../../src/plugins/embeddable/public';
import { MlCoreSetup } from '../plugin';
+import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, EditSwimlanePanelContext } from '../embeddables';
export const EDIT_SWIMLANE_PANEL_ACTION = 'editSwimlanePanelAction';
@@ -27,7 +23,7 @@ export function createEditSwimlanePanelAction(getStartServices: MlCoreSetup['get
i18n.translate('xpack.ml.actions.editSwimlaneTitle', {
defaultMessage: 'Edit swim lane',
}),
- execute: async ({ embeddable }: EditSwimlanePanelContext) => {
+ async execute({ embeddable }: EditSwimlanePanelContext) {
if (!embeddable) {
throw new Error('Not possible to execute an action without the embeddable context');
}
@@ -35,15 +31,19 @@ export function createEditSwimlanePanelAction(getStartServices: MlCoreSetup['get
const [coreStart] = await getStartServices();
try {
+ const { resolveAnomalySwimlaneUserInput } = await import(
+ '../embeddables/anomaly_swimlane/anomaly_swimlane_setup_flyout'
+ );
+
const result = await resolveAnomalySwimlaneUserInput(coreStart, embeddable.getInput());
embeddable.updateInput(result);
} catch (e) {
return Promise.reject();
}
},
- isCompatible: async ({ embeddable }: EditSwimlanePanelContext) => {
+ async isCompatible({ embeddable }: EditSwimlanePanelContext) {
return (
- embeddable instanceof AnomalySwimlaneEmbeddable &&
+ embeddable.type === ANOMALY_SWIMLANE_EMBEDDABLE_TYPE &&
embeddable.getInput().viewMode === ViewMode.EDIT
);
},
diff --git a/x-pack/plugins/ml/public/ui_actions/index.ts b/x-pack/plugins/ml/public/ui_actions/index.ts
index b7262a330b310..437a38acf6f8b 100644
--- a/x-pack/plugins/ml/public/ui_actions/index.ts
+++ b/x-pack/plugins/ml/public/ui_actions/index.ts
@@ -13,7 +13,6 @@ import {
createOpenInExplorerAction,
OPEN_IN_ANOMALY_EXPLORER_ACTION,
} from './open_in_anomaly_explorer_action';
-import { EditSwimlanePanelContext } from '../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
import { UiActionsSetup } from '../../../../../src/plugins/ui_actions/public';
import { MlPluginStart, MlStartDependencies } from '../plugin';
import { CONTEXT_MENU_TRIGGER } from '../../../../../src/plugins/embeddable/public';
@@ -22,11 +21,18 @@ import {
createApplyInfluencerFiltersAction,
} from './apply_influencer_filters_action';
import { SWIM_LANE_SELECTION_TRIGGER, swimLaneSelectionTrigger } from './triggers';
-import { SwimLaneDrilldownContext } from '../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
import {
APPLY_TIME_RANGE_SELECTION_ACTION,
createApplyTimeRangeSelectionAction,
} from './apply_time_range_action';
+import { EditSwimlanePanelContext, SwimLaneDrilldownContext } from '../embeddables';
+
+export { APPLY_TIME_RANGE_SELECTION_ACTION } from './apply_time_range_action';
+export { EDIT_SWIMLANE_PANEL_ACTION } from './edit_swimlane_panel_action';
+export { APPLY_INFLUENCER_FILTERS_ACTION } from './apply_influencer_filters_action';
+export { OPEN_IN_ANOMALY_EXPLORER_ACTION } from './open_in_anomaly_explorer_action';
+
+export { SWIM_LANE_SELECTION_TRIGGER } from './triggers';
/**
* Register ML UI actions
diff --git a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
index 211840467e38c..e18f593145f9c 100644
--- a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
@@ -6,12 +6,9 @@
import { i18n } from '@kbn/i18n';
import { ActionContextMapping, createAction } from '../../../../../src/plugins/ui_actions/public';
-import {
- AnomalySwimlaneEmbeddable,
- SwimLaneDrilldownContext,
-} from '../embeddables/anomaly_swimlane/anomaly_swimlane_embeddable';
import { MlCoreSetup } from '../plugin';
import { ML_APP_URL_GENERATOR } from '../url_generator';
+import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, SwimLaneDrilldownContext } from '../embeddables';
export const OPEN_IN_ANOMALY_EXPLORER_ACTION = 'openInAnomalyExplorerAction';
@@ -60,7 +57,7 @@ export function createOpenInExplorerAction(getStartServices: MlCoreSetup['getSta
await application.navigateToUrl(anomalyExplorerUrl!);
},
async isCompatible({ embeddable }: SwimLaneDrilldownContext) {
- return embeddable instanceof AnomalySwimlaneEmbeddable;
+ return embeddable.type === ANOMALY_SWIMLANE_EMBEDDABLE_TYPE;
},
});
}
diff --git a/x-pack/plugins/ml/public/url_generator.ts b/x-pack/plugins/ml/public/url_generator.ts
index b7cf64159a827..4e08c57c0b2e0 100644
--- a/x-pack/plugins/ml/public/url_generator.ts
+++ b/x-pack/plugins/ml/public/url_generator.ts
@@ -5,13 +5,23 @@
*/
import { CoreSetup } from 'kibana/public';
-import { SharePluginSetup, UrlGeneratorsDefinition } from '../../../../src/plugins/share/public';
+import {
+ SharePluginSetup,
+ UrlGeneratorsDefinition,
+ UrlGeneratorState,
+} from '../../../../src/plugins/share/public';
import { TimeRange } from '../../../../src/plugins/data/public';
import { setStateToKbnUrl } from '../../../../src/plugins/kibana_utils/public';
import { JobId } from '../../reporting/common/types';
import { ExplorerAppState } from './application/explorer/explorer_dashboard_service';
import { MlStartDependencies } from './plugin';
+declare module '../../../../src/plugins/share/public' {
+ export interface UrlGeneratorStateMapping {
+ [ML_APP_URL_GENERATOR]: UrlGeneratorState;
+ }
+}
+
export const ML_APP_URL_GENERATOR = 'ML_APP_URL_GENERATOR';
export interface ExplorerUrlState {
diff --git a/x-pack/plugins/monitoring/public/alerts/panel.tsx b/x-pack/plugins/monitoring/public/alerts/panel.tsx
index 91a426cc8798e..91604acf115fa 100644
--- a/x-pack/plugins/monitoring/public/alerts/panel.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/panel.tsx
@@ -23,7 +23,6 @@ import { AlertMessage } from '../../server/alerts/types';
import { Legacy } from '../legacy_shims';
import { replaceTokens } from './lib/replace_tokens';
import { AlertsContextProvider } from '../../../triggers_actions_ui/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { AlertEdit } from '../../../triggers_actions_ui/public';
import { isInSetupMode, hideBottomBar, showBottomBar } from '../lib/setup_mode';
import { BASE_ALERT_API_PATH } from '../../../alerts/common';
diff --git a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
index b99093a3d8ad1..3425e0ee2a818 100644
--- a/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
+++ b/x-pack/plugins/monitoring/public/lib/setup_mode.tsx
@@ -110,7 +110,7 @@ export const updateSetupModeData = async (uuid?: string, fetchWithoutClusterUuid
text,
});
});
- return toggleSetupMode(false); // eslint-disable-line no-use-before-define
+ return toggleSetupMode(false);
}
notifySetupModeDataChange();
@@ -160,7 +160,7 @@ export const toggleSetupMode = (inSetupMode: boolean) => {
setupModeState.enabled = inSetupMode;
globalState.inSetupMode = inSetupMode;
globalState.save();
- setSetupModeMenuItem(); // eslint-disable-line no-use-before-define
+ setSetupModeMenuItem();
notifySetupModeDataChange();
if (inSetupMode) {
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
index 45df56b2139ff..e87c8398ad0b0 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
@@ -104,9 +104,11 @@ export function getUsageStats(rawStats: SearchResponse) {
dashboard,
visualization,
search,
+ /* eslint-disable @typescript-eslint/naming-convention */
index_pattern,
graph_workspace,
timelion_sheet,
+ /* eslint-enable @typescript-eslint/naming-convention */
xpack,
...pluginsTop
} = currUsage;
diff --git a/x-pack/plugins/observability/public/data_handler.ts b/x-pack/plugins/observability/public/data_handler.ts
index 834d7a52d767f..b0bdcf17b9066 100644
--- a/x-pack/plugins/observability/public/data_handler.ts
+++ b/x-pack/plugins/observability/public/data_handler.ts
@@ -40,7 +40,6 @@ export async function fetchHasData(): Promise>
return result.value;
}
- // eslint-disable-next-line no-console
console.error('Error while fetching has data', result.reason);
return false;
});
diff --git a/x-pack/plugins/observability/public/hooks/use_route_params.tsx b/x-pack/plugins/observability/public/hooks/use_route_params.tsx
index 93a79bfda7fc1..1b32933eec3e6 100644
--- a/x-pack/plugins/observability/public/hooks/use_route_params.tsx
+++ b/x-pack/plugins/observability/public/hooks/use_route_params.tsx
@@ -36,12 +36,10 @@ export function useRouteParams(params: Params) {
const queryResult = rts.queryRt.decode(queryParams);
const pathResult = rts.pathRt.decode(pathParams);
if (isLeft(queryResult)) {
- // eslint-disable-next-line no-console
console.error(PathReporter.report(queryResult)[0]);
}
if (isLeft(pathResult)) {
- // eslint-disable-next-line no-console
console.error(PathReporter.report(pathResult)[0]);
}
diff --git a/x-pack/plugins/observability/public/services/get_news_feed.ts b/x-pack/plugins/observability/public/services/get_news_feed.ts
index 3a6e60fa74188..af8d062154e2d 100644
--- a/x-pack/plugins/observability/public/services/get_news_feed.ts
+++ b/x-pack/plugins/observability/public/services/get_news_feed.ts
@@ -20,7 +20,6 @@ export async function getNewsFeed({ core }: { core: AppMountContext['core'] }):
try {
return await core.http.get('https://feeds.elastic.co/observability-solution/v8.0.0.json');
} catch (e) {
- // eslint-disable-next-line no-console
console.error('Error while fetching news feed', e);
return { items: [] };
}
diff --git a/x-pack/plugins/observability/public/services/get_observability_alerts.ts b/x-pack/plugins/observability/public/services/get_observability_alerts.ts
index fe5451597688a..cff6726e47df9 100644
--- a/x-pack/plugins/observability/public/services/get_observability_alerts.ts
+++ b/x-pack/plugins/observability/public/services/get_observability_alerts.ts
@@ -11,19 +11,15 @@ const allowedConsumers = ['apm', 'uptime', 'logs', 'metrics', 'alerts'];
export async function getObservabilityAlerts({ core }: { core: AppMountContext['core'] }) {
try {
- const { data = [] }: { data: Alert[] } = await core.http.get(
- core.http.basePath.prepend('/api/alerts/_find'),
- {
- query: {
- page: 1,
- per_page: 20,
- },
- }
- );
+ const { data = [] }: { data: Alert[] } = await core.http.get('/api/alerts/_find', {
+ query: {
+ page: 1,
+ per_page: 20,
+ },
+ });
return data.filter(({ consumer }) => allowedConsumers.includes(consumer));
} catch (e) {
- // eslint-disable-next-line no-console
console.error('Error while fetching alerts', e);
return [];
}
diff --git a/x-pack/plugins/oss_telemetry/server/test_utils/index.ts b/x-pack/plugins/oss_telemetry/server/test_utils/index.ts
index 3eee1978d4f1c..9201899d5a161 100644
--- a/x-pack/plugins/oss_telemetry/server/test_utils/index.ts
+++ b/x-pack/plugins/oss_telemetry/server/test_utils/index.ts
@@ -13,7 +13,6 @@ import {
ConcreteTaskInstance,
TaskStatus,
TaskManagerStartContract,
- // eslint-disable-next-line @kbn/eslint/no-restricted-paths
} from '../../../task_manager/server';
export const getMockTaskInstance = (
diff --git a/x-pack/plugins/painless_lab/public/application/components/main_controls.tsx b/x-pack/plugins/painless_lab/public/application/components/main_controls.tsx
index 7018cfd27c509..4d44ae0176103 100644
--- a/x-pack/plugins/painless_lab/public/application/components/main_controls.tsx
+++ b/x-pack/plugins/painless_lab/public/application/components/main_controls.tsx
@@ -93,6 +93,7 @@ export function MainControls({
let classes = '';
if (isNavLegacy) {
classes = classNames('painlessLab__bottomBar', {
+ // eslint-disable-next-line @typescript-eslint/naming-convention
'painlessLab__bottomBar-isNavDrawerLocked': isNavDrawerLocked,
});
}
diff --git a/x-pack/plugins/painless_lab/public/links.ts b/x-pack/plugins/painless_lab/public/links.ts
index 8f610140c3f34..c3a6ab5fafabf 100644
--- a/x-pack/plugins/painless_lab/public/links.ts
+++ b/x-pack/plugins/painless_lab/public/links.ts
@@ -8,6 +8,7 @@ import { DocLinksStart } from 'src/core/public';
export type Links = ReturnType;
+// eslint-disable-next-line @typescript-eslint/naming-convention
export const getLinks = ({ DOC_LINK_VERSION, ELASTIC_WEBSITE_URL }: DocLinksStart) =>
Object.freeze({
painlessExecuteAPI: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/painless/${DOC_LINK_VERSION}/painless-execute-api.html`,
diff --git a/x-pack/plugins/reporting/public/lib/job_completion_notifications.ts b/x-pack/plugins/reporting/public/lib/job_completion_notifications.ts
index 99f3773856325..06694361b757d 100644
--- a/x-pack/plugins/reporting/public/lib/job_completion_notifications.ts
+++ b/x-pack/plugins/reporting/public/lib/job_completion_notifications.ts
@@ -6,7 +6,7 @@
import { JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY } from '../../constants';
-type jobId = string;
+type JobId = string;
const set = (jobs: any) => {
sessionStorage.setItem(JOB_COMPLETION_NOTIFICATIONS_SESSION_KEY, JSON.stringify(jobs));
@@ -17,13 +17,13 @@ const getAll = () => {
return sessionValue ? JSON.parse(sessionValue) : [];
};
-export const add = (jobId: jobId) => {
+export const add = (jobId: JobId) => {
const jobs = getAll();
jobs.push(jobId);
set(jobs);
};
-export const remove = (jobId: jobId) => {
+export const remove = (jobId: JobId) => {
const jobs = getAll();
const index = jobs.indexOf(jobId);
diff --git a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
index f07235742a1d3..b97a56c15fb4d 100644
--- a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
+++ b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.test.ts
@@ -9,7 +9,7 @@ import { first } from 'rxjs/operators';
import { LicensingPluginSetup } from '../../../licensing/public';
import { GetCsvReportPanelAction } from './get_csv_panel_action';
-type licenseResults = 'valid' | 'invalid' | 'unavailable' | 'expired';
+type LicenseResults = 'valid' | 'invalid' | 'unavailable' | 'expired';
describe('GetCsvReportPanelAction', () => {
let core: any;
@@ -27,7 +27,7 @@ describe('GetCsvReportPanelAction', () => {
});
beforeEach(() => {
- mockLicense$ = (state: licenseResults = 'valid') => {
+ mockLicense$ = (state: LicenseResults = 'valid') => {
return (of({
check: jest.fn().mockImplementation(() => ({ state })),
}) as unknown) as LicensingPluginSetup['license$'];
diff --git a/x-pack/plugins/reporting/server/export_types/common/validate_urls.test.ts b/x-pack/plugins/reporting/server/export_types/common/validate_urls.test.ts
index 5e576e13c0227..5464f3d6dd505 100644
--- a/x-pack/plugins/reporting/server/export_types/common/validate_urls.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/common/validate_urls.test.ts
@@ -35,6 +35,7 @@ describe('Validate URLS', () => {
});
it(`throws for JS URLs`, () => {
+ // eslint-disable-next-line no-script-url
expect(() => validateUrls(['javascript:alert(document.cookies)'])).toThrow();
});
diff --git a/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts b/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts
index 0ad41cd904853..b25e8fab3abcf 100644
--- a/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts
+++ b/x-pack/plugins/reporting/server/lib/screenshots/observable.test.ts
@@ -16,7 +16,6 @@ jest.mock('../../browsers/chromium/puppeteer', () => ({
}));
import * as Rx from 'rxjs';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { loggingSystemMock } from '../../../../../../src/core/server/mocks';
import { HeadlessChromiumDriver } from '../../browsers';
import { LevelLogger } from '../';
diff --git a/x-pack/plugins/reporting/server/routes/generation.test.ts b/x-pack/plugins/reporting/server/routes/generation.test.ts
index c73c443d2390b..87a696948ad84 100644
--- a/x-pack/plugins/reporting/server/routes/generation.test.ts
+++ b/x-pack/plugins/reporting/server/routes/generation.test.ts
@@ -15,12 +15,12 @@ import { createMockReportingCore } from '../test_helpers';
import { createMockLevelLogger } from '../test_helpers/create_mock_levellogger';
import { registerJobGenerationRoutes } from './generation';
-type setupServerReturn = UnwrapPromise>;
+type SetupServerReturn = UnwrapPromise