From 02682cb0080f756a7b2982edd45eb7a07f2d02e4 Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Wed, 6 Oct 2021 16:00:23 -0400
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20user=20"account?=
 =?UTF-8?q?=20name"=20wherever=20users=20are=20listed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/api/addon/models/user.js               | 30 +++++++++++++++++++
 .../form/group/add-members/index.hbs          | 16 ++++++----
 .../form/role/add-principals/index.hbs        | 16 ++++++----
 .../scopes/scope/groups/group/members.hbs     |  3 ++
 .../scopes/scope/roles/role/principals.hbs    |  3 ++
 .../templates/scopes/scope/users/index.hbs    |  3 ++
 6 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/addons/api/addon/models/user.js b/addons/api/addon/models/user.js
index 49fe64520..452a64889 100644
--- a/addons/api/addon/models/user.js
+++ b/addons/api/addon/models/user.js
@@ -1,5 +1,6 @@
 import GeneratedUserModel from '../generated/models/user';
 import { attr } from '@ember-data/model';
+import { computed } from '@ember/object';
 import { A } from '@ember/array';
 
 export default class UserModel extends GeneratedUserModel {
@@ -16,6 +17,35 @@ export default class UserModel extends GeneratedUserModel {
   })
   account_ids;
 
+  /**
+   * Represents the user's primary account email, if any.
+   * @type {string}
+   */
+  @attr('string', { readOnly: true }) email;
+
+  /**
+   * Represents the user's primary account full_name, if any.
+   * @type {string}
+   */
+  @attr('string', { readOnly: true }) full_name;
+
+  /**
+   * Represents the user's primary account login_name, if any.
+   * @type {string}
+   */
+  @attr('string', { readOnly: true }) login_name;
+
+  /**
+   * Convenience for getting a reasonable string that names the account.
+   * There are many options, so we fallback in order of precedence.
+   * @type {string}
+   */
+  @computed('email,full_name,login_name,displayName')
+  get accountName() {
+    const { email, full_name, login_name } = this;
+    return email || full_name || login_name;
+  }
+
   // =methods
 
   /**
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 c9d68523c..b5e7cab8c 100644
--- a/ui/admin/app/components/form/group/add-members/index.hbs
+++ b/ui/admin/app/components/form/group/add-members/index.hbs
@@ -16,21 +16,25 @@
     <Rose::Table as |table|>
       <table.header as |header|>
         <header.row as |row|>
-          <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
           <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+          <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+          <row.headerCell>{{t 'form.description.label'}}</row.headerCell>
         </header.row>
       </table.header>
       <table.body as |body|>
         {{#each this.availableUsers as |user|}}
           <body.row as |row|>
-            <row.cell>
+            <row.headerCell>
               <form.checkbox
-                @label={{user.id}}
-                @description={{user.description}}
+                @label={{user.displayName}}
                 onChange={{fn this.toggleMember user}}
               />
-            </row.cell>
-            <row.cell>{{user.name}}</row.cell>
+              {{#if user.accountName}}
+                <br /><Rose::Badge>{{user.accountName}}</Rose::Badge>
+              {{/if}}
+            </row.headerCell>
+            <row.cell><code>{{user.id}}</code></row.cell>
+            <row.cell>{{user.description}}</row.cell>
           </body.row>
         {{/each}}
       </table.body>
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 267a44584..10bb5bb05 100644
--- a/ui/admin/app/components/form/role/add-principals/index.hbs
+++ b/ui/admin/app/components/form/role/add-principals/index.hbs
@@ -16,22 +16,25 @@
     <Rose::Table as |table|>
       <table.header as |header|>
         <header.row as |row|>
-          <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
           <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 'form.description.label'}}</row.headerCell>
         </header.row>
       </table.header>
       <table.body as |body|>
         {{#each this.filteredPrincipals as |principal|}}
           <body.row as |row|>
-            <row.cell>
+            <row.headerCell>
               <form.checkbox
-                @label={{principal.id}}
-                @description={{principal.description}}
+                @label={{principal.displayName}}
                 onChange={{fn this.togglePrincipal principal}}
               />
-            </row.cell>
-            <row.cell>{{principal.name}}</row.cell>
+              {{#if principal.accountName}}
+                <br /><Rose::Badge>{{principal.accountName}}</Rose::Badge>
+              {{/if}}
+            </row.headerCell>
+            <row.cell>{{principal.id}}</row.cell>
             <row.cell>
               <Rose::Badge>{{t
                   (concat
@@ -40,6 +43,7 @@
                   )
                 }}</Rose::Badge>
             </row.cell>
+            <row.cell>{{principal.description}}</row.cell>
           </body.row>
         {{/each}}
       </table.body>
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 07dfe8014..d40856f1d 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs
@@ -15,6 +15,9 @@
         <body.row as |row|>
           <row.headerCell>
             {{member.displayName}}
+            {{#if member.accountName}}
+              <br /><Rose::Badge>{{member.accountName}}</Rose::Badge>
+            {{/if}}
           </row.headerCell>
           <row.cell>
             <Copyable
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 fec27196f..812a1eb13 100644
--- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
+++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs
@@ -16,6 +16,9 @@
         <body.row as |row|>
           <row.headerCell>
             {{principal.model.displayName}}
+            {{#if principal.model.accountName}}
+              <br /><Rose::Badge>{{principal.model.accountName}}</Rose::Badge>
+            {{/if}}
           </row.headerCell>
           <row.cell>
             {{t (concat 'resources.role.principal.types.' principal.type)}}
diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs
index 826e84805..2c78ceb2d 100644
--- a/ui/admin/app/templates/scopes/scope/users/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/index.hbs
@@ -46,6 +46,9 @@
                 {{else}}
                   {{user.displayName}}
                 {{/if}}
+                {{#if user.accountName}}
+                  <br /><Rose::Badge>{{user.accountName}}</Rose::Badge>
+                {{/if}}
                 <p>{{user.description}}</p>
               </row.headerCell>
               <row.cell>