From 9ed84e7cc6c977c357c4f84687ba909120c2ae17 Mon Sep 17 00:00:00 2001
From: Joshua Ogle <joshua@joshuaogle.com>
Date: Thu, 16 May 2019 14:45:58 -0600
Subject: [PATCH] Remove container tag for ConfirmAction

---
 .../components/identity/edit-form.hbs         |  2 +-
 ui/app/templates/components/pki-cert-show.hbs |  2 +-
 ui/app/templates/components/role-aws-edit.hbs |  4 +-
 ui/app/templates/components/role-pki-edit.hbs |  4 +-
 .../core/addon/components/confirm-action.js   |  4 +-
 .../templates/components/confirm-action.hbs   | 97 ++++++++++---------
 .../mode/secondaries/config-edit.hbs          |  2 +-
 7 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/ui/app/templates/components/identity/edit-form.hbs b/ui/app/templates/components/identity/edit-form.hbs
index 41be5354ac6d..f4fe37cccedf 100644
--- a/ui/app/templates/components/identity/edit-form.hbs
+++ b/ui/app/templates/components/identity/edit-form.hbs
@@ -6,7 +6,7 @@
         @onConfirmAction={{action "deleteItem" model}}
         data-test-entity-item-delete="true"
       >
-        Delete
+        Delete {{model.identityType}}
       </ConfirmAction>
     </ToolbarActions>
   </Toolbar>
diff --git a/ui/app/templates/components/pki-cert-show.hbs b/ui/app/templates/components/pki-cert-show.hbs
index 2841dc9a5031..42a6bba30833 100644
--- a/ui/app/templates/components/pki-cert-show.hbs
+++ b/ui/app/templates/components/pki-cert-show.hbs
@@ -52,7 +52,7 @@
       @buttonClasses="button"
       @onConfirmAction={{action "delete"}}
       @confirmTitle="Revoke this cert?"
-      @confirmMessage="This may affect access to Vault data."
+      @confirmMessage="Any services using this cert may be affected."
       @confirmButtonText="Revoke"
     >
       Revoke
diff --git a/ui/app/templates/components/role-aws-edit.hbs b/ui/app/templates/components/role-aws-edit.hbs
index bc1712fe3768..0d7d42567f9d 100644
--- a/ui/app/templates/components/role-aws-edit.hbs
+++ b/ui/app/templates/components/role-aws-edit.hbs
@@ -33,7 +33,7 @@
           Generate credentials
         </ToolbarSecretLink>
       {{/if}}
-      {{#if (and model.canGenerate (or model.canDelete model.canUpdate))}}
+      {{#if (and model.canGenerate (or model.canDelete model.canEdit))}}
         <div class="toolbar-separator" />
       {{/if}}
       {{#if model.canDelete}}
@@ -44,7 +44,7 @@
           Delete role
         </ConfirmAction>
       {{/if}}
-      {{#if (or model.canUpdate model.canDelete)}}
+      {{#if model.canEdit}}
         <ToolbarSecretLink
           @secret={{model.id}}
           @mode="edit"
diff --git a/ui/app/templates/components/role-pki-edit.hbs b/ui/app/templates/components/role-pki-edit.hbs
index 4c227643b4b0..79a7fcc13dff 100644
--- a/ui/app/templates/components/role-pki-edit.hbs
+++ b/ui/app/templates/components/role-pki-edit.hbs
@@ -44,7 +44,7 @@
           Sign Certificate
         </ToolbarSecretLink>
       {{/if}}
-      {{#if (and (or model.canGenerate model.canSign) (or model.canDelete model.canUpdate))}}
+      {{#if (and (or model.canGenerate model.canSign) (or model.canDelete model.canEdit))}}
         <div class="toolbar-separator" />
       {{/if}}
       {{#if model.canDelete}}
@@ -56,7 +56,7 @@
           Delete role
         </ConfirmAction>
       {{/if}}
-      {{#if (or model.canUpdate model.canDelete)}}
+      {{#if model.canEdit}}
         <ToolbarSecretLink
           @secret={{model.id}}
           @mode="edit"
diff --git a/ui/lib/core/addon/components/confirm-action.js b/ui/lib/core/addon/components/confirm-action.js
index 90f80aff7e1a..8b2547d662c8 100644
--- a/ui/lib/core/addon/components/confirm-action.js
+++ b/ui/lib/core/addon/components/confirm-action.js
@@ -1,5 +1,4 @@
 import Component from '@ember/component';
-import hbs from 'htmlbars-inline-precompile';
 import layout from '../templates/components/confirm-action';
 
 /**
@@ -27,7 +26,8 @@ import layout from '../templates/components/confirm-action';
 
 export default Component.extend({
   layout,
-  classNames: ['confirm-action'],
+  tagName: '',
+  supportsDataTestProperties: true,
   buttonText: 'Delete',
   confirmTitle: 'Delete this?',
   confirmMessage: 'You will not be able to recover it later.',
diff --git a/ui/lib/core/addon/templates/components/confirm-action.hbs b/ui/lib/core/addon/templates/components/confirm-action.hbs
index 762faeb7eef0..f37151ceea1d 100644
--- a/ui/lib/core/addon/templates/components/confirm-action.hbs
+++ b/ui/lib/core/addon/templates/components/confirm-action.hbs
@@ -1,46 +1,55 @@
-{{#basic-dropdown class="popup-menu" horizontalPosition=horizontalPosition verticalPosition=verticalPosition onOpen=(action "toggleConfirm") onClose=(action "toggleConfirm") as |d|}}
-  {{#d.trigger
-    tagName="button"
-    type="button"
-    class=(concat buttonClasses " popup-menu-trigger" (if d.isOpen " is-active"))
-    disabled=disabled
-    data-test-confirm-action-trigger="true"
-  }}
-    {{yield}}
-    {{#if (eq buttonClasses 'toolbar-link')}}
-      <Chevron @direction={{if showConfirm 'up' 'down'}} />
-    {{/if}}
-  {{/d.trigger}}
-  {{#d.content class=(concat "popup-menu-content")}}
-    <div class="box confirm-action-message">
-      <div class="message is-highlight">
-        <div class="message-title">
-          <Icon @glyph="alert-triangle" />
-          {{if disabled disabledTitle confirmTitle}}
+<div class="confirm-action" ...attributes>
+  <BasicDropdown
+    @horizontalPosition={{horizontalPosition}}
+    @verticalPosition={{verticalPosition}}
+    @onOpen={{action "toggleConfirm"}}
+    @onClose={{action "toggleConfirm"}}
+    as |d|>
+    <d.trigger
+      @tagName="button"
+      class={{concat buttonClasses " popup-menu-trigger" (if d.isOpen " is-active")}}
+      type="button"
+      disabled={{disabled}}
+      data-test-confirm-action-trigger="true"
+    >
+      {{yield}}
+      {{#if (eq buttonClasses 'toolbar-link')}}
+        <Chevron @direction={{if showConfirm 'up' 'down'}} />
+      {{/if}}
+    </d.trigger>
+    <d.content
+      @class="popup-menu-content"
+    >
+      <div class="box confirm-action-message">
+        <div class="message is-highlight">
+          <div class="message-title">
+            <Icon @glyph="alert-triangle" />
+            {{if disabled disabledTitle confirmTitle}}
+          </div>
+          <p>
+            {{if disabled disabledMessage confirmMessage}}
+          </p>
+        </div>
+        <div class="confirm-action-options">
+          <button
+            type="button"
+            disabled={{disabled}}
+            class="link is-destroy"
+            data-test-confirm-button="true"
+            {{action 'onConfirm'}}
+          >
+            {{confirmButtonText}}
+          </button>
+          <button
+            type="button"
+            class="link"
+            data-test-confirm-cancel-button="true"
+            {{action d.actions.close}}
+          >
+            {{cancelButtonText}}
+          </button>
         </div>
-        <p>
-          {{if disabled disabledMessage confirmMessage}}
-        </p>
-      </div>
-      <div class="confirm-action-options">
-        <button
-          type="button"
-          disabled={{disabled}}
-          class="link is-destroy"
-          data-test-confirm-button="true"
-          {{action 'onConfirm'}}
-        >
-          {{confirmButtonText}}
-        </button>
-        <button
-          type="button"
-          class="link"
-          data-test-confirm-cancel-button="true"
-          {{action d.actions.close}}
-        >
-          {{cancelButtonText}}
-        </button>
       </div>
-    </div>
-  {{/d.content}}
-{{/basic-dropdown}}
+    </d.content>
+  </BasicDropdown>
+</div>
diff --git a/ui/lib/replication/addon/templates/mode/secondaries/config-edit.hbs b/ui/lib/replication/addon/templates/mode/secondaries/config-edit.hbs
index 566e5108ac6c..e6c47fbaa749 100644
--- a/ui/lib/replication/addon/templates/mode/secondaries/config-edit.hbs
+++ b/ui/lib/replication/addon/templates/mode/secondaries/config-edit.hbs
@@ -4,7 +4,7 @@
       @buttonClasses="toolbar-link"
       @confirmMessage="This will affect which data gets replicated to this secondary."
       @onConfirmAction={{action "saveConfig" model.config true}}
-      @data-test-delete-mount-config="true"
+      data-test-delete-mount-config="true"
     >
       Delete config
     </ConfirmAction>