From 02682cb0080f756a7b2982edd45eb7a07f2d02e4 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Wed, 6 Oct 2021 16:00:23 -0400 Subject: [PATCH 1/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20user=20"accou?= =?UTF-8?q?nt=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 @@ - {{t 'form.id.label'}} {{t 'form.name.label'}} + {{t 'form.id.label'}} + {{t 'form.description.label'}} {{#each this.availableUsers as |user|}} - + - - {{user.name}} + {{#if user.accountName}} +
{{user.accountName}} + {{/if}} + + {{user.id}} + {{user.description}} {{/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 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 @@ - {{t 'form.id.label'}} {{t 'form.name.label'}} + {{t 'form.id.label'}} {{t 'form.type.label'}} + {{t 'form.description.label'}} {{#each this.filteredPrincipals as |principal|}} - + - - {{principal.name}} + {{#if principal.accountName}} +
{{principal.accountName}} + {{/if}} + + {{principal.id}} {{t (concat @@ -40,6 +43,7 @@ ) }} + {{principal.description}} {{/each}} 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 @@ {{member.displayName}} + {{#if member.accountName}} +
{{member.accountName}} + {{/if}} {{principal.model.displayName}} + {{#if principal.model.accountName}} +
{{principal.model.accountName}} + {{/if}} {{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}} +
{{user.accountName}} + {{/if}}

{{user.description}}

From c7e901ffd64bd74c97329c7b3416844a1b891e56 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 11 Oct 2021 14:10:21 -0400 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=F0=9F=A4=96=20tweak=20whitespace?= =?UTF-8?q?=20and=20formatting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/generated/factories/user.js | 3 ++- .../addon/styles/rose/components/table/_table.scss | 2 +- .../app/components/form/group/add-members/index.hbs | 10 +++++++++- .../app/components/form/role/add-principals/index.hbs | 10 +++++++++- ui/admin/app/templates/scopes/scope/sessions/index.hbs | 8 +++++++- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/addons/api/mirage/generated/factories/user.js b/addons/api/mirage/generated/factories/user.js index c8004c988..12b40a6e1 100644 --- a/addons/api/mirage/generated/factories/user.js +++ b/addons/api/mirage/generated/factories/user.js @@ -1,5 +1,5 @@ import { Factory } from 'ember-cli-mirage'; -import { random, date, datatype } from 'faker'; +import { random, date, datatype, internet } from 'faker'; /** * GeneratedUserModelFactory @@ -11,4 +11,5 @@ export default Factory.extend({ created_time: () => date.recent(), updated_time: () => date.recent(), disabled: () => datatype.boolean(), + email: () => internet.email().toLowerCase(), }); diff --git a/addons/rose/addon/styles/rose/components/table/_table.scss b/addons/rose/addon/styles/rose/components/table/_table.scss index 641b86a59..52deb8ece 100644 --- a/addons/rose/addon/styles/rose/components/table/_table.scss +++ b/addons/rose/addon/styles/rose/components/table/_table.scss @@ -31,7 +31,7 @@ .rose-table-cell, .rose-table-header-cell { - vertical-align: middle; + vertical-align: text-top; &.align-right { text-align: right; 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 b5e7cab8c..9a2767a7c 100644 --- a/ui/admin/app/components/form/group/add-members/index.hbs +++ b/ui/admin/app/components/form/group/add-members/index.hbs @@ -30,7 +30,15 @@ onChange={{fn this.toggleMember user}} /> {{#if user.accountName}} -
{{user.accountName}} + {{! + The following is a formatting hack since we don't have a great + way to manage micro-whitespace or alignment among separate + components without resorting to heavy-handed grids + or contextualization. This is a one-off. + }} +
+        + {{user.accountName}} {{/if}} {{user.id}} 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 10bb5bb05..af5e73e3d 100644 --- a/ui/admin/app/components/form/role/add-principals/index.hbs +++ b/ui/admin/app/components/form/role/add-principals/index.hbs @@ -31,7 +31,15 @@ onChange={{fn this.togglePrincipal principal}} /> {{#if principal.accountName}} -
{{principal.accountName}} + {{! + The following is a formatting hack since we don't have a great + way to manage micro-whitespace or alignment among separate + components without resorting to heavy-handed grids + or contextualization. This is a one-off. + }} +
+        + {{principal.accountName}} {{/if}} {{principal.id}} diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index bb07fabf9..297c68a70 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -47,7 +47,13 @@ {{sessionAggregate.session.id}} - {{sessionAggregate.user.displayName}} + + {{sessionAggregate.user.id}} + {{#if sessionAggregate.user.accountName}} +
{{sessionAggregate.user.accountName}} + {{/if}} + {{sessionAggregate.target.displayName}}