From d1cbe5f5a7a0c30eb960d24e8765cc508e9145e7 Mon Sep 17 00:00:00 2001
From: Jordan Reimer <zofskeez@gmail.com>
Date: Thu, 21 Oct 2021 11:22:35 -0600
Subject: [PATCH 1/2] adds divider to toolbars with destructive actions

---
 ui/app/templates/components/alphabet-edit.hbs |  1 +
 .../components/database-role-edit.hbs         | 56 +++++++++----------
 .../templates/components/generated-item.hbs   | 17 ++++--
 ui/app/templates/components/role-aws-edit.hbs | 20 +++----
 ui/app/templates/components/role-pki-edit.hbs | 22 ++++----
 ui/app/templates/components/role-ssh-edit.hbs | 20 +++----
 .../components/secret-delete-menu.hbs         |  3 +-
 .../components/transform-role-edit.hbs        |  1 +
 .../components/transform-template-edit.hbs    |  1 +
 .../components/transformation-edit.hbs        |  4 +-
 .../templates/vault/cluster/policy/edit.hbs   | 14 ++---
 .../kmip/addon/templates/credentials/show.hbs | 13 +++--
 ui/lib/kmip/addon/templates/role.hbs          |  1 +
 13 files changed, 89 insertions(+), 84 deletions(-)

diff --git a/ui/app/templates/components/alphabet-edit.hbs b/ui/app/templates/components/alphabet-edit.hbs
index 0928343c9c28c..918962e44f102 100644
--- a/ui/app/templates/components/alphabet-edit.hbs
+++ b/ui/app/templates/components/alphabet-edit.hbs
@@ -33,6 +33,7 @@
         >
           Delete alphabet
         </button>
