From 6e65e491f288125cbdc5127bacef037e53efd482 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 14:17:28 -0700
Subject: [PATCH] Fixed a bug that was causing the action execution policy to
 be configurable for query and cluster metrics monitors. (#261) (#263)

* Fixed a bug that was causing the action execution policy to be configurable for query and cluster metrics monitors.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated snapshots.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit fdd52fe4efc63cc099d715159fb3e1fa319e6e40)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
---
 .../Action/__snapshots__/Action.test.js.snap  | 198 ++----------------
 .../components/Action/actions/Message.js      |   2 +-
 .../__snapshots__/Message.test.js.snap        |  99 +--------
 3 files changed, 34 insertions(+), 265 deletions(-)

diff --git a/public/pages/CreateTrigger/components/Action/__snapshots__/Action.test.js.snap b/public/pages/CreateTrigger/components/Action/__snapshots__/Action.test.js.snap
index 7b7429067..f7c795f04 100644
--- a/public/pages/CreateTrigger/components/Action/__snapshots__/Action.test.js.snap
+++ b/public/pages/CreateTrigger/components/Action/__snapshots__/Action.test.js.snap
@@ -397,101 +397,24 @@ exports[`Action renders with Notifications plugin installed 1`] = `
                 <div
                   class="euiSpacer euiSpacer--m"
                 />
-                <div
-                  class="euiFormRow"
-                  id="generated-id-row"
-                  style="max-width:100%"
-                >
-                  <div
-                    class="euiFormRow__labelWrapper"
-                  >
-                    <label
-                      class="euiFormLabel euiFormRow__label"
-                      for="generated-id"
-                    >
-                      <span
-                        style="color:#343741"
-                      >
-                        Perform action
-                      </span>
-                    </label>
-                  </div>
+                <div>
                   <div
-                    class="euiFormRow__fieldWrapper"
+                    class="euiFlexItem"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionColumn euiFlexGroup--responsive"
-                      id="generated-id"
+                      class="euiText euiText--extraSmall"
                     >
-                      <div
-                        class="euiFlexItem"
-                      >
-                        <div
-                          class="euiFormRow"
-                          id="testPathactions.0.action_execution_policy.action_execution_scope-form-row-row"
-                        >
-                          <div
-                            class="euiFormRow__fieldWrapper"
-                          >
-                            <div
-                              class="euiRadio"
-                            >
-                              <input
-                                class="euiRadio__input"
-                                id="testPathactions.0.action_execution_policy.per_execution"
-                                name="testPathactions.0.action_execution_policy.action_execution_scope"
-                                type="radio"
-                                value="per_execution"
-                              />
-                              <div
-                                class="euiRadio__circle"
-                              />
-                              <label
-                                class="euiRadio__label"
-                                for="testPathactions.0.action_execution_policy.per_execution"
-                              >
-                                Per execution
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        class="euiFlexItem"
-                      >
-                        <div
-                          class="euiFormRow"
-                          id="testPathactions.0.action_execution_policy.action_execution_scope-form-row-row"
-                        >
-                          <div
-                            class="euiFormRow__fieldWrapper"
-                          >
-                            <div
-                              class="euiRadio"
-                            >
-                              <input
-                                checked=""
-                                class="euiRadio__input"
-                                id="testPathactions.0.action_execution_policy.per_alert"
-                                name="testPathactions.0.action_execution_policy.action_execution_scope"
-                                type="radio"
-                                value="per_alert"
-                              />
-                              <div
-                                class="euiRadio__circle"
-                              />
-                              <label
-                                class="euiRadio__label"
-                                for="testPathactions.0.action_execution_policy.per_alert"
-                              >
-                                Per alert
-                              </label>
-                            </div>
-                          </div>
-                        </div>
+                      <strong>
+                        Perform action
+                      </strong>
+                      <div>
+                        Per monitor execution
                       </div>
                     </div>
                   </div>
+                  <div
+                    class="euiSpacer euiSpacer--s"
+                  />
                 </div>
                 <div
                   class="euiFormRow"
@@ -1069,101 +992,24 @@ exports[`Action renders without Notifications plugin installed 1`] = `
                 <div
                   class="euiSpacer euiSpacer--m"
                 />
-                <div
-                  class="euiFormRow"
-                  id="generated-id-row"
-                  style="max-width:100%"
-                >
-                  <div
-                    class="euiFormRow__labelWrapper"
-                  >
-                    <label
-                      class="euiFormLabel euiFormRow__label"
-                      for="generated-id"
-                    >
-                      <span
-                        style="color:#343741"
-                      >
-                        Perform action
-                      </span>
-                    </label>
-                  </div>
+                <div>
                   <div
-                    class="euiFormRow__fieldWrapper"
+                    class="euiFlexItem"
                   >
                     <div
-                      class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionColumn euiFlexGroup--responsive"
-                      id="generated-id"
+                      class="euiText euiText--extraSmall"
                     >
