From 817d2a44e1d4810ec57443bff50f14d786af9a4e Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Mon, 18 Jul 2022 14:26:26 -0700
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20scope=20column=20?=
 =?UTF-8?q?to=20role=20principals=20and=20group=20members=20(#1184)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Carlos Alcaide Corvo <ccorvo@hashicorp.com>
---
 .../components/form/group/add-members/index.hbs    |  4 ++++
 .../components/form/role/add-principals/index.hbs  |  5 ++++-
 ui/admin/app/components/scope-badge/index.hbs      |  7 +++++++
 .../scopes/scope/groups/group/members.hbs          |  4 ++++
 .../scopes/scope/roles/role/principals.hbs         | 14 ++++++++++----
 5 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 ui/admin/app/components/scope-badge/index.hbs

diff --git a/ui/admin/app/components/form/group/add-members/index.hbs b/ui/admin/app/components/form/group/add-members/index.hbs
index 49d5233cb..803334b0a 100644
--- a/ui/admin/app/components/form/group/add-members/index.hbs
+++ b/ui/admin/app/components/form/group/add-members/index.hbs
@@ -18,6 +18,7 @@
         <header.row as |row|>
           <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
           <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+          <row.headerCell>{{t 'resources.scope.title'}}</row.headerCell>
           <row.headerCell>{{t 'form.description.label'}}</row.headerCell>
         </header.row>
       </table.header>
@@ -42,6 +43,9 @@
               {{/if}}
             </row.headerCell>
             <row.cell><code>{{user.id}}</code></row.cell>
+            <row.cell>
+              <ScopeBadge @scope={{user.scopeModel}} />
+            </row.cell>
             <row.cell>{{user.description}}</row.cell>
           </body.row>
         {{/each}}
diff --git a/ui/admin/app/components/form/role/add-principals/index.hbs b/ui/admin/app/components/form/role/add-principals/index.hbs
index 403de7679..04cde2bbb 100644
--- a/ui/admin/app/components/form/role/add-principals/index.hbs
+++ b/ui/admin/app/components/form/role/add-principals/index.hbs
@@ -19,6 +19,7 @@
           <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
           <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
           <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+          <row.headerCell>{{t 'resources.scope.title'}}</row.headerCell>
           <row.headerCell>{{t 'form.description.label'}}</row.headerCell>
         </header.row>
       </table.header>
@@ -37,7 +38,6 @@
                   components without resorting to heavy-handed grids
                   or contextualization.  This is a one-off.
                 }}
-                <br />
                 &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;
                 <Rose::Badge>{{principal.accountName}}</Rose::Badge>
               {{/if}}
@@ -51,6 +51,9 @@
                   )
                 }}</Rose::Badge>
             </row.cell>
+            <row.cell>
+              <ScopeBadge @scope={{principal.scopeModel}} />
+            </row.cell>
             <row.cell>{{principal.description}}</row.cell>
           </body.row>
         {{/each}}
diff --git a/ui/admin/app/components/scope-badge/index.hbs b/ui/admin/app/components/scope-badge/index.hbs
new file mode 100644
index 000000000..864817aa2
--- /dev/null
+++ b/ui/admin/app/components/scope-badge/index.hbs
@@ -0,0 +1,7 @@
+<Rose::Badge
+  @icon={{if
+    @scope.isProject
+    'flight-icons/svg/grid-16'
+    (if @scope.isOrg 'flight-icons/svg/org-16' 'flight-icons/svg/globe-16')
+  }}
+>{{@scope.displayName}}</Rose::Badge>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
index b4c479eda..d88ecc12b 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
@@ -26,6 +26,7 @@
           <header.row as |row|>
             <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
             <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+            <row.headerCell>{{t 'resources.scope.title'}}</row.headerCell>
             <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
           </header.row>
         </table.header>
@@ -47,6 +48,9 @@
                   <code>{{member.id}}</code>
                 </Copyable>
               </row.cell>
+              <row.cell>
+                <ScopeBadge @scope={{member.scopeModel}} />
+              </row.cell>
               <row.cell>
                 {{#if (can 'removeMembers group' @model.group)}}
                   <Rose::Dropdown
diff --git a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
index 0dd8125f2..6d17d1259 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
@@ -36,8 +36,9 @@
         <table.header as |header|>
           <header.row as |row|>
             <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
             <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+            <row.headerCell>{{t 'resources.scope.title'}}</row.headerCell>
             <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
           </header.row>
         </table.header>
@@ -51,9 +52,6 @@
                   >{{principal.model.accountName}}</Rose::Badge>
                 {{/if}}
               </row.headerCell>
-              <row.cell>
-                {{t (concat 'resources.role.principal.types.' principal.type)}}
-              </row.cell>
               <row.cell>
                 <Copyable
                   @text={{principal.model.id}}
@@ -63,6 +61,14 @@
                   <code>{{principal.model.id}}</code>
                 </Copyable>
               </row.cell>
+              <row.cell>
+                <Rose::Badge>{{t
+                    (concat 'resources.role.principal.types.' principal.type)
+                  }}</Rose::Badge>
+              </row.cell>
+              <row.cell>
+                <ScopeBadge @scope={{principal.model.scopeModel}} />
+              </row.cell>
               <row.cell>
                 {{#if (can 'removePrincipals role' @model.role)}}
                   <Rose::Dropdown