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}}