-                      <div
-                        class="euiFlexItem"
-                      >
-                        <div
-                          class="euiFormRow"
-                          id="testPathactions.0.action_execution_policy.action_execution_scope-form-row-row"
-                        >
-                          <div
-                            class="euiFormRow__fieldWrapper"
-                          >
-                            <div
-                              class="euiRadio"
-                            >
-                              <input
-                                class="euiRadio__input"
-                                id="testPathactions.0.action_execution_policy.per_execution"
-                                name="testPathactions.0.action_execution_policy.action_execution_scope"
-                                type="radio"
-                                value="per_execution"
-                              />
-                              <div
-                                class="euiRadio__circle"
-                              />
-                              <label
-                                class="euiRadio__label"
-                                for="testPathactions.0.action_execution_policy.per_execution"
-                              >
-                                Per execution
-                              </label>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        class="euiFlexItem"
-                      >
-                        <div
-                          class="euiFormRow"
-                          id="testPathactions.0.action_execution_policy.action_execution_scope-form-row-row"
-                        >
-                          <div
-                            class="euiFormRow__fieldWrapper"
-                          >
-                            <div
-                              class="euiRadio"
-                            >
-                              <input
-                                checked=""
-                                class="euiRadio__input"
-                                id="testPathactions.0.action_execution_policy.per_alert"
-                                name="testPathactions.0.action_execution_policy.action_execution_scope"
-                                type="radio"
-                                value="per_alert"
-                              />
-                              <div
-                                class="euiRadio__circle"
-                              />
-                              <label
-                                class="euiRadio__label"
-                                for="testPathactions.0.action_execution_policy.per_alert"
-                              >
-                                Per alert
-                              </label>
-                            </div>
-                          </div>
-                        </div>
+                      <strong>
+                        Perform action
+                      </strong>
+                      <div>
+                        Per monitor execution
                       </div>
                     </div>
                   </div>
+                  <div
+                    class="euiSpacer euiSpacer--s"
+                  />
                 </div>
                 <div
                   class="euiFormRow"
diff --git a/public/pages/CreateTrigger/components/Action/actions/Message.js b/public/pages/CreateTrigger/components/Action/actions/Message.js
index 5d3a01e79..d03b4e1ba 100644
--- a/public/pages/CreateTrigger/components/Action/actions/Message.js
+++ b/public/pages/CreateTrigger/components/Action/actions/Message.js
@@ -141,7 +141,7 @@ export default function Message(
   const onDisplayPreviewChange = (e) => setDisplayPreview(e.target.checked);
   const monitorType = _.get(context, 'ctx.monitor.monitor_type', MONITOR_TYPE.QUERY_LEVEL);
   const editableActionExecutionPolicy =
-    monitorType === MONITOR_TYPE.BUCKET_LEVEL || MONITOR_TYPE.DOC_LEVEL;
+    monitorType === MONITOR_TYPE.BUCKET_LEVEL || monitorType === MONITOR_TYPE.DOC_LEVEL;
 
   const actionPath = `${fieldPath}actions.${index}`;
   const actionExecutionPolicyPath = editableActionExecutionPolicy
diff --git a/public/pages/CreateTrigger/components/Action/actions/__snapshots__/Message.test.js.snap b/public/pages/CreateTrigger/components/Action/actions/__snapshots__/Message.test.js.snap
index e11394570..2d689a0b2 100644
--- a/public/pages/CreateTrigger/components/Action/actions/__snapshots__/Message.test.js.snap
+++ b/public/pages/CreateTrigger/components/Action/actions/__snapshots__/Message.test.js.snap
@@ -170,101 +170,24 @@ exports[`Message renders 1`] = `
   <div
     class="euiSpacer euiSpacer--m"
   />
-  <div
-    class="euiFormRow"
-    id="generated-id-row"
-    style="max-width:100%"
-  >
+  <div>
     <div
-      class="euiFormRow__labelWrapper"
-    >
-      <label
-        class="euiFormLabel euiFormRow__label"
-        for="generated-id"
-      >
-        <span
-          style="color:#343741"
-        >
-          Perform action
-        </span>
-      </label>
-    </div>
-    <div
-      class="euiFormRow__fieldWrapper"
+      class="euiFlexItem"
     >
       <div
-        class="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--directionColumn euiFlexGroup--responsive"
-        id="generated-id"
+        class="euiText euiText--extraSmall"
       >
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiFormRow"
-            id="undefinedactions.0.action_execution_policy.action_execution_scope-form-row-row"
-          >
-            <div
-              class="euiFormRow__fieldWrapper"
-            >
-              <div
-                class="euiRadio"
-              >
-                <input
-                  class="euiRadio__input"
-                  id="undefinedactions.0.action_execution_policy.per_execution"
-                  name="undefinedactions.0.action_execution_policy.action_execution_scope"
-                  type="radio"
-                  value="per_execution"
-                />
-                <div
-                  class="euiRadio__circle"
-                />
-                <label
-                  class="euiRadio__label"
-                  for="undefinedactions.0.action_execution_policy.per_execution"
-                >
-                  Per execution
-                </label>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem"
-        >
-          <div
-            class="euiFormRow"
-            id="undefinedactions.0.action_execution_policy.action_execution_scope-form-row-row"
-          >
-            <div
-              class="euiFormRow__fieldWrapper"
-            >
-              <div
-                class="euiRadio"
-              >
-                <input
-                  checked=""
-                  class="euiRadio__input"
-                  id="undefinedactions.0.action_execution_policy.per_alert"
-                  name="undefinedactions.0.action_execution_policy.action_execution_scope"
-                  type="radio"
-                  value="per_alert"
-                />
-                <div
-                  class="euiRadio__circle"
-                />
-                <label
-                  class="euiRadio__label"
-                  for="undefinedactions.0.action_execution_policy.per_alert"
-                >
-                  Per alert
-                </label>
-              </div>
-            </div>
-          </div>
+        <strong>
+          Perform action
+        </strong>
+        <div>
+          Per monitor execution
         </div>
       </div>
     </div>
+    <div
+      class="euiSpacer euiSpacer--s"
+    />
   </div>
   <div
     class="euiFormRow"