From b2db75ddc8d50e4148a63d3067e820d18d0862c7 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 31 Aug 2020 14:46:18 -0400
Subject: [PATCH 1/2] refactor: Remove unused transitions for principal removal

---
 .../scopes/scope/projects/project/targets/target/host-sets.js    | 1 -
 ui/core/app/routes/scopes/scope/roles/role/principals.js         | 1 -
 .../scopes/scope/projects/project/targets/target/host-sets.hbs   | 1 -
 ui/core/app/templates/scopes/scope/roles/role/principals.hbs     | 1 -
 4 files changed, 4 deletions(-)

diff --git a/ui/core/app/routes/scopes/scope/projects/project/targets/target/host-sets.js b/ui/core/app/routes/scopes/scope/projects/project/targets/target/host-sets.js
index f2ca46232..d60d1d2f0 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/targets/target/host-sets.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/targets/target/host-sets.js
@@ -62,7 +62,6 @@ export default class ScopesScopeProjectsProjectTargetsTargetHostSetsRoute extend
       await target.removeHostSet(hostSet.id);
       this.refresh();
       this.notify.success(this.intl.t('notify.delete-success'));
-      this.transitionTo('scopes.scope.projects.project.targets.target.host-sets');
     } catch (error) {
       // TODO: replace with translated strings
       this.notify.error(error.message, { closeAfter: null });
diff --git a/ui/core/app/routes/scopes/scope/roles/role/principals.js b/ui/core/app/routes/scopes/scope/roles/role/principals.js
index 9e20116b8..91fa7eb2a 100644
--- a/ui/core/app/routes/scopes/scope/roles/role/principals.js
+++ b/ui/core/app/routes/scopes/scope/roles/role/principals.js
@@ -54,7 +54,6 @@ export default class ScopesScopeRolesRolePrincipalsRoute extends Route {
       await role.removePrincipal(principal.id);
       this.refresh();
       this.notify.success(this.intl.t('notify.delete-success'));
-      this.transitionTo('scopes.scope.roles.role.principals');
     } catch (error) {
       // TODO: replace with translated strings
       this.notify.error(error.message, { closeAfter: null });
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
index 00a5058d5..859be4dfa 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
@@ -32,7 +32,6 @@
               @text="{{t "actions.manage"}}" as |dropdown|
             >
               <dropdown.button
-                name="{{t "actions.remove"}}"
                 @style="danger"
                 {{on "click" (route-action "removeHostSet" @model hostSet.model)}}
               >
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
index b55c636c6..9719faf7a 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
@@ -31,7 +31,6 @@
               @text="{{t "actions.manage"}}" as |dropdown|
             >
               <dropdown.button
-                name="{{t "actions.remove"}}"
                 @style="danger"
                 {{on "click" (route-action "removePrincipal" principal.model)}}
               >

From e7c60968626918106f2bed0e2f88f8d0f8fee504 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Mon, 31 Aug 2020 15:07:04 -0400
Subject: [PATCH 2/2] fix: Update dropdowncontent width to remove large empty
 space

---
 addons/rose/addon/styles/rose/components/dropdown/_button.scss  | 2 +-
 .../rose/addon/styles/rose/components/dropdown/_dropdown.scss   | 2 +-
 addons/rose/addon/styles/rose/components/dropdown/_link.scss    | 2 +-
 .../scopes/scope/projects/project/targets/target/host-sets.hbs  | 1 +
 ui/core/app/templates/scopes/scope/roles/role/principals.hbs    | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/rose/addon/styles/rose/components/dropdown/_button.scss b/addons/rose/addon/styles/rose/components/dropdown/_button.scss
index 58b78e4a1..7da5009a9 100644
--- a/addons/rose/addon/styles/rose/components/dropdown/_button.scss
+++ b/addons/rose/addon/styles/rose/components/dropdown/_button.scss
@@ -7,7 +7,7 @@
   box-sizing: border-box;
   width: 100%;
   // Targeting min-width of ~200
-  min-width: (sizing.rems(m) + sizing.rems(xs)) * 10;
+  min-width: (sizing.rems(m)) * 10;
   border: 0;
   padding: 0 sizing.rems(s);
   text-decoration: none;
diff --git a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss
index 3bbbdb292..b3467aff9 100644
--- a/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss
+++ b/addons/rose/addon/styles/rose/components/dropdown/_dropdown.scss
@@ -43,8 +43,8 @@ $chevron: "data:image/svg+xml;utf-8,<svg viewBox='0 0 24 24' fill='%231b1f26' xm
     }
 
     &.has-icon-only {
-      padding-right: sizing.rems(l);
       padding-left: sizing.rems(s);
+      padding-right: sizing.rems(s);
       background-position: right sizing.rems(xs) center;
 
       .rose-dropdown-trigger-text {
diff --git a/addons/rose/addon/styles/rose/components/dropdown/_link.scss b/addons/rose/addon/styles/rose/components/dropdown/_link.scss
index 38e9d8cb9..5174ebbaf 100644
--- a/addons/rose/addon/styles/rose/components/dropdown/_link.scss
+++ b/addons/rose/addon/styles/rose/components/dropdown/_link.scss
@@ -7,7 +7,7 @@
   box-sizing: border-box;
   width: 100%;
   // Targeting min-width of ~200
-  min-width: (sizing.rems(m) + sizing.rems(xs)) * 10;
+  min-width: (sizing.rems(m)) * 10;
   border: 0;
   padding: 0 sizing.rems(s);
   text-decoration: none;
diff --git a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
index 859be4dfa..40f12df7f 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/targets/target/host-sets.hbs
@@ -28,6 +28,7 @@
             <Rose::Dropdown
               @icon="more-horizontal"
               @iconOnly={{true}}
+              @showCaret={{false}}
               @dropdownRight={{true}}
               @text="{{t "actions.manage"}}" as |dropdown|
             >
diff --git a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
index 9719faf7a..b364b136f 100644
--- a/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/core/app/templates/scopes/scope/roles/role/principals.hbs
@@ -27,6 +27,7 @@
             <Rose::Dropdown
               @icon="more-horizontal"
               @iconOnly={{true}}
+              @showCaret={{false}}
               @dropdownRight={{true}}
               @text="{{t "actions.manage"}}" as |dropdown|
             >