From 399aeb1790f959de2d9a4011a0a63dd438cacad5 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Fri, 11 Nov 2022 18:19:07 -0800 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20badge=20migrations=20in?= =?UTF-8?q?=20admin=20ui=20part=201=20(#1439)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 🤖 badge migrations in admin ui part 1 --- .../auth-methods/auth-method/header/index.hbs | 4 +--- .../components/cred-source-type-badge/index.hbs | 14 +++++--------- .../auth-methods/auth-method/accounts/index.hbs | 4 ++-- .../auth-method/managed-groups/index.hbs | 2 +- .../managed-groups/managed-group/members.hbs | 2 +- .../templates/scopes/scope/auth-methods/index.hbs | 12 ++++++------ .../app/templates/scopes/scope/users/index.hbs | 2 +- .../templates/scopes/scope/users/user/accounts.hbs | 8 +++++--- .../app/templates/scopes/scope/workers/index.hbs | 7 ++++--- 9 files changed, 26 insertions(+), 29 deletions(-) diff --git a/ui/admin/app/components/auth-methods/auth-method/header/index.hbs b/ui/admin/app/components/auth-methods/auth-method/header/index.hbs index d108ee0de..92000d9e8 100644 --- a/ui/admin/app/components/auth-methods/auth-method/header/index.hbs +++ b/ui/admin/app/components/auth-methods/auth-method/header/index.hbs @@ -2,9 +2,7 @@ {{t 'resources.auth-method.title'}} {{#if @model.isPrimary}}   - - {{t 'states.primary'}} - +   {{/if}} diff --git a/ui/admin/app/components/cred-source-type-badge/index.hbs b/ui/admin/app/components/cred-source-type-badge/index.hbs index b9900a7ba..1ebfcae7c 100644 --- a/ui/admin/app/components/cred-source-type-badge/index.hbs +++ b/ui/admin/app/components/cred-source-type-badge/index.hbs @@ -1,13 +1,9 @@ {{#if @model.isUnknown}} - - {{t 'resources.credential.types.unknown'}} - + {{else if @model.isVault}} - - {{t (concat 'resources.credential-library.types.' @model.type)}} - + {{else}} - - {{t (concat 'resources.credential.types.' @model.type)}} - + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs index b82aca3cb..79ff09c78 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs @@ -61,7 +61,7 @@ {{account.attributes.full_name}} - {{account.type}} + - {{account.type}} + {{managed-group.description}} - {{managed-group.type}} + - {{member.type}} + {{authMethod.description}}

- - {{t (concat 'resources.auth-method.types.' authMethod.type)}} - + {{#if authMethod.isPrimary}} - - {{t 'states.primary'}} - + {{/if}} diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs index 756637a59..fd1ad44da 100644 --- a/ui/admin/app/templates/scopes/scope/users/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/index.hbs @@ -47,7 +47,7 @@ {{user.displayName}} {{/if}} {{#if user.accountName}} -
{{user.accountName}} +
{{/if}}

{{user.description}}

diff --git a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs index f0d232570..97156defc 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs @@ -38,9 +38,11 @@

{{account.description}}

- - {{t (concat 'resources.auth-method.types.' account.type)}} - + - - {{t + + /> {{/if}}