+        <div class="toolbar-separator" />
       {{/if}}
       {{#if capabilities.canUpdate }}
         <ToolbarSecretLink
diff --git a/ui/app/templates/components/database-role-edit.hbs b/ui/app/templates/components/database-role-edit.hbs
index 06f49c2a59475..7d34d016a7c93 100644
--- a/ui/app/templates/components/database-role-edit.hbs
+++ b/ui/app/templates/components/database-role-edit.hbs
@@ -19,38 +19,38 @@
   <Toolbar>
     <ToolbarActions>
       {{#if @model.canDelete}}
-      <ConfirmAction
-        @buttonClasses="toolbar-link"
-        @onConfirmAction={{action 'delete'}}
-        @confirmTitle="Delete role?"
-        @confirmMessage="This role will be permanently deleted. You will need to recreate it to use it again."
-        @confirmButtonText="Delete"
-        data-test-database-role-delete
-      >
-        Delete role
-      </ConfirmAction>
-      <div class="toolbar-separator" />
+        <ConfirmAction
+          @buttonClasses="toolbar-link"
+          @onConfirmAction={{action 'delete'}}
+          @confirmTitle="Delete role?"
+          @confirmMessage="This role will be permanently deleted. You will need to recreate it to use it again."
+          @confirmButtonText="Delete"
+          data-test-database-role-delete
+        >
+          Delete role
+        </ConfirmAction>
+        <div class="toolbar-separator" />
       {{/if}}
       {{#if @model.canGenerateCredentials}}
-      <button
-        type="button"
-        class="toolbar-link"
-        {{on 'click' (fn this.generateCreds @model.id @model.type)}}
-        data-test-database-role-generate-creds
-      >
-        {{if (eq @model.type "static") "Get credentials" "Generate credentials"}}
-      </button>
+        <button
+          type="button"
+          class="toolbar-link"
+          {{on 'click' (fn this.generateCreds @model.id @model.type)}}
+          data-test-database-role-generate-creds
+        >
+          {{if (eq @model.type "static") "Get credentials" "Generate credentials"}}
+        </button>
       {{/if}}
       {{#if @model.canEditRole}}
-      <ToolbarSecretLink
-        @secret={{concat 'role/' @model.id}}
-        @mode="edit"
-        @replace=true
-        @queryParams={{query-params itemType="role"}}
-        @data-test-edit-link=true
-      >
-        Edit role
-      </ToolbarSecretLink>
+        <ToolbarSecretLink
+          @secret={{concat 'role/' @model.id}}
+          @mode="edit"
+          @replace=true
+          @queryParams={{query-params itemType="role"}}
+          @data-test-edit-link=true
+        >
+          Edit role
+        </ToolbarSecretLink>
       {{/if}}
     </ToolbarActions>
   </Toolbar>
diff --git a/ui/app/templates/components/generated-item.hbs b/ui/app/templates/components/generated-item.hbs
index 990fe4e3b6c4f..10c8ed7aa4c06 100644
--- a/ui/app/templates/components/generated-item.hbs
+++ b/ui/app/templates/components/generated-item.hbs
@@ -32,14 +32,21 @@
 {{#if (eq mode "show")}}
   <Toolbar>
     <ToolbarActions>
-      <ConfirmAction @buttonClasses="toolbar-link" @onConfirmAction={{action "deleteItem"}}
-        @confirmMessage={{concat "Are you sure you want to delete " itemType " " model.id "?"}} @cancelButtonText="Cancel"
-        data-test-secret-delete="true">
+      <ConfirmAction
+        @buttonClasses="toolbar-link"
+        @onConfirmAction={{action "deleteItem"}}
+        @confirmMessage={{concat "Are you sure you want to delete " itemType " " model.id "?"}}
+        @cancelButtonText="Cancel"
+        data-test-secret-delete="true"
+      >
         Delete
         {{itemType}}
       </ConfirmAction>
-      <ToolbarLink @params={{array "vault.cluster.access.method.item.edit" itemType model.id}}
-        @data-test-configure-link="true">
+      <div class="toolbar-separator" />
+      <ToolbarLink
+        @params={{array "vault.cluster.access.method.item.edit" itemType model.id}}
+        @data-test-configure-link="true"
+      >
         Edit {{singularize itemType}}
       </ToolbarLink>
     </ToolbarActions>
diff --git a/ui/app/templates/components/role-aws-edit.hbs b/ui/app/templates/components/role-aws-edit.hbs
index 2a3d429b7a116..e6799c89315f0 100644
--- a/ui/app/templates/components/role-aws-edit.hbs
+++ b/ui/app/templates/components/role-aws-edit.hbs
@@ -18,6 +18,15 @@
 {{#if (eq mode "show")}}
   <Toolbar>
     <ToolbarActions>
+      {{#if model.canDelete}}
+        <ConfirmAction
+          @buttonClasses="toolbar-link"
+          @onConfirmAction={{action "delete"}}
+        >
+          Delete role
+        </ConfirmAction>
+        <div class="toolbar-separator" />
+      {{/if}}
       {{#if model.canGenerate}}
         <ToolbarSecretLink
           @secret={{model.id}}
@@ -27,17 +36,6 @@
           Generate credentials
         </ToolbarSecretLink>
       {{/if}}
-      {{#if (and model.canGenerate (or model.canDelete model.canEdit))}}
-        <div class="toolbar-separator" />
-      {{/if}}
-      {{#if model.canDelete}}
-        <ConfirmAction
-          @buttonClasses="toolbar-link"
-          @onConfirmAction={{action "delete"}}
-        >
-          Delete role
-        </ConfirmAction>
-      {{/if}}
       {{#if model.canEdit}}
         <ToolbarSecretLink
           @secret={{model.id}}
diff --git a/ui/app/templates/components/role-pki-edit.hbs b/ui/app/templates/components/role-pki-edit.hbs
index 294a1cb926108..cdff46be5cfe0 100644
--- a/ui/app/templates/components/role-pki-edit.hbs
+++ b/ui/app/templates/components/role-pki-edit.hbs
@@ -18,6 +18,16 @@
 {{#if (eq mode "show") }}
   <Toolbar>
     <ToolbarActions>
+      {{#if model.canDelete}}
+        <ConfirmAction
+          @buttonClasses="toolbar-link"
+          @onConfirmAction={{action "delete"}}
+          data-test-role-delete="true"
+        >
+          Delete role
+        </ConfirmAction>
+        <div class="toolbar-separator" />
+      {{/if}}
       {{#if model.canGenerate}}
         <ToolbarSecretLink
           @secret={{model.id}}
@@ -38,18 +48,6 @@
           Sign Certificate
         </ToolbarSecretLink>
       {{/if}}
-      {{#if (and (or model.canGenerate model.canSign) (or model.canDelete model.canEdit))}}
-        <div class="toolbar-separator" />
-      {{/if}}
-      {{#if model.canDelete}}
-        <ConfirmAction
-          @buttonClasses="toolbar-link"
-          @onConfirmAction={{action "delete"}}
-          data-test-role-delete="true"
-        >
-          Delete role
-        </ConfirmAction>
-      {{/if}}
       {{#if model.canEdit}}
         <ToolbarSecretLink
           @secret={{model.id}}
diff --git a/ui/app/templates/components/role-ssh-edit.hbs b/ui/app/templates/components/role-ssh-edit.hbs
index 07ff61c8acd34..2fb8c702ac5a0 100644
--- a/ui/app/templates/components/role-ssh-edit.hbs
+++ b/ui/app/templates/components/role-ssh-edit.hbs
@@ -18,6 +18,15 @@
 {{#if (eq mode "show")}}
   <Toolbar>
     <ToolbarActions>
+      {{#if model.canDelete}}
+        <ConfirmAction
+          @buttonClasses="toolbar-link"
+          @onConfirmAction={{action "delete"}}
+        >
+          Delete role
+        </ConfirmAction>
+        <div class="toolbar-separator" />
+      {{/if}}
       {{#if (eq model.keyType "otp")}}
         <ToolbarSecretLink
           @secret={{model.id}}
@@ -37,17 +46,6 @@
           Sign Keys
         </ToolbarSecretLink>
       {{/if}}
-      {{#if (or model.canUpdate model.canDelete)}}
-        <div class="toolbar-separator" />
-      {{/if}}
-      {{#if model.canDelete}}
-        <ConfirmAction
-          @buttonClasses="toolbar-link"
-          @onConfirmAction={{action "delete"}}
-        >
-          Delete role
-        </ConfirmAction>
-      {{/if}}
       {{#if (or model.canUpdate model.canDelete)}}
         <ToolbarSecretLink
           @secret={{model.id}}
diff --git a/ui/app/templates/components/secret-delete-menu.hbs b/ui/app/templates/components/secret-delete-menu.hbs
index c20b0036250cd..a5d7a77816239 100644
--- a/ui/app/templates/components/secret-delete-menu.hbs
+++ b/ui/app/templates/components/secret-delete-menu.hbs
@@ -9,6 +9,7 @@
     >
       Delete
     </ConfirmAction>
+    <div class="toolbar-separator" />
   {{/if}}
 {{else}}
   {{#if (and this.canUndeleteVersion @modelForData.deleted)}}
@@ -26,7 +27,7 @@
       <button
         type="button"
         class="toolbar-link"
-        {{on "click" (fn (mut this.showDeleteModal false))}}
+        {{on "click" (fn (mut this.showDeleteModal) false)}}
         data-test-delete-open-modal
       >
         {{if (and (not @modelForData.deleted) (not @modelForData.destroyed)) "Delete" "Destroy"}}
diff --git a/ui/app/templates/components/transform-role-edit.hbs b/ui/app/templates/components/transform-role-edit.hbs
index e0b4e630760a0..056345fdb1c37 100644
--- a/ui/app/templates/components/transform-role-edit.hbs
+++ b/ui/app/templates/components/transform-role-edit.hbs
@@ -29,6 +29,7 @@
         >
           Delete role
         </ConfirmAction>
+        <div class="toolbar-separator" />
       {{/if}}
       {{#if capabilities.canUpdate }}
         <ToolbarSecretLink
diff --git a/ui/app/templates/components/transform-template-edit.hbs b/ui/app/templates/components/transform-template-edit.hbs
index 8efd63ae5f718..68bf4b2a4a736 100644
--- a/ui/app/templates/components/transform-template-edit.hbs
+++ b/ui/app/templates/components/transform-template-edit.hbs
@@ -33,6 +33,7 @@
         >
           Delete template
         </button>
+        <div class="toolbar-separator" />
       {{/if}}
       {{#if capabilities.canUpdate }}
         <ToolbarSecretLink
diff --git a/ui/app/templates/components/transformation-edit.hbs b/ui/app/templates/components/transformation-edit.hbs
index f819dd77d3586..c8088cbb45b33 100644
--- a/ui/app/templates/components/transformation-edit.hbs
+++ b/ui/app/templates/components/transformation-edit.hbs
@@ -18,9 +18,6 @@
 {{#if (eq mode "show")}}
   <Toolbar>
     <ToolbarActions>
-      {{#if (or capabilities.canUpdate capabilities.canDelete)}}
-        <div class="toolbar-separator" />
-      {{/if}}
       {{#if capabilities.canDelete}}
         {{#if (gt model.allowed_roles.length 0)}}
           <ToolTip
@@ -52,6 +49,7 @@
           Delete transformation
         </button>
         {{/if}}
+        <div class="toolbar-separator" />
       {{/if}}
       {{#if capabilities.canUpdate }}
         {{#if (gt model.allowed_roles.length 0)}}
diff --git a/ui/app/templates/vault/cluster/policy/edit.hbs b/ui/app/templates/vault/cluster/policy/edit.hbs
index 11c823ca491d5..736794144bb25 100644
--- a/ui/app/templates/vault/cluster/policy/edit.hbs
+++ b/ui/app/templates/vault/cluster/policy/edit.hbs
@@ -23,13 +23,6 @@
 {{#if (and (not-eq model.id "root") (or capabilities.canUpdate capabilities.canDelete))}}
   <Toolbar>
     <ToolbarActions>
-      <ToolbarLink
-        @params={{array 'vault.cluster.policy.show' model.id}}
-        @data-test-policy-edit-toggle=true
-      >
-        Back to policy
-      </ToolbarLink>
-      <div class="toolbar-separator" />
       {{#if (and (not-eq model.id "default") capabilities.canDelete)}}
         <ConfirmAction
           @buttonClasses="toolbar-link"
@@ -39,7 +32,14 @@
         >
           Delete
         </ConfirmAction>
+        <div class="toolbar-separator" />
       {{/if}}
+      <ToolbarLink
+        @params={{array 'vault.cluster.policy.show' model.id}}
+        @data-test-policy-edit-toggle=true
+      >
+        Back to policy
+      </ToolbarLink>
     </ToolbarActions>
   </Toolbar>
 {{/if}}
diff --git a/ui/lib/kmip/addon/templates/credentials/show.hbs b/ui/lib/kmip/addon/templates/credentials/show.hbs
index e30079a026d24..8a1b5018cbce7 100644
--- a/ui/lib/kmip/addon/templates/credentials/show.hbs
+++ b/ui/lib/kmip/addon/templates/credentials/show.hbs
@@ -10,12 +10,6 @@
 </PageHeader>
 <Toolbar>
   <ToolbarActions>
-    <ToolbarLink
-      @params={{array "credentials.index" this.scope this.role}}
-      data-test-kmip-link-back-to-role
-    >
-      Back to role
-    </ToolbarLink>
     {{#if model.deletePath.canDelete}}
       <ModelWrap as |m|>
         <ConfirmAction
@@ -38,7 +32,14 @@
             Revoke credentials
         </ConfirmAction>
       </ModelWrap>
+      <div class="toolbar-separator" />
     {{/if}}
+    <ToolbarLink
+      @params={{array "credentials.index" this.scope this.role}}
+      data-test-kmip-link-back-to-role
+    >
+      Back to role
+    </ToolbarLink>
     <CopyButton
       class="toolbar-link"
       @clipboardText={{model.certificate}}
diff --git a/ui/lib/kmip/addon/templates/role.hbs b/ui/lib/kmip/addon/templates/role.hbs
index 6918a77eaa7ac..07f543755bcc7 100644
--- a/ui/lib/kmip/addon/templates/role.hbs
+++ b/ui/lib/kmip/addon/templates/role.hbs
@@ -21,6 +21,7 @@
             Delete role
         </ConfirmAction>
       </ModelWrap>
+      <div class="toolbar-separator" />
     {{/if}}
     {{#if model.updatePath.canUpdate}}
       <ToolbarLink

From d0b614eb061b4813aa556cafd02e4d931a1ca7c1 Mon Sep 17 00:00:00 2001
From: Jordan Reimer <zofskeez@gmail.com>
Date: Thu, 21 Oct 2021 12:38:15 -0600
Subject: [PATCH 2/2] adds changelog

---
 changelog/12895.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changelog/12895.txt

diff --git a/changelog/12895.txt b/changelog/12895.txt
new file mode 100644
index 0000000000000..ff9a66e612a9d
--- /dev/null
+++ b/changelog/12895.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+ui: Standardizes toolbar presentation of destructive actions 
+```
\ No newline at end of file