From 9c1e1fdc21c76915e59acd7069304262156fa1a7 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Mon, 10 Aug 2020 17:01:56 -0400
Subject: [PATCH 1/2] allow force stop from ui if job is failed

---
 .../components/action_stop/index.ts           |  2 +
 .../action_stop/stop_button_modal.tsx         | 57 +++++++++++++++++++
 .../action_stop/use_force_stop_action.ts      | 38 +++++++++++++
 .../components/analytics_list/use_actions.tsx | 16 +++++-
 4 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_force_stop_action.ts

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/index.ts
index 858b6c70501b3..ce03305e3d859 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/index.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/index.ts
@@ -5,3 +5,5 @@
  */
 
 export { StopButton } from './stop_button';
+export { StopButtonModal } from './stop_button_modal';
+export { useForceStopAction } from './use_force_stop_action';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx
new file mode 100644
index 0000000000000..495154d357295
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiConfirmModal, EuiOverlayMask, EUI_MODAL_CONFIRM_BUTTON } from '@elastic/eui';
+
+import { ForceStopAction } from './use_force_stop_action';
+
+export const StopButtonModal: FC<ForceStopAction> = ({
+  closeModal,
+  item,
+  forceStopAndCloseModal,
+}) => {
+  return (
+    <>
+      {item !== undefined && (
+        <EuiOverlayMask>
+          <EuiConfirmModal
+            title={i18n.translate('xpack.ml.dataframe.analyticsList.forceStopModalTitle', {
+              defaultMessage: 'Force stop {analyticsId}',
+              values: { analyticsId: item.config.id },
+            })}
+            onCancel={closeModal}
+            onConfirm={forceStopAndCloseModal}
+            cancelButtonText={i18n.translate(
+              'xpack.ml.dataframe.analyticsList.forceStopModalCancelButton',
+              {
+                defaultMessage: 'Cancel',
+              }
+            )}
+            confirmButtonText={i18n.translate(
+              'xpack.ml.dataframe.analyticsList.forceStopModalStartButton',
+              {
+                defaultMessage: 'Stop',
+              }
+            )}
+            defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
+            buttonColor="primary"
+          >
+            <p>
+              <FormattedMessage
+                id="xpack.ml.dataframe.analyticsList.forceStopModalBody"
+                defaultMessage="The analytics job is in the failed state, do you want to force stop {analyticsId}?"
+                values={{ analyticsId: item.config.id }}
+              />
+            </p>
+          </EuiConfirmModal>
+        </EuiOverlayMask>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_force_stop_action.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_force_stop_action.ts
new file mode 100644
index 0000000000000..5a4e748948731
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/use_force_stop_action.ts
@@ -0,0 +1,38 @@
+/*
+ * 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 { useState } from 'react';
+
+import { DataFrameAnalyticsListRow } from '../analytics_list/common';
+import { stopAnalytics } from '../../services/analytics_service';
+
+export type ForceStopAction = ReturnType<typeof useForceStopAction>;
+export const useForceStopAction = () => {
+  const [isModalVisible, setModalVisible] = useState(false);
+
+  const [item, setItem] = useState<DataFrameAnalyticsListRow>();
+
+  const closeModal = () => setModalVisible(false);
+  const forceStopAndCloseModal = () => {
+    if (item !== undefined) {
+      setModalVisible(false);
+      stopAnalytics(item);
+    }
+  };
+
+  const openModal = (newItem: DataFrameAnalyticsListRow) => {
+    setItem(newItem);
+    setModalVisible(true);
+  };
+
+  return {
+    closeModal,
+    isModalVisible,
+    item,
+    openModal,
+    forceStopAndCloseModal,
+  };
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_actions.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_actions.tsx
index 373b9991d4d3c..d355335039085 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_actions.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_actions.tsx
@@ -21,12 +21,13 @@ import {
   EditButtonFlyout,
 } from '../action_edit';
 import { useStartAction, StartButton, StartButtonModal } from '../action_start';
-import { StopButton } from '../action_stop';
+import { StopButton, useForceStopAction, StopButtonModal } from '../action_stop';
 import { getViewAction } from '../action_view';
 
 import {
   isCompletedAnalyticsJob,
   isDataFrameAnalyticsRunning,
+  isDataFrameAnalyticsFailed,
   DataFrameAnalyticsListRow,
 } from './common';
 
@@ -53,11 +54,13 @@ export const useActions = (
     const deleteAction = useDeleteAction();
     const editAction = useEditAction();
     const startAction = useStartAction();
+    const stopAction = useForceStopAction();
     /* eslint-disable react-hooks/rules-of-hooks */
 
     modals = (
       <>
         {startAction.isModalVisible && <StartButtonModal {...startAction} />}
+        {stopAction.isModalVisible && <StopButtonModal {...stopAction} />}
         {deleteAction.isModalVisible && <DeleteButtonModal {...deleteAction} />}
         {isEditActionFlyoutVisible(editAction) && <EditButtonFlyout {...editAction} />}
       </>
@@ -78,7 +81,10 @@ export const useActions = (
       ...[
         {
           render: (item: DataFrameAnalyticsListRow) => {
-            if (!isDataFrameAnalyticsRunning(item.stats.state)) {
+            if (
+              !isDataFrameAnalyticsRunning(item.stats.state) &&
+              !isDataFrameAnalyticsFailed(item.stats.state)
+            ) {
               return (
                 <StartButton
                   canStartStopDataFrameAnalytics={canStartStopDataFrameAnalytics}
@@ -99,7 +105,11 @@ export const useActions = (
                 item={item}
                 onClick={() => {
                   if (canStartStopDataFrameAnalytics) {
-                    stopAnalytics(item);
+                    if (isDataFrameAnalyticsFailed(item.stats.state)) {
+                      stopAction.openModal(item);
+                    } else {
+                      stopAnalytics(item);
+                    }
                   }
                 }}
               />

From 61308c25ca9fae346f43f1f3f2f9463cc6c7c787 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Thu, 13 Aug 2020 12:11:37 -0400
Subject: [PATCH 2/2] update wording in confirm modal

---
 .../components/action_stop/stop_button_modal.tsx           | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx
index 495154d357295..387f42cc85ef3 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_stop/stop_button_modal.tsx
@@ -22,8 +22,7 @@ export const StopButtonModal: FC<ForceStopAction> = ({
         <EuiOverlayMask>
           <EuiConfirmModal
             title={i18n.translate('xpack.ml.dataframe.analyticsList.forceStopModalTitle', {
-              defaultMessage: 'Force stop {analyticsId}',
-              values: { analyticsId: item.config.id },
+              defaultMessage: 'Force this job to stop?',
             })}
             onCancel={closeModal}
             onConfirm={forceStopAndCloseModal}
@@ -36,7 +35,7 @@ export const StopButtonModal: FC<ForceStopAction> = ({
             confirmButtonText={i18n.translate(
               'xpack.ml.dataframe.analyticsList.forceStopModalStartButton',
               {
-                defaultMessage: 'Stop',
+                defaultMessage: 'Force stop',
               }
             )}
             defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
@@ -45,7 +44,7 @@ export const StopButtonModal: FC<ForceStopAction> = ({
             <p>
               <FormattedMessage
                 id="xpack.ml.dataframe.analyticsList.forceStopModalBody"
-                defaultMessage="The analytics job is in the failed state, do you want to force stop {analyticsId}?"
+                defaultMessage="{analyticsId} is in a failed state. You must stop the job and fix the failure."
                 values={{ analyticsId: item.config.id }}
               />
             </p>