From 9a27beba75a57e39caeb3dcfa1c57000da6cb630 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Tue, 1 Sep 2020 07:11:42 -0700
Subject: [PATCH] [ML] Remove "Are you sure" from anomaly detection jobs
 (#75931)

---
 .../__snapshots__/delete_rule_modal.test.js.snap    | 12 ++----------
 .../select_rule_action/delete_rule_modal.js         | 11 ++---------
 .../components/delete_job_modal/delete_job_modal.js | 13 ++-----------
 x-pack/plugins/translations/translations/ja-JP.json |  2 --
 x-pack/plugins/translations/translations/zh-CN.json |  2 --
 5 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/delete_rule_modal.test.js.snap b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/delete_rule_modal.test.js.snap
index 708bddd145393..a132e6682ee25 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/delete_rule_modal.test.js.snap
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/delete_rule_modal.test.js.snap
@@ -64,20 +64,12 @@ exports[`DeleteRuleModal renders modal after clicking delete rule link 1`] = `
       onConfirm={[Function]}
       title={
         <FormattedMessage
-          defaultMessage="Delete rule"
+          defaultMessage="Delete rule?"
           id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle"
           values={Object {}}
         />
       }
-    >
-      <p>
-        <FormattedMessage
-          defaultMessage="Are you sure you want to delete this rule?"
-          id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription"
-          values={Object {}}
-        />
-      </p>
-    </EuiConfirmModal>
+    />
   </EuiOverlayMask>
 </Fragment>
 `;
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.js b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.js
index 9fcd457df008f..5140fe77ff979 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.js
@@ -47,7 +47,7 @@ export class DeleteRuleModal extends Component {
             title={
               <FormattedMessage
                 id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle"
-                defaultMessage="Delete rule"
+                defaultMessage="Delete rule?"
               />
             }
             onCancel={this.closeModal}
@@ -66,14 +66,7 @@ export class DeleteRuleModal extends Component {
               />
             }
             defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
-          >
-            <p>
-              <FormattedMessage
-                id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription"
-                defaultMessage="Are you sure you want to delete this rule?"
-              />
-            </p>
-          </EuiConfirmModal>
+          />
         </EuiOverlayMask>
       );
     }
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/delete_job_modal/delete_job_modal.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/delete_job_modal/delete_job_modal.js
index 1e3ec6241311b..f80578cb18341 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/delete_job_modal/delete_job_modal.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/delete_job_modal/delete_job_modal.js
@@ -98,7 +98,7 @@ export class DeleteJobModal extends Component {
       const title = (
         <FormattedMessage
           id="xpack.ml.jobsList.deleteJobModal.deleteJobsTitle"
-          defaultMessage="Delete {jobsCount, plural, one {{jobId}} other {# jobs}}"
+          defaultMessage="Delete {jobsCount, plural, one {{jobId}} other {# jobs}}?"
           values={{
             jobsCount: this.state.jobs.length,
             jobId: this.state.jobs[0].id,
@@ -144,21 +144,12 @@ export class DeleteJobModal extends Component {
 
             {this.state.deleting === false && (
               <React.Fragment>
-                <p>
-                  <FormattedMessage
-                    id="xpack.ml.jobsList.deleteJobModal.deleteJobsDescription"
-                    defaultMessage="Are you sure you want to delete {jobsCount, plural, one {this job} other {these jobs}}?"
-                    values={{
-                      jobsCount: this.state.jobs.length,
-                    }}
-                  />
-                </p>
                 <p>
                   <FormattedMessage
                     id="xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription"
                     defaultMessage="Deleting {jobsCount, plural, one {a job} other {multiple jobs}} can be time consuming.
                     {jobsCount, plural, one {It} other {They}} will be deleted in the background
-                    and may not disappear from the jobs list instantly"
+                    and may not disappear from the jobs list instantly."
                     values={{
                       jobsCount: this.state.jobs.length,
                     }}
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index b45598cb4f998..b70ab0bb25561 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -11608,7 +11608,6 @@
     "xpack.ml.jobsList.deleteJobModal.cancelButtonLabel": "キャンセル",
     "xpack.ml.jobsList.deleteJobModal.closeButtonLabel": "閉じる",
     "xpack.ml.jobsList.deleteJobModal.deleteButtonLabel": "削除",
-    "xpack.ml.jobsList.deleteJobModal.deleteJobsDescription": "{jobsCount, plural, one {このジョブ} other {これらのジョブ}}を削除してよろしいですか？",
     "xpack.ml.jobsList.deleteJobModal.deleteJobsTitle": "{jobsCount, plural, one {{jobId}} other {# 件のジョブ}}を削除",
     "xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription": "{jobsCount, plural, one {ジョブ} other {複数ジョブ}}の削除には時間がかかる場合があります。{jobsCount, plural, one {} other {}}バックグラウンドで削除され、ジョブリストからすぐに消えない場合があります",
     "xpack.ml.jobsList.deleteJobModal.deletingJobsStatusLabel": "ジョブを削除中",
@@ -12277,7 +12276,6 @@
     "xpack.ml.ruleEditor.deleteJobRule.ruleNoLongerExistsErrorMessage": "ジョブ {jobId} の検知器インデックス {detectorIndex} のルールが現在存在しません",
     "xpack.ml.ruleEditor.deleteRuleModal.cancelButtonLabel": "キャンセル",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteButtonLabel": "削除",
-    "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription": "このルールを削除してよろしいですか？",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleLinkText": "ルールを削除",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle": "ルールの削除",
     "xpack.ml.ruleEditor.detectorDescriptionList.detectorTitle": "検知器",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 248a6986bb2a3..72010e00dc820 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -11612,7 +11612,6 @@
     "xpack.ml.jobsList.deleteJobModal.cancelButtonLabel": "取消",
     "xpack.ml.jobsList.deleteJobModal.closeButtonLabel": "关闭",
     "xpack.ml.jobsList.deleteJobModal.deleteButtonLabel": "删除",
-    "xpack.ml.jobsList.deleteJobModal.deleteJobsDescription": "是否确定要删除{jobsCount, plural, one {此作业} other {这些作业}}？",
     "xpack.ml.jobsList.deleteJobModal.deleteJobsTitle": "删除 {jobsCount, plural, one {{jobId}} other {# 个作业}}",
     "xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription": "删除{jobsCount, plural, one {一个作业} other {多个作业}}会非常耗时。将在后台删除{jobsCount, plural, one {该作业} other {这些作业}}，但删除的作业可能不会立即从作业列表中消失",
     "xpack.ml.jobsList.deleteJobModal.deletingJobsStatusLabel": "正在删除作业",
@@ -12281,7 +12280,6 @@
     "xpack.ml.ruleEditor.deleteJobRule.ruleNoLongerExistsErrorMessage": "作业 {jobId} 中不再存在检测工具索引 {detectorIndex} 的规则",
     "xpack.ml.ruleEditor.deleteRuleModal.cancelButtonLabel": "取消",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteButtonLabel": "删除",
-    "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription": "是否确定要删除此规则？",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleLinkText": "删除规则",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle": "删除规则",
     "xpack.ml.ruleEditor.detectorDescriptionList.detectorTitle": "检测工具",