[ML] Fix analytics starting state. (#48373)

walterra · web-flow · commit c7abd93c0111 · 2019-10-16T07:27:28.000-07:00
- Fixes the missing starting state for analytics jobs.
- Fixes checks if a analytics job is running, for example fixes an issue where the Delete-button was available for a running job in the analytics job list.
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/action_delete.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/action_delete.tsx
@@ -21,17 +21,14 @@ import {
   createPermissionFailureMessage,
 } from '../../../../../privilege/check_privilege';
 
-import { DataFrameAnalyticsListRow, DATA_FRAME_TASK_STATE } from './common';
+import { isDataFrameAnalyticsRunning, DataFrameAnalyticsListRow } from './common';
 
 interface DeleteActionProps {
   item: DataFrameAnalyticsListRow;
 }
 
 export const DeleteAction: FC<DeleteActionProps> = ({ item }) => {
-  const disabled =
-    item.stats.state === DATA_FRAME_TASK_STATE.STARTED ||
-    item.stats.state === DATA_FRAME_TASK_STATE.ANALYZING ||
-    item.stats.state === DATA_FRAME_TASK_STATE.REINDEXING;
+  const disabled = isDataFrameAnalyticsRunning(item.stats.state);
 
   const canDeleteDataFrameAnalytics: boolean = checkPermission('canDeleteDataFrameAnalytics');
 
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/actions.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/actions.tsx
@@ -56,7 +56,7 @@ export const getActions = () => {
     AnalyticsViewAction,
     {
       render: (item: DataFrameAnalyticsListRow) => {
-        if (!isDataFrameAnalyticsRunning(item.stats)) {
+        if (!isDataFrameAnalyticsRunning(item.stats.state)) {
           return <StartAction item={item} />;
         }
 
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
@@ -8,12 +8,7 @@ import React, { Fragment, FC, useState } from 'react';
 
 import { i18n } from '@kbn/i18n';
 
-import {
-  // EuiBadge,
-  EuiButtonEmpty,
-  EuiCallOut,
-  EuiEmptyPrompt,
-} from '@elastic/eui';
+import { EuiButtonEmpty, EuiCallOut, EuiEmptyPrompt } from '@elastic/eui';
 
 import { DataFrameAnalyticsId, useRefreshAnalyticsList } from '../../../../common';
 import { checkPermission } from '../../../../../privilege/check_privilege';
@@ -24,7 +19,6 @@ import {
   DataFrameAnalyticsListRow,
   ItemIdToExpandedRowMap,
   DATA_FRAME_TASK_STATE,
-  // DATA_FRAME_MODE,
   Query,
   Clause,
 } from './common';
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/columns.tsx b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/columns.tsx
@@ -20,10 +20,12 @@ import {
 import { getAnalysisType, DataFrameAnalyticsId } from '../../../../common';
 import {
   getDataFrameAnalyticsProgress,
+  isDataFrameAnalyticsFailed,
+  isDataFrameAnalyticsRunning,
+  isDataFrameAnalyticsStopped,
   DataFrameAnalyticsListColumn,
   DataFrameAnalyticsListRow,
   DataFrameAnalyticsStats,
-  DATA_FRAME_TASK_STATE,
 } from './common';
 import { getActions } from './actions';
 
@@ -32,6 +34,7 @@ enum TASK_STATE_COLOR {
   failed = 'danger',
   reindexing = 'primary',
   started = 'primary',
+  starting = 'primary',
   stopped = 'hollow',
 }
 
@@ -41,7 +44,7 @@ export const getTaskStateBadge = (
 ) => {
   const color = TASK_STATE_COLOR[state];
 
-  if (state === DATA_FRAME_TASK_STATE.FAILED && reason !== undefined) {
+  if (isDataFrameAnalyticsFailed(state) && reason !== undefined) {
     return (
       <EuiToolTip content={reason}>
         <EuiBadge className="mlTaskStateBadge" color={color}>
@@ -91,10 +94,10 @@ export const progressColumn = {
         {!isBatchTransform && (
           <Fragment>
             <EuiFlexItem style={{ width: '40px' }} grow={false}>
-              {item.stats.state === DATA_FRAME_TASK_STATE.STARTED && (
+              {isDataFrameAnalyticsRunning(item.stats.state) && (
                 <EuiProgress color="primary" size="m" />
               )}
-              {item.stats.state === DATA_FRAME_TASK_STATE.STOPPED && (
+              {isDataFrameAnalyticsStopped(item.stats.state) && (
                 <EuiProgress value={0} max={100} color="primary" size="m" />
               )}
             </EuiFlexItem>
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/common.test.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/common.test.ts
@@ -11,10 +11,12 @@ import {
   isCompletedAnalyticsJob,
   isDataFrameAnalyticsRunning,
   isDataFrameAnalyticsStats,
+  DataFrameAnalyticsStats,
+  DATA_FRAME_TASK_STATE,
 } from './common';
 
-const completedJob = StatsMock.data_frame_analytics[0];
-const runningJob = StatsMock.data_frame_analytics[1];
+const completedJob = StatsMock.data_frame_analytics[0] as DataFrameAnalyticsStats;
+const runningJob = StatsMock.data_frame_analytics[1] as DataFrameAnalyticsStats;
 
 describe('Data Frame Analytics: common utils', () => {
   test('isCompletedAnalyticsJob()', () => {
@@ -23,8 +25,16 @@ describe('Data Frame Analytics: common utils', () => {
   });
 
   test('isDataFrameAnalyticsRunning()', () => {
-    expect(isDataFrameAnalyticsRunning(completedJob)).toBe(false);
-    expect(isDataFrameAnalyticsRunning(runningJob)).toBe(true);
+    expect(isDataFrameAnalyticsRunning(completedJob.state)).toBe(false);
+    expect(isDataFrameAnalyticsRunning(runningJob.state)).toBe(true);
+    runningJob.state = DATA_FRAME_TASK_STATE.STARTED;
+    expect(isDataFrameAnalyticsRunning(runningJob.state)).toBe(true);
+    runningJob.state = DATA_FRAME_TASK_STATE.STARTING;
+    expect(isDataFrameAnalyticsRunning(runningJob.state)).toBe(true);
+    runningJob.state = DATA_FRAME_TASK_STATE.REINDEXING;
+    expect(isDataFrameAnalyticsRunning(runningJob.state)).toBe(true);
+    runningJob.state = DATA_FRAME_TASK_STATE.FAILED;
+    expect(isDataFrameAnalyticsRunning(runningJob.state)).toBe(false);
   });
 
   test('isDataFrameAnalyticsStats()', () => {
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
@@ -12,6 +12,7 @@ export enum DATA_FRAME_TASK_STATE {
   FAILED = 'failed',
   REINDEXING = 'reindexing',
   STARTED = 'started',
+  STARTING = 'starting',
   STOPPED = 'stopped',
 }
 
@@ -54,14 +55,23 @@ export interface DataFrameAnalyticsStats {
   state: DATA_FRAME_TASK_STATE;
 }
 
-export function isDataFrameAnalyticsRunning(stats: DataFrameAnalyticsStats) {
+export function isDataFrameAnalyticsFailed(state: DATA_FRAME_TASK_STATE) {
+  return state === DATA_FRAME_TASK_STATE.FAILED;
+}
+
+export function isDataFrameAnalyticsRunning(state: DATA_FRAME_TASK_STATE) {
   return (
-    stats.state === DATA_FRAME_TASK_STATE.ANALYZING ||
-    stats.state === DATA_FRAME_TASK_STATE.STARTED ||
-    stats.state === DATA_FRAME_TASK_STATE.REINDEXING
+    state === DATA_FRAME_TASK_STATE.ANALYZING ||
+    state === DATA_FRAME_TASK_STATE.REINDEXING ||
+    state === DATA_FRAME_TASK_STATE.STARTED ||
+    state === DATA_FRAME_TASK_STATE.STARTING
   );
 }
 
+export function isDataFrameAnalyticsStopped(state: DATA_FRAME_TASK_STATE) {
+  return state === DATA_FRAME_TASK_STATE.STOPPED;
+}
+
 export function isDataFrameAnalyticsStats(arg: any): arg is DataFrameAnalyticsStats {
   return (
     typeof arg === 'object' &&
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts
@@ -11,18 +11,14 @@ import { ml } from '../../../../../services/ml_api_service';
 import { refreshAnalyticsList$, REFRESH_ANALYTICS_LIST_STATE } from '../../../../common';
 
 import {
-  DATA_FRAME_TASK_STATE,
+  isDataFrameAnalyticsFailed,
   DataFrameAnalyticsListRow,
 } from '../../components/analytics_list/common';
 
 export const deleteAnalytics = async (d: DataFrameAnalyticsListRow) => {
   try {
-    if (d.stats.state === DATA_FRAME_TASK_STATE.FAILED) {
-      await ml.dataFrameAnalytics.stopDataFrameAnalytics(
-        d.config.id,
-        d.stats.state === DATA_FRAME_TASK_STATE.FAILED,
-        true
-      );
+    if (isDataFrameAnalyticsFailed(d.stats.state)) {
+      await ml.dataFrameAnalytics.stopDataFrameAnalytics(d.config.id, true, true);
     }
     await ml.dataFrameAnalytics.deleteDataFrameAnalytics(d.config.id);
     toastNotifications.addSuccess(
diff --git a/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/services/analytics_service/stop_analytics.ts b/x-pack/legacy/plugins/ml/public/data_frame_analytics/pages/analytics_management/services/analytics_service/stop_analytics.ts
@@ -11,15 +11,15 @@ import { ml } from '../../../../../services/ml_api_service';
 import { refreshAnalyticsList$, REFRESH_ANALYTICS_LIST_STATE } from '../../../../common';
 
 import {
-  DATA_FRAME_TASK_STATE,
+  isDataFrameAnalyticsFailed,
   DataFrameAnalyticsListRow,
 } from '../../components/analytics_list/common';
 
 export const stopAnalytics = async (d: DataFrameAnalyticsListRow) => {
   try {
     await ml.dataFrameAnalytics.stopDataFrameAnalytics(
       d.config.id,
-      d.stats.state === DATA_FRAME_TASK_STATE.FAILED,
+      isDataFrameAnalyticsFailed(d.stats.state),
       true
     );
     toastNotifications.addSuccess(
diff --git a/x-pack/legacy/plugins/ml/public/overview/components/analytics_panel/analytics_stats_bar.tsx b/x-pack/legacy/plugins/ml/public/overview/components/analytics_panel/analytics_stats_bar.tsx
@@ -8,8 +8,10 @@ import React, { FC } from 'react';
 import { i18n } from '@kbn/i18n';
 import { StatsBar, AnalyticStatsBarStats } from '../../../components/stats_bar';
 import {
+  isDataFrameAnalyticsFailed,
+  isDataFrameAnalyticsRunning,
+  isDataFrameAnalyticsStopped,
   DataFrameAnalyticsListRow,
-  DATA_FRAME_TASK_STATE,
 } from '../../../data_frame_analytics/pages/analytics_management/components/analytics_list/common';
 
 function getAnalyticsStats(analyticsList: any[]) {
@@ -53,15 +55,11 @@ function getAnalyticsStats(analyticsList: any[]) {
   let stoppedJobs = 0;
 
   analyticsList.forEach(job => {
-    if (job.stats.state === DATA_FRAME_TASK_STATE.FAILED) {
+    if (isDataFrameAnalyticsFailed(job.stats.state)) {
       failedJobs++;
-    } else if (
-      job.stats.state === DATA_FRAME_TASK_STATE.STARTED ||
-      job.stats.state === DATA_FRAME_TASK_STATE.ANALYZING ||
-      job.stats.state === DATA_FRAME_TASK_STATE.REINDEXING
-    ) {
+    } else if (isDataFrameAnalyticsRunning(job.stats.state)) {
       startedJobs++;
-    } else if (job.stats.state === DATA_FRAME_TASK_STATE.STOPPED) {
+    } else if (isDataFrameAnalyticsStopped(job.stats.state)) {
       stoppedJobs++;
     }
   });

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export const getActions = () => {`
`56`	`56`	`AnalyticsViewAction,`
`57`	`57`	`{`
`58`	`58`	`render: (item: DataFrameAnalyticsListRow) => {`
`59`		`- if (!isDataFrameAnalyticsRunning(item.stats)) {`
	`59`	`+ if (!isDataFrameAnalyticsRunning(item.stats.state)) {`
`60`	`60`	`return <StartAction item={item} />;`
`61`	`61`	`}`
`62`	`62`