From 5d7c0180d5a8958d8685107a51d7f85e01f5899c Mon Sep 17 00:00:00 2001 From: Carlos Alcaide Date: Tue, 11 May 2021 08:33:44 -0700 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Update=20trim=20packa?= =?UTF-8?q?ge=20version=20resolution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the version we resolve of dependency package trim since older version has a security vulnerability. --- package.json | 3 ++- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ddf9fbe0f..267a13692 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,8 @@ "merge": "^2.1.1", "xmlhttprequest-ssl": "^1.6.2", "underscore": "^1.12.1", - "hosted-git-info": "3.0.8" + "hosted-git-info": "3.0.8", + "trim": "~1.0.1" }, "config": { "commitizen": { diff --git a/yarn.lock b/yarn.lock index bbeef576e..70b0c0a46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20565,10 +20565,10 @@ trim-trailing-lines@^1.0.0: resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ== -trim@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" - integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= +trim@0.0.1, trim@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/trim/-/trim-1.0.1.tgz#68e78f6178ccab9687a610752f4f5e5a7022ee8c" + integrity sha512-3JVP2YVqITUisXblCDq/Bi4P9457G/sdEamInkyvCsjbTcXLXIiG7XCb4kGMFWh6JGXesS3TKxOPtrncN/xe8w== trough@^1.0.0: version "1.0.5" From 49a85f1a7fab0388c6b5d95c14f68051591204ac Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 11 May 2021 14:13:24 -0400 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20prettier?= =?UTF-8?q?=20and=20apply=20HBS=20formatting=20to=20admin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/app/components/bread-crumbs.hbs | 14 +- ui/admin/app/components/copyable/index.hbs | 12 +- .../password/change-password/index.hbs | 31 +++-- .../form/account/password/index.hbs | 60 ++++---- .../account/password/set-password/index.hbs | 20 +-- .../app/components/form/auth-method/index.hbs | 5 +- .../form/auth-method/password/index.hbs | 40 +++--- .../form/group/add-members/index.hbs | 27 ++-- ui/admin/app/components/form/group/index.hbs | 31 +++-- .../components/form/host-catalog/index.hbs | 31 +++-- .../form/host-set/add-hosts/index.hbs | 33 +++-- .../app/components/form/host-set/index.hbs | 40 +++--- ui/admin/app/components/form/host/index.hbs | 51 +++---- .../form/role/add-principals/index.hbs | 32 +++-- .../app/components/form/role/grants/index.hbs | 47 ++++--- ui/admin/app/components/form/role/index.hbs | 79 +++++++---- ui/admin/app/components/form/scope/index.hbs | 31 +++-- .../form/target/add-host-sets/index.hbs | 29 ++-- ui/admin/app/components/form/target/index.hbs | 89 ++++++------ .../form/user/add-accounts/index.hbs | 25 ++-- ui/admin/app/components/form/user/index.hbs | 31 +++-- .../app/templates/account/change-password.hbs | 10 +- ui/admin/app/templates/application.hbs | 86 +++++++----- .../app/templates/authentication-complete.hbs | 8 +- .../app/templates/authentication-error.hbs | 19 ++- ui/admin/app/templates/head.hbs | 6 +- ui/admin/app/templates/index.hbs | 2 +- ui/admin/app/templates/scopes/index.hbs | 11 +- ui/admin/app/templates/scopes/scope.hbs | 130 +++++++----------- .../templates/scopes/scope/-header-nav.hbs | 20 ++- .../app/templates/scopes/scope/-sidebar.hbs | 36 ++--- .../templates/scopes/scope/auth-methods.hbs | 4 +- .../scopes/scope/auth-methods/auth-method.hbs | 8 +- .../auth-methods/auth-method/-actions.hbs | 20 +-- .../auth-methods/auth-method/-header.hbs | 14 +- .../auth-methods/auth-method/-navigation.hbs | 2 +- .../auth-methods/auth-method/accounts.hbs | 2 +- .../auth-method/accounts/account.hbs | 2 +- .../auth-method/accounts/account/-actions.hbs | 12 +- .../auth-method/accounts/account/-header.hbs | 12 +- .../accounts/account/-navigation.hbs | 10 +- .../auth-method/accounts/account/index.hbs | 6 +- .../accounts/account/set-password.hbs | 6 +- .../accounts/account/set-password/-header.hbs | 8 +- .../auth-method/accounts/index.hbs | 19 +-- .../auth-methods/auth-method/accounts/new.hbs | 6 +- .../auth-method/accounts/new/-header.hbs | 6 +- .../scope/auth-methods/auth-method/index.hbs | 6 +- .../scopes/scope/auth-methods/index.hbs | 65 +++++---- .../scopes/scope/auth-methods/new.hbs | 10 +- .../templates/scopes/scope/authenticate.hbs | 54 +++++--- .../scopes/scope/authenticate/index.hbs | 11 +- .../scopes/scope/authenticate/method.hbs | 2 +- .../scope/authenticate/method/index.hbs | 6 +- .../scopes/scope/authenticate/method/oidc.hbs | 12 +- ui/admin/app/templates/scopes/scope/edit.hbs | 32 +++-- ui/admin/app/templates/scopes/scope/error.hbs | 6 +- .../app/templates/scopes/scope/groups.hbs | 4 +- .../templates/scopes/scope/groups/group.hbs | 8 +- .../scopes/scope/groups/group/-actions.hbs | 16 ++- .../scopes/scope/groups/group/-header.hbs | 12 +- .../scopes/scope/groups/group/-navigation.hbs | 2 +- .../scopes/scope/groups/group/add-members.hbs | 8 +- .../groups/group/add-members/-header.hbs | 6 +- .../scopes/scope/groups/group/index.hbs | 6 +- .../scopes/scope/groups/group/members.hbs | 32 +++-- .../templates/scopes/scope/groups/index.hbs | 34 ++--- .../app/templates/scopes/scope/groups/new.hbs | 8 +- .../templates/scopes/scope/host-catalogs.hbs | 4 +- .../scope/host-catalogs/host-catalog.hbs | 8 +- .../host-catalogs/host-catalog/-actions.hbs | 22 +-- .../host-catalogs/host-catalog/-header.hbs | 12 +- .../host-catalog/-navigation.hbs | 2 +- .../host-catalogs/host-catalog/host-sets.hbs | 4 +- .../host-catalog/host-sets/host-set.hbs | 2 +- .../host-sets/host-set/-actions.hbs | 20 ++- .../host-sets/host-set/-header.hbs | 12 +- .../host-sets/host-set/-navigation.hbs | 10 +- .../host-sets/host-set/add-hosts.hbs | 8 +- .../host-sets/host-set/add-hosts/-header.hbs | 6 +- .../host-set/create-and-add-host.hbs | 6 +- .../host-set/create-and-add-host/-header.hbs | 6 +- .../host-catalog/host-sets/host-set/hosts.hbs | 36 ++--- .../host-catalog/host-sets/host-set/index.hbs | 6 +- .../host-catalog/host-sets/index.hbs | 29 ++-- .../host-catalog/host-sets/new.hbs | 6 +- .../host-catalog/host-sets/new/-header.hbs | 6 +- .../host-catalogs/host-catalog/hosts.hbs | 4 +- .../host-catalogs/host-catalog/hosts/host.hbs | 2 +- .../host-catalog/hosts/host/-actions.hbs | 12 +- .../host-catalog/hosts/host/-header.hbs | 12 +- .../host-catalog/hosts/host/-navigation.hbs | 2 +- .../host-catalog/hosts/host/index.hbs | 6 +- .../host-catalog/hosts/index.hbs | 29 ++-- .../host-catalogs/host-catalog/hosts/new.hbs | 6 +- .../host-catalog/hosts/new/-header.hbs | 6 +- .../host-catalogs/host-catalog/index.hbs | 6 +- .../scopes/scope/host-catalogs/index.hbs | 44 +++--- .../scopes/scope/host-catalogs/new.hbs | 10 +- ui/admin/app/templates/scopes/scope/index.hbs | 2 +- ui/admin/app/templates/scopes/scope/new.hbs | 12 +- ui/admin/app/templates/scopes/scope/roles.hbs | 4 +- .../templates/scopes/scope/roles/index.hbs | 34 ++--- .../app/templates/scopes/scope/roles/new.hbs | 8 +- .../app/templates/scopes/scope/roles/role.hbs | 8 +- .../scopes/scope/roles/role/-actions.hbs | 14 +- .../scopes/scope/roles/role/-header.hbs | 12 +- .../scopes/scope/roles/role/-navigation.hbs | 2 +- .../scope/roles/role/add-principals.hbs | 8 +- .../roles/role/add-principals/-header.hbs | 6 +- .../scopes/scope/roles/role/grants.hbs | 10 +- .../scope/roles/role/grants/-header.hbs | 12 +- .../scopes/scope/roles/role/index.hbs | 6 +- .../scopes/scope/roles/role/principals.hbs | 32 +++-- .../scope/roles/role/principals/-header.hbs | 12 +- .../app/templates/scopes/scope/scopes.hbs | 6 +- .../templates/scopes/scope/scopes/index.hbs | 41 +++--- .../app/templates/scopes/scope/sessions.hbs | 4 +- .../templates/scopes/scope/sessions/index.hbs | 63 ++++++--- .../app/templates/scopes/scope/targets.hbs | 4 +- .../templates/scopes/scope/targets/index.hbs | 39 +++--- .../templates/scopes/scope/targets/new.hbs | 10 +- .../templates/scopes/scope/targets/target.hbs | 8 +- .../scopes/scope/targets/target/-actions.hbs | 14 +- .../scopes/scope/targets/target/-header.hbs | 12 +- .../scope/targets/target/-navigation.hbs | 2 +- .../scope/targets/target/add-host-sets.hbs | 19 +-- .../targets/target/add-host-sets/-header.hbs | 6 +- .../scopes/scope/targets/target/host-sets.hbs | 45 +++--- .../scopes/scope/targets/target/index.hbs | 6 +- ui/admin/app/templates/scopes/scope/users.hbs | 4 +- .../templates/scopes/scope/users/index.hbs | 34 ++--- .../app/templates/scopes/scope/users/new.hbs | 8 +- .../app/templates/scopes/scope/users/user.hbs | 8 +- .../scopes/scope/users/user/-actions.hbs | 16 ++- .../scopes/scope/users/user/-header.hbs | 12 +- .../scopes/scope/users/user/-navigation.hbs | 2 +- .../scopes/scope/users/user/accounts.hbs | 35 +++-- .../scopes/scope/users/user/add-accounts.hbs | 19 +-- .../scope/users/user/add-accounts/-header.hbs | 4 +- .../scopes/scope/users/user/index.hbs | 6 +- ui/admin/package.json | 3 +- yarn.lock | 5 + 143 files changed, 1389 insertions(+), 1135 deletions(-) diff --git a/ui/admin/app/components/bread-crumbs.hbs b/ui/admin/app/components/bread-crumbs.hbs index 3c30c0e0c..ba45ae557 100644 --- a/ui/admin/app/components/bread-crumbs.hbs +++ b/ui/admin/app/components/bread-crumbs.hbs @@ -3,10 +3,10 @@ {{#if this.scope.org}} {{#unless this.scope.org.isGlobal}} {{#if this.session.data.authenticated.isGlobal}} - - {{t "resources.org.title_plural"}} + + {{t 'resources.org.title_plural'}} - + {{this.scope.org.displayName}} {{/if}} @@ -14,10 +14,10 @@ {{/if}} {{#if this.scope.project}} - - {{t "resources.project.title_plural"}} + + {{t 'resources.project.title_plural'}} - + {{this.scope.project.displayName}} {{/if}} @@ -34,4 +34,4 @@ {{/if}} {{/each}} - + \ No newline at end of file diff --git a/ui/admin/app/components/copyable/index.hbs b/ui/admin/app/components/copyable/index.hbs index ac3474940..a1a62e7f2 100644 --- a/ui/admin/app/components/copyable/index.hbs +++ b/ui/admin/app/components/copyable/index.hbs @@ -1,16 +1,16 @@ {{#if this.copied}} - + {{yield}} {{else}} - + {{yield}} {{/if}} @@ -19,12 +19,12 @@ {{this.actionText}} {{/if}} - + \ No newline at end of file diff --git a/ui/admin/app/components/form/account/password/change-password/index.hbs b/ui/admin/app/components/form/account/password/change-password/index.hbs index 954da26c1..aff86365d 100644 --- a/ui/admin/app/components/form/account/password/change-password/index.hbs +++ b/ui/admin/app/components/form/account/password/change-password/index.hbs @@ -1,5 +1,5 @@ + autocomplete='current-password' + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -26,14 +27,15 @@ + autocomplete='new-password' + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -45,7 +47,8 @@ + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/account/password/index.hbs b/ui/admin/app/components/form/account/password/index.hbs index 740ea22a5..6c4ac649a 100644 --- a/ui/admin/app/components/form/account/password/index.hbs +++ b/ui/admin/app/components/form/account/password/index.hbs @@ -7,20 +7,22 @@ as |form| > + @value={{@model.type}} + @label={{t 'form.type.label'}} + readonly={{true}} + @disabled={{true}} + /> + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -31,15 +33,16 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -50,13 +53,14 @@ + as |field| + > {{#if @model.errors.login_name}} {{#each @model.errors.login_name as |error|}} @@ -68,14 +72,15 @@ {{#if @model.isNew}} + autocomplete='new-password' + as |field| + > {{#if @model.errors.password}} {{#each @model.errors.password as |error|}} @@ -88,8 +93,9 @@ + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/account/password/set-password/index.hbs b/ui/admin/app/components/form/account/password/set-password/index.hbs index 9008a9094..0a1b34ef8 100644 --- a/ui/admin/app/components/form/account/password/set-password/index.hbs +++ b/ui/admin/app/components/form/account/password/set-password/index.hbs @@ -6,15 +6,16 @@ > + autocomplete='new-password' + as |field| + > {{#if @model.errors.password}} {{#each @model.errors.password as |error|}} @@ -27,7 +28,8 @@ + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/auth-method/index.hbs b/ui/admin/app/components/form/auth-method/index.hbs index 907940056..478c2ea91 100644 --- a/ui/admin/app/components/form/auth-method/index.hbs +++ b/ui/admin/app/components/form/auth-method/index.hbs @@ -1,7 +1,8 @@ {{#if @model.type}} - {{component (concat "form/auth-method/" @model.type) + {{component + (concat 'form/auth-method/' @model.type) model=@model submit=@submit cancel=@cancel }} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/components/form/auth-method/password/index.hbs b/ui/admin/app/components/form/auth-method/password/index.hbs index 2704507ec..57cbc1af0 100644 --- a/ui/admin/app/components/form/auth-method/password/index.hbs +++ b/ui/admin/app/components/form/auth-method/password/index.hbs @@ -7,20 +7,22 @@ as |form| > + @value={{@model.type}} + @label={{t 'form.type.label'}} + readonly={{true}} + @disabled={{true}} + /> + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -31,15 +33,16 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -51,7 +54,8 @@ - + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> + \ No newline at end of file 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 53cfd450f..341d0e03f 100644 --- a/ui/admin/app/components/form/group/add-members/index.hbs +++ b/ui/admin/app/components/form/group/add-members/index.hbs @@ -1,6 +1,6 @@ {{#if this.availableUsers}} + @submitText={{t 'resources.group.actions.add-members'}} + @cancelText={{t 'actions.cancel'}} + /> @@ -26,7 +27,8 @@ + onChange={{fn this.toggleMember user}} + /> {{user.name}} @@ -39,14 +41,17 @@ {{#unless this.availableUsers}} - + - {{t "resources.group.messages.no-members.description"}} + {{t 'resources.group.messages.no-members.description'}} - - - {{t "actions.back"}} + + + {{t 'actions.back'}} - -{{/unless}} + +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/components/form/group/index.hbs b/ui/admin/app/components/form/group/index.hbs index 0e024b1fb..a0c3230ef 100644 --- a/ui/admin/app/components/form/group/index.hbs +++ b/ui/admin/app/components/form/group/index.hbs @@ -8,14 +8,15 @@ > + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -26,15 +27,16 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -46,8 +48,9 @@ + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs index 0e024b1fb..a0c3230ef 100644 --- a/ui/admin/app/components/form/host-catalog/index.hbs +++ b/ui/admin/app/components/form/host-catalog/index.hbs @@ -8,14 +8,15 @@ > + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -26,15 +27,16 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -46,8 +48,9 @@ + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/host-set/add-hosts/index.hbs b/ui/admin/app/components/form/host-set/add-hosts/index.hbs index 1d467c2ef..7c851e376 100644 --- a/ui/admin/app/components/form/host-set/add-hosts/index.hbs +++ b/ui/admin/app/components/form/host-set/add-hosts/index.hbs @@ -1,6 +1,6 @@ {{#if this.hasAvailableHosts}} + @submitText={{t 'actions.add-hosts'}} + @cancelText={{t 'actions.cancel'}} + /> - {{t "form.name.label"}} - {{t "form.type.label"}} - {{t "form.id.label"}} + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} @@ -27,7 +28,8 @@ + onChange={{fn this.toggleHost host}} + /> {{host.name}} @@ -43,14 +45,19 @@ {{#unless this.hasAvailableHosts}} - + - {{t "resources.host-set.host.messages.add-none.description"}} + {{t 'resources.host-set.host.messages.add-none.description'}} - - - {{t "actions.back"}} + + + {{t 'actions.back'}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/components/form/host-set/index.hbs b/ui/admin/app/components/form/host-set/index.hbs index d457ad0e7..00de7dca1 100644 --- a/ui/admin/app/components/form/host-set/index.hbs +++ b/ui/admin/app/components/form/host-set/index.hbs @@ -8,20 +8,22 @@ > + @value={{@model.type}} + @label={{t 'form.type.label'}} + readonly={{true}} + @disabled={{true}} + /> + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -32,15 +34,16 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -52,8 +55,9 @@ + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/host/index.hbs b/ui/admin/app/components/form/host/index.hbs index b5a931880..78d0b0a73 100644 --- a/ui/admin/app/components/form/host/index.hbs +++ b/ui/admin/app/components/form/host/index.hbs @@ -8,20 +8,22 @@ > + @value={{@model.type}} + @label={{t 'form.type.label'}} + readonly={{true}} + @disabled={{true}} + /> + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -32,15 +34,16 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -51,14 +54,15 @@ + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -70,8 +74,9 @@ + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file 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 0787766ab..dc6ad4f5a 100644 --- a/ui/admin/app/components/form/role/add-principals/index.hbs +++ b/ui/admin/app/components/form/role/add-principals/index.hbs @@ -1,6 +1,6 @@ {{#if this.hasAvailablePrincipals}} + @submitText={{t 'actions.add-principals'}} + @cancelText={{t 'actions.cancel'}} + /> @@ -27,11 +28,17 @@ + onChange={{fn this.togglePrincipal principal}} + /> {{principal.name}} - {{t (concat 'resources.role.principal.types.' principal.constructor.modelName)}} + {{t + (concat + 'resources.role.principal.types.' + principal.constructor.modelName + ) + }} {{/each}} @@ -43,14 +50,17 @@ {{#unless this.hasAvailablePrincipals}} - + - {{t "resources.role.principal.messages.none.description"}} + {{t 'resources.role.principal.messages.none.description'}} - - - {{t "actions.back"}} + + + {{t 'actions.back'}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/components/form/role/grants/index.hbs b/ui/admin/app/components/form/role/grants/index.hbs index bbe47e7d6..18f1837b9 100644 --- a/ui/admin/app/components/form/role/grants/index.hbs +++ b/ui/admin/app/components/form/role/grants/index.hbs @@ -5,28 +5,29 @@ as |form| > - {{!-- Add grant field (only one per form) --}} + {{! Add grant field (only one per form) }} + as |input| + > - {{t "resources.role.grant.actions.create"}} + {{t 'resources.role.grant.actions.create'}} - + - {{t "actions.add"}} + {{t 'actions.add'}} @@ -57,26 +58,27 @@ + as |input| + > - {{t "form.grant.label"}} + {{t 'form.grant.label'}} - + - {{t "actions.remove"}} + {{t 'actions.remove'}} @@ -85,7 +87,8 @@ + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/role/index.hbs b/ui/admin/app/components/form/role/index.hbs index 7f81d2296..169621362 100644 --- a/ui/admin/app/components/form/role/index.hbs +++ b/ui/admin/app/components/form/role/index.hbs @@ -8,14 +8,15 @@ > + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -26,15 +27,16 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -46,46 +48,62 @@ {{#unless @model.isNew}}
- {{t "form.grant_scope.label"}} - - {{t "form.grant_scope.help"}} + {{t + 'form.grant_scope.label' + }} + + {{t 'form.grant_scope.help'}} - + + @icon={{if + this.selectedGrantScope.isProject + 'app-icons/project' + (if + this.selectedGrantScope.isOrg 'app-icons/org' 'app-icons/global' + ) + }} + as |dropdown| + >
    {{#each @grantScopes as |grantScope|}} -
  • +
  • -
      +
        {{#each grantScope.subScopes as |subScope|}} -
      • +
      • -
          +
            {{#each subScope.subScopes as |subSubScope|}} -
          • +
          • @@ -104,8 +122,9 @@ + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/scope/index.hbs b/ui/admin/app/components/form/scope/index.hbs index 0e024b1fb..a0c3230ef 100644 --- a/ui/admin/app/components/form/scope/index.hbs +++ b/ui/admin/app/components/form/scope/index.hbs @@ -8,14 +8,15 @@ > + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -26,15 +27,16 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -46,8 +48,9 @@ + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/target/add-host-sets/index.hbs b/ui/admin/app/components/form/target/add-host-sets/index.hbs index 372c52f69..3bfd6b1b7 100644 --- a/ui/admin/app/components/form/target/add-host-sets/index.hbs +++ b/ui/admin/app/components/form/target/add-host-sets/index.hbs @@ -1,6 +1,6 @@ {{#if this.hasAvailableHostSets}} + @submitText={{t 'actions.add-host-sets'}} + @cancelText={{t 'actions.cancel'}} + /> @@ -28,11 +29,14 @@ + onChange={{fn this.toggleHostSet hostSet}} + /> {{hostSet.name}} - {{t (concat 'resources.host-set.types.' hostSet.type)}} + {{t + (concat 'resources.host-set.types.' hostSet.type) + }} {{hostSet.host_catalog_id}} @@ -47,14 +51,17 @@ {{#unless this.hasAvailableHostSets}} - + - {{t "resources.target.host-set.messages.none.description"}} + {{t 'resources.target.host-set.messages.none.description'}} - - - {{t "actions.back"}} + + + {{t 'actions.back'}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/components/form/target/index.hbs b/ui/admin/app/components/form/target/index.hbs index afbfc76b0..8ce121b0a 100644 --- a/ui/admin/app/components/form/target/index.hbs +++ b/ui/admin/app/components/form/target/index.hbs @@ -8,19 +8,21 @@ > + @value={{@model.type}} + @label={{t 'form.type.label'}} + readonly={{true}} + @disabled={{true}} + /> + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -31,13 +33,14 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -48,15 +51,16 @@ + @helperText={{t 'form.session_max_seconds.help'}} + min='0' + step='1' + as |field| + > {{#if @model.errors.session_max_seconds}} {{#each @model.errors.session_max_seconds as |error|}} @@ -67,15 +71,16 @@ + @helperText={{t 'form.session_connection_limit.help'}} + min='-1' + step='1' + as |field| + > {{#if @model.errors.session_connection_limit}} {{#each @model.errors.session_connection_limit as |error|}} @@ -85,18 +90,19 @@ {{/if}} - {{!-- TODO this is a type-specific field --}} + {{! TODO this is a type-specific field }} - {{!-- TODO need to figure out how to reference `attributes.errors` here --}} + @helperText={{t 'form.default_port.help'}} + min='0' + step='1' + as |field| + > + {{! TODO need to figure out how to reference `attributes.errors` here }} {{#if @model.errors.default_port}} {{#each @model.errors.default_port as |error|}} @@ -108,8 +114,9 @@ + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/components/form/user/add-accounts/index.hbs b/ui/admin/app/components/form/user/add-accounts/index.hbs index f3bfed288..eb9ef4123 100644 --- a/ui/admin/app/components/form/user/add-accounts/index.hbs +++ b/ui/admin/app/components/form/user/add-accounts/index.hbs @@ -1,6 +1,6 @@ {{#if this.hasAvailableAccounts}} + @submitText={{t 'resources.user.actions.add-accounts'}} + @cancelText={{t 'actions.cancel'}} + /> @@ -27,7 +28,8 @@ + onChange={{fn this.toggleAccount account}} + /> {{account.username}} @@ -43,14 +45,17 @@ {{#unless this.hasAvailableAccounts}} - + - {{t "resources.user.messages.no-accounts.description"}} + {{t 'resources.user.messages.no-accounts.description'}} - - - {{t "actions.back"}} + + + {{t 'actions.back'}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/components/form/user/index.hbs b/ui/admin/app/components/form/user/index.hbs index 0e024b1fb..a0c3230ef 100644 --- a/ui/admin/app/components/form/user/index.hbs +++ b/ui/admin/app/components/form/user/index.hbs @@ -8,14 +8,15 @@ > + as |field| + > {{#if @model.errors.name}} {{#each @model.errors.name as |error|}} @@ -26,15 +27,16 @@ + as |field| + > {{#if @model.errors.description}} {{#each @model.errors.description as |error|}} @@ -46,8 +48,9 @@ + @enableEditText={{t 'actions.edit-form'}} + @submitText={{t 'actions.save'}} + @cancelText={{t 'actions.cancel'}} + /> - + \ No newline at end of file diff --git a/ui/admin/app/templates/account/change-password.hbs b/ui/admin/app/templates/account/change-password.hbs index 4f5dc25fb..1c87677d4 100644 --- a/ui/admin/app/templates/account/change-password.hbs +++ b/ui/admin/app/templates/account/change-password.hbs @@ -1,4 +1,4 @@ -{{page-title (t "actions.change-password")}} +{{page-title (t 'actions.change-password')}} @@ -7,14 +7,14 @@ -

            {{t "actions.change-password"}}

            +

            {{t 'actions.change-password'}}

            @@ -22,4 +22,4 @@
            -
            + \ No newline at end of file diff --git a/ui/admin/app/templates/application.hbs b/ui/admin/app/templates/application.hbs index 710575f9c..9408904ce 100644 --- a/ui/admin/app/templates/application.hbs +++ b/ui/admin/app/templates/application.hbs @@ -3,49 +3,55 @@ - - + + {{#if this.session.isAuthenticated}} - {{outlet "header-nav"}} + {{outlet 'header-nav'}} - + {{t 'actions.change-password'}} - + {{t 'actions.deauthenticate'}} - + + @changed={{route-action 'toggleTheme'}} + as |radioGroup| + > - + - + - + @@ -65,12 +71,12 @@ - + {{company-copyright}} {{app-name}} - {{t "titles.documentation"}} + {{t 'titles.documentation'}} @@ -92,45 +98,51 @@ {{#if confirmation.options.isAbandonConfirm}} + as |dialog| + > -

            {{t "questions.abandon-confirm"}}

            +

            {{t 'questions.abandon-confirm'}}

            - - {{t "actions.discard"}} + + {{t 'actions.discard'}} - - {{t "actions.cancel"}} + + {{t 'actions.cancel'}}
            {{else}} + as |dialog| + >

            {{confirmation.text}}

            - - {{t "actions.ok"}} + + {{t 'actions.ok'}} - - {{t "actions.cancel"}} + + {{t 'actions.cancel'}}
            {{/if}} -
            + \ No newline at end of file diff --git a/ui/admin/app/templates/authentication-complete.hbs b/ui/admin/app/templates/authentication-complete.hbs index cb1fb8eb3..b67b196aa 100644 --- a/ui/admin/app/templates/authentication-complete.hbs +++ b/ui/admin/app/templates/authentication-complete.hbs @@ -3,10 +3,10 @@
            - {{t "auth.descriptions.flow-success"}} + {{t 'auth.descriptions.flow-success'}} -
            + \ No newline at end of file diff --git a/ui/admin/app/templates/authentication-error.hbs b/ui/admin/app/templates/authentication-error.hbs index eac628eab..c2f31ff88 100644 --- a/ui/admin/app/templates/authentication-error.hbs +++ b/ui/admin/app/templates/authentication-error.hbs @@ -1,20 +1,17 @@ -{{page-title (t "auth.titles.flow-error")}} +{{page-title (t 'auth.titles.flow-error')}}
            - - {{t "auth.descriptions.flow-error"}} -
            + + {{t 'auth.descriptions.flow-error'}} +
            - {{t "actions.copy-error-detail-to-clipboard"}} + {{t 'actions.copy-error-detail-to-clipboard'}}
            -
            + \ No newline at end of file diff --git a/ui/admin/app/templates/head.hbs b/ui/admin/app/templates/head.hbs index b21eccd98..ca7ac710c 100644 --- a/ui/admin/app/templates/head.hbs +++ b/ui/admin/app/templates/head.hbs @@ -1,6 +1,6 @@ -{{!-- +{{! Add content you wish automatically added to the documents head here. The 'model' available in this template can be populated by setting values on the 'head-data' service. ---}} -{{this.model.title}} +}} +{{this.model.title}} \ No newline at end of file diff --git a/ui/admin/app/templates/index.hbs b/ui/admin/app/templates/index.hbs index 0ec72cc33..ede5bde28 100644 --- a/ui/admin/app/templates/index.hbs +++ b/ui/admin/app/templates/index.hbs @@ -1 +1 @@ -

            {{app-name}}

            +

            {{app-name}}

            \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/index.hbs b/ui/admin/app/templates/scopes/index.hbs index 22ebdf082..f4a0d7cfe 100644 --- a/ui/admin/app/templates/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/index.hbs @@ -7,11 +7,12 @@
            + @title={{t 'auth.titles.no-scopes'}} + @icon='alert-circle-outline' + as |message| + > - {{t "auth.descriptions.no-scopes"}} + {{t 'auth.descriptions.no-scopes'}} @@ -19,4 +20,4 @@ -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index 07943d64f..b25624cb9 100644 --- a/ui/admin/app/templates/scopes/scope.hbs +++ b/ui/admin/app/templates/scopes/scope.hbs @@ -1,12 +1,12 @@ {{#if @model.isOrg}} - {{page-title (t "resources.org.title_plural") }} + {{page-title (t 'resources.org.title_plural')}} {{page-title @model.displayName}} {{/if}} {{#if @model.isProject}} - {{page-title (t "resources.org.title_plural") }} + {{page-title (t 'resources.org.title_plural')}} {{page-title this.scopes.selectedOrg.displayName}} - {{page-title (t "resources.project.title_plural") }} + {{page-title (t 'resources.project.title_plural')}} {{page-title @model.displayName}} {{/if}} @@ -16,54 +16,44 @@ {{#if @model.isGlobal}} - - - - {{t "resources.org.title_plural"}} + + + + {{t 'resources.org.title_plural'}} {{/if}} {{#if @model.isOrg}} - + {{#if this.session.data.authenticated.isGlobal}} - - - {{t "resources.org.title_plural"}} + + + {{t 'resources.org.title_plural'}} {{/if}} - - - {{t "resources.project.title_plural"}} + + + {{t 'resources.project.title_plural'}} {{/if}} {{#if @model.isProject}} - + {{#if this.session.data.authenticated.isGlobal}} - - - {{t "resources.org.title_plural"}} + + + {{t 'resources.org.title_plural'}} {{/if}} - - - {{t "resources.project.title_plural"}} + + + {{t 'resources.project.title_plural'}} - {{!-- TODO: after scope awareness refactor, update groups and roles - to support project scopes --}} + {{! TODO: after scope awareness refactor, update groups and roles + to support project scopes }} {{!-- @@ -80,71 +70,57 @@ --}} - - - - {{t "resources.session.title_plural"}} + + + + {{t 'resources.session.title_plural'}} - - - {{t "resources.target.title_plural"}} + + + {{t 'resources.target.title_plural'}} - - - {{t "resources.host-catalog.title_plural"}} + + + {{t 'resources.host-catalog.title_plural'}} {{/if}} {{#unless @model.isProject}} - - - - {{t "resources.user.title_plural"}} + + + + {{t 'resources.user.title_plural'}} - - - {{t "resources.group.title_plural"}} + + + {{t 'resources.group.title_plural'}} - - - {{t "resources.role.title_plural"}} + + + {{t 'resources.role.title_plural'}} - - - {{t "resources.auth-method.title_plural"}} + + + {{t 'resources.auth-method.title_plural'}} {{/unless}} {{#if @model.isOrg}} {{#if this.session.data.authenticated.isGlobal}} - - - {{t "resources.org.messages.settings.title"}} + + + {{t 'resources.org.messages.settings.title'}} {{/if}} {{/if}} {{#if @model.isProject}} - - - {{t "resources.project.messages.settings.title"}} + + + {{t 'resources.project.messages.settings.title'}} {{/if}} @@ -158,4 +134,4 @@
            - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/-header-nav.hbs b/ui/admin/app/templates/scopes/scope/-header-nav.hbs index c88135c5e..ebfc3ffad 100644 --- a/ui/admin/app/templates/scopes/scope/-header-nav.hbs +++ b/ui/admin/app/templates/scopes/scope/-header-nav.hbs @@ -1,15 +1,20 @@ {{#if this.session.data.authenticated.isGlobal}} - - {{t "titles.global"}} + + {{t 'titles.global'}} {{/if}} {{#each this.scopes.orgs as |scope|}} - + {{scope.displayName}} {{/each}} @@ -18,12 +23,13 @@ {{#if this.scopes.selectedProject}} {{#each this.scopes.projects as |scope|}} - + {{scope.displayName}} {{/each}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/-sidebar.hbs b/ui/admin/app/templates/scopes/scope/-sidebar.hbs index 45780e932..3b06e303e 100644 --- a/ui/admin/app/templates/scopes/scope/-sidebar.hbs +++ b/ui/admin/app/templates/scopes/scope/-sidebar.hbs @@ -1,26 +1,18 @@ - - - - {{t "resources.user.title_plural"}} + + + + {{t 'resources.user.title_plural'}} - - - {{t "resources.group.title_plural"}} + + + {{t 'resources.group.title_plural'}} - - - {{t "resources.role.title_plural"}} + + + {{t 'resources.role.title_plural'}} - - - {{t "resources.auth-method.title_plural"}} + + + {{t 'resources.auth-method.title_plural'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods.hbs b/ui/admin/app/templates/scopes/scope/auth-methods.hbs index 7dfce0f30..56fed08c5 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods.hbs @@ -1,3 +1,3 @@ -{{page-title (t "resources.auth-method.title_plural")}} +{{page-title (t 'resources.auth-method.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method.hbs index 016b284ad..837d1f984 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method.hbs @@ -7,19 +7,19 @@ - {{outlet "header"}} + {{outlet 'header'}} - {{outlet "navigation"}} + {{outlet 'navigation'}} - {{outlet "actions"}} + {{outlet 'actions'}} {{outlet}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs index d60954dfc..c46e656f8 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs @@ -1,9 +1,13 @@ - + {{#if (feature-flag 'primary-auth-method')}} {{#unless @model.isPrimary}} {{t 'resources.auth-method.actions.make-primary'}} @@ -11,24 +15,24 @@ {{#if @model.isPrimary}} {{t 'resources.auth-method.actions.remove-as-primary'}} {{/if}} {{/if}} - {{t "resources.account.actions.create"}} + {{t 'resources.account.actions.create'}} {{t 'resources.auth-method.actions.delete'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs index 693cdd815..5f93944c3 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-header.hbs @@ -1,21 +1,21 @@

            - {{t "resources.auth-method.title"}} + {{t 'resources.auth-method.title'}} {{#if (feature-flag 'primary-auth-method')}} {{#if @model.isPrimary}}   - + {{t 'states.primary'}}   {{/if}} {{/if}} - +

            -

            {{t "resources.auth-method.description"}}

            +

            {{t 'resources.auth-method.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs index 8862d9b4b..568445801 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-navigation.hbs @@ -5,4 +5,4 @@ {{t 'resources.account.title_plural'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs index 6ec5213a6..29730ea21 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts.hbs @@ -1,3 +1,3 @@ {{page-title (t 'resources.account.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs index fdb14a71f..7d32ecb0d 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account.hbs @@ -1,3 +1,3 @@ {{page-title @model.displayName}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-actions.hbs index 5914aab33..108a22afd 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-actions.hbs @@ -1,9 +1,13 @@ - + {{t 'resources.account.actions.delete'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs index 965f6b6ac..2f47ef694 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.account.title"}} - + {{t 'resources.account.title'}} +

            -

            {{t "resources.account.description"}}

            +

            {{t 'resources.account.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs index 5894be22e..a1f9d1fda 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/-navigation.hbs @@ -1,8 +1,12 @@ - + {{t 'titles.details'}} - + {{t 'actions.set-password'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs index 41e9ca5c6..118fea9a8 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/index.hbs @@ -1,5 +1,5 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs index 7d9679ccc..58be5da25 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password.hbs @@ -2,6 +2,6 @@ + @submit={{route-action 'setPassword' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs index c7d1d4670..da4406391 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/account/set-password/-header.hbs @@ -1,9 +1,9 @@ -

            {{t "resources.account.title"}}

            +

            {{t 'resources.account.title'}}

            {{t 'resources.account.messages.set-password.description'}}

            {{@model.id}} - + \ 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 ef401b53d..850e78c93 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 @@ -17,7 +17,7 @@ {{account.displayName}} @@ -30,8 +30,8 @@ {{account.id}} @@ -44,15 +44,18 @@ {{else}} - + - {{t "resources.account.messages.welcome.description"}} + {{t 'resources.account.messages.welcome.description'}} - - + + {{t 'resources.account.actions.create'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs index 41e9ca5c6..118fea9a8 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new.hbs @@ -1,5 +1,5 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs index 00086a2d0..0144711e6 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/new/-header.hbs @@ -1,4 +1,4 @@

            - {{t "titles.new"}} - -

            + {{t 'titles.new'}} + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs index 8a43bfb87..b82869296 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/index.hbs @@ -1,5 +1,5 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index f8038c37b..cb57f4f36 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -1,10 +1,10 @@

            - {{t "resources.auth-method.title_plural"}} - + {{t 'resources.auth-method.title_plural'}} +

            -

            {{t "resources.auth-method.description"}}

            +

            {{t 'resources.auth-method.description'}}

            @@ -14,12 +14,13 @@ {{#if @model}} + as |dropdown| + > {{t 'resources.auth-method.types.password'}} @@ -33,10 +34,14 @@ {{#if (feature-flag 'primary-auth-method')}} {{#unless this.hasPrimaryAuthMethod}} - {{t "resources.auth-method.messages.no-primary-auth-method.description"}} + {{t + 'resources.auth-method.messages.no-primary-auth-method.description' + }} {{/unless}} {{/if}} @@ -48,7 +53,7 @@ {{t 'form.type.label'}} {{t 'form.id.label'}} {{#if (feature-flag 'primary-auth-method')}} - + {{t 'titles.actions'}} {{/if}} @@ -66,7 +71,7 @@ {{#if authMethod.isOIDC}} {{#if (feature-flag 'oidc-crud')}} {{authMethod.displayName}} @@ -76,7 +81,7 @@ {{/if}} {{else}} {{authMethod.displayName}} @@ -92,8 +97,8 @@ {{authMethod.id}} @@ -101,29 +106,33 @@ {{#if (feature-flag 'primary-auth-method')}} {{#if authMethod.isPrimary}} - + {{t 'states.primary'}} {{/if}} + @icon='more-horizontal' + as |dropdown| + > {{#unless authMethod.isPrimary}} {{t 'resources.auth-method.actions.make-primary'}} {{/unless}} {{#if authMethod.isPrimary}} {{t 'resources.auth-method.actions.remove-as-primary'}} @@ -139,14 +148,18 @@ {{else}} - + {{t 'resources.auth-method.messages.welcome.description'}} - + @route='scopes.scope.auth-methods.new' + @query={{hash type='password'}} + > + {{t 'titles.new'}} @@ -154,4 +167,4 @@ {{/if}} -
            + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs index cb1f2e863..d4d2aaf6f 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs @@ -1,8 +1,8 @@ -{{page-title (t "titles.new")}} +{{page-title (t 'titles.new')}} -

            {{t "titles.new"}}

            +

            {{t 'titles.new'}}

            @@ -12,8 +12,8 @@ -
            + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs index 2edc1abd9..55977a188 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs @@ -1,4 +1,4 @@ -{{page-title (t "actions.authenticate")}} +{{page-title (t 'actions.authenticate')}} @@ -7,19 +7,26 @@ <:header> -

            {{t "actions.authenticate"}}

            +

            {{t 'actions.authenticate'}}

            <:body> -

            {{t "auth.descriptions.authenticating-with-org" name=@model.scope.displayName}}

            +

            {{t + 'auth.descriptions.authenticating-with-org' + name=@model.scope.displayName + }}

            - - {{t "titles.global"}} + @text={{t 'actions.choose-different-org'}} + @icon='user-organization' + as |dropdown| + > + + {{t 'titles.global'}} {{#each this.sortedScopes as |scope|}} - + {{scope.displayName}} {{/each}} @@ -31,11 +38,16 @@ {{#if (feature-flag 'oidc')}} {{! OIDC enable: list all auth methods }} {{#each @model.authMethods as |authMethod|}} - + {{#if authMethod.name}} {{authMethod.name}} {{else}} - {{t (concat "resources.auth-method.types." authMethod.type)}} + {{t + (concat 'resources.auth-method.types.' authMethod.type) + }} {{/if}} {{/each}} @@ -43,11 +55,16 @@ {{! OIDC disabled: filter out OIDC auth methods}} {{#each @model.authMethods as |authMethod|}} {{#unless authMethod.isOIDC}} - + {{#if authMethod.name}} {{authMethod.name}} {{else}} - {{t (concat "resources.auth-method.types." authMethod.type)}} + {{t + (concat 'resources.auth-method.types.' authMethod.type) + }} {{/if}} {{/unless}} @@ -61,11 +78,12 @@ {{#unless @model.authMethods}} + @title={{t 'resources.auth-method.messages.none.title'}} + @icon='alert-circle-outline' + as |message| + > - {{t "resources.auth-method.messages.none.description"}} + {{t 'resources.auth-method.messages.none.description'}} @@ -75,4 +93,4 @@
            -
            + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/authenticate/index.hbs b/ui/admin/app/templates/scopes/scope/authenticate/index.hbs index effd53cbd..b8dbc824f 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate/index.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate/index.hbs @@ -1,12 +1,13 @@ {{#unless @model}} + @title={{t 'resources.auth-method.messages.none.title'}} + @icon='alert-circle-outline' + as |message| + > - {{t "resources.auth-method.messages.none.description"}} + {{t 'resources.auth-method.messages.none.description'}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/authenticate/method.hbs b/ui/admin/app/templates/scopes/scope/authenticate/method.hbs index c24cd6895..e2147cab0 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate/method.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate/method.hbs @@ -1 +1 @@ -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs b/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs index e05057cee..14266bf9c 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate/method/index.hbs @@ -2,7 +2,7 @@ {{! OIDC enabled: show form for any auth method}} {{else}} @@ -10,8 +10,8 @@ {{#unless @model.isOIDC}} {{/unless}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/authenticate/method/oidc.hbs b/ui/admin/app/templates/scopes/scope/authenticate/method/oidc.hbs index 651b0a350..340e3649d 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate/method/oidc.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate/method/oidc.hbs @@ -1,24 +1,20 @@ <:header> - {{inline-svg "logo-app-full"}} + {{inline-svg 'logo-app-full'}}

            {{t 'resources.auth-method.messages.pending.title'}}

            <:body>

            {{t 'resources.auth-method.messages.pending.description'}}

            {{t 'resources.auth-method.questions.no-see-window'}} - + {{t 'actions.retry'}}

            - + {{t 'actions.cancel'}}

            -
            + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs index b73a39a1f..9e3898e0f 100644 --- a/ui/admin/app/templates/scopes/scope/edit.hbs +++ b/ui/admin/app/templates/scopes/scope/edit.hbs @@ -7,22 +7,22 @@ {{#if @model.isOrg}}

            - {{t "resources.org.title"}} - + {{t 'resources.org.title'}} +

            -

            {{t "resources.org.description"}}

            +

            {{t 'resources.org.description'}}

            {{/if}} {{#if @model.isProject}}

            - {{t "resources.project.title"}} - + {{t 'resources.project.title'}} +

            -

            {{t "resources.project.description"}}

            +

            {{t 'resources.project.description'}}

            {{/if}} {{@model.id}} @@ -37,11 +37,15 @@ - + {{#if @model.isOrg}} {{t 'resources.org.actions.delete'}} @@ -55,9 +59,9 @@ - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/error.hbs b/ui/admin/app/templates/scopes/scope/error.hbs index 4b50d06f4..eaa67a7d1 100644 --- a/ui/admin/app/templates/scopes/scope/error.hbs +++ b/ui/admin/app/templates/scopes/scope/error.hbs @@ -1,7 +1,7 @@ -{{page-title (t "errors.generic.title") }} +{{page-title (t 'errors.generic.title')}} {{#each @model.errors as |error|}} - + {{/each}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups.hbs b/ui/admin/app/templates/scopes/scope/groups.hbs index 0313da973..bb2281e44 100644 --- a/ui/admin/app/templates/scopes/scope/groups.hbs +++ b/ui/admin/app/templates/scopes/scope/groups.hbs @@ -1,3 +1,3 @@ -{{page-title (t "resources.group.title_plural")}} +{{page-title (t 'resources.group.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups/group.hbs b/ui/admin/app/templates/scopes/scope/groups/group.hbs index 016b284ad..837d1f984 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group.hbs @@ -7,19 +7,19 @@ - {{outlet "header"}} + {{outlet 'header'}} - {{outlet "navigation"}} + {{outlet 'navigation'}} - {{outlet "actions"}} + {{outlet 'actions'}} {{outlet}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs b/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs index 43f328ac3..c1a11742e 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs @@ -1,13 +1,17 @@ - - - {{t "resources.group.actions.add-members"}} + + + {{t 'resources.group.actions.add-members'}} {{t 'resources.group.actions.delete'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-header.hbs b/ui/admin/app/templates/scopes/scope/groups/group/-header.hbs index 6dab6766a..a6e575c17 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.group.title"}} - + {{t 'resources.group.title'}} +

            -

            {{t "resources.group.description"}}

            +

            {{t 'resources.group.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-navigation.hbs b/ui/admin/app/templates/scopes/scope/groups/group/-navigation.hbs index 43ebee5ef..4d47751db 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/-navigation.hbs @@ -5,4 +5,4 @@ {{t 'resources.group.messages.members.title'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs index 65383a92f..a85c01185 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/add-members.hbs @@ -1,8 +1,8 @@ -{{page-title (t "resources.group.messages.add-members.title")}} +{{page-title (t 'resources.group.messages.add-members.title')}} + @submit={{route-action 'addMembers' @model.group}} + @cancel={{route-action 'cancel'}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs b/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs index 207f55d46..71181a8df 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/add-members/-header.hbs @@ -1,5 +1,5 @@

            - {{t "resources.group.messages.add-members.title"}} - + {{t 'resources.group.messages.add-members.title'}} +

            -

            {{t "resources.group.messages.add-members.description"}}

            +

            {{t 'resources.group.messages.add-members.description'}}

            \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups/group/index.hbs b/ui/admin/app/templates/scopes/scope/groups/group/index.hbs index cf2d36c97..6a89a496d 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/index.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/index.hbs @@ -1,5 +1,5 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ 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 73dbf114c..a6512ef59 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs @@ -7,7 +7,7 @@ {{t 'form.name.label'}} {{t 'form.id.label'}} - {{t "titles.actions"}} + {{t 'titles.actions'}} @@ -19,25 +19,26 @@ {{member.id}} - + - {{t "actions.remove"}} + {{t 'actions.remove'}} @@ -49,15 +50,18 @@ {{else}} - + - {{t "resources.group.messages.members.description"}} + {{t 'resources.group.messages.members.description'}} - - + + {{t 'resources.group.actions.add-members'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups/index.hbs b/ui/admin/app/templates/scopes/scope/groups/index.hbs index 7dbf66358..64abb45ad 100644 --- a/ui/admin/app/templates/scopes/scope/groups/index.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/index.hbs @@ -6,15 +6,17 @@

            - {{t "resources.group.title_plural"}} - + {{t 'resources.group.title_plural'}} +

            -

            {{t "resources.group.description"}}

            +

            {{t 'resources.group.description'}}

            {{#if @model}} - {{t 'titles.new'}} + {{t + 'titles.new' + }} {{/if}} @@ -25,18 +27,15 @@ - {{t "form.name.label"}} - {{t "form.id.label"}} + {{t 'form.name.label'}} + {{t 'form.id.label'}} {{#each @model as |group|}} - + {{group.displayName}}

            {{group.description}}

            @@ -44,8 +43,8 @@ {{group.id}} @@ -58,12 +57,15 @@ {{else}} - + {{t 'resources.group.description'}} - - + + {{t 'titles.new'}} @@ -73,4 +75,4 @@ - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/groups/new.hbs b/ui/admin/app/templates/scopes/scope/groups/new.hbs index 0f1c5c13a..75f491203 100644 --- a/ui/admin/app/templates/scopes/scope/groups/new.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/new.hbs @@ -7,15 +7,15 @@ -

            {{t "titles.new"}}

            +

            {{t 'titles.new'}}

            - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs.hbs index 014ec91ff..b3a3096a7 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs.hbs @@ -1,3 +1,3 @@ -{{page-title (t "resources.host-catalog.title_plural")}} +{{page-title (t 'resources.host-catalog.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog.hbs index 03cf768df..33d5e4cdc 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog.hbs @@ -7,19 +7,19 @@ - {{outlet "header"}} + {{outlet 'header'}} - {{outlet "actions"}} + {{outlet 'actions'}} - {{outlet "navigation"}} + {{outlet 'navigation'}} {{outlet}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs index 1e65e6dc7..656eba6ee 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs @@ -1,22 +1,26 @@ - + - {{t "resources.host.actions.create"}} + {{t 'resources.host.actions.create'}} - {{t "resources.host-set.actions.create"}} + {{t 'resources.host-set.actions.create'}} - {{t "resources.host-catalog.actions.delete"}} + {{t 'resources.host-catalog.actions.delete'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-header.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-header.hbs index 58e6f4b02..277ae4d04 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.host-catalog.title"}} - + {{t 'resources.host-catalog.title'}} +

            -

            {{t "resources.host-catalog.description"}}

            +

            {{t 'resources.host-catalog.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-navigation.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-navigation.hbs index 1fec5dffa..7ffa9ab56 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-navigation.hbs @@ -8,4 +8,4 @@ {{t 'resources.host-set.title_plural'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets.hbs index 7687e031a..40c8df249 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets.hbs @@ -1,3 +1,3 @@ -{{page-title (t "resources.host-set.title_plural")}} +{{page-title (t 'resources.host-set.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.hbs index fdb14a71f..7d32ecb0d 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.hbs @@ -1,3 +1,3 @@ {{page-title @model.displayName}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs index 7eccc7b44..1fbc71d74 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-actions.hbs @@ -1,16 +1,24 @@ - - + + {{t 'resources.host-set.actions.create-and-add-host'}} - + {{t 'resources.host-set.actions.add-hosts'}} {{t 'resources.host-set.actions.delete'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-header.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-header.hbs index a101b0a8a..42c08d123 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.host-set.title"}} - + {{t 'resources.host-set.title'}} +

            -

            {{t "resources.host-set.description"}}

            +

            {{t 'resources.host-set.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-navigation.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-navigation.hbs index 70e124d5d..c5db9b2a4 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/-navigation.hbs @@ -1,8 +1,12 @@ - + {{t 'titles.details'}} - + {{t 'resources.host.title_plural'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs index 4b84cd7f8..d76cab15f 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.hbs @@ -1,8 +1,8 @@ -{{page-title (t "resources.host-set.actions.add-hosts")}} +{{page-title (t 'resources.host-set.actions.add-hosts')}} + @submit={{route-action 'addHosts' @model.hostSet}} + @cancel={{route-action 'cancel'}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs index 6ff650141..77d76801b 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts/-header.hbs @@ -1,5 +1,5 @@

            - {{t "resources.host-set.host.messages.add.title"}} - + {{t 'resources.host-set.host.messages.add.title'}} +

            -

            {{t "resources.host-set.host.messages.add.description"}}

            +

            {{t 'resources.host-set.host.messages.add.description'}}

            \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.hbs index 1adbdaca4..ba57bf740 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.hbs @@ -2,6 +2,6 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/-header.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/-header.hbs index ee94f8ff0..69e19aaf9 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/-header.hbs @@ -1,4 +1,4 @@

            - {{t "resources.host-set.actions.create-and-add-host"}} - -

            + {{t 'resources.host-set.actions.create-and-add-host'}} + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs index d6a1dfa5f..c4a93ee5c 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs @@ -1,14 +1,14 @@ -{{page-title (t "resources.host.title_plural")}} +{{page-title (t 'resources.host.title_plural')}} {{#if @model.hosts}} - {{t "form.name.label"}} - {{t "form.type.label"}} - {{t "form.id.label"}} - {{t "titles.actions"}} + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} + {{t 'titles.actions'}} @@ -16,7 +16,7 @@ {{host.displayName}} @@ -29,25 +29,26 @@ {{host.id}} - {{t "actions.remove"}} + {{t 'actions.remove'}} @@ -60,9 +61,12 @@ {{#unless @model.hosts}} - + - {{t "resources.host-set.host.messages.none.description"}} + {{t 'resources.host-set.host.messages.none.description'}} {{!-- @@ -72,4 +76,4 @@ --}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs index ac0b64897..36a777f60 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs @@ -1,5 +1,5 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index d4cb8ca74..4f0c433bf 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -3,9 +3,9 @@ - {{t "form.name.label"}} - {{t "form.type.label"}} - {{t "form.id.label"}} + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} @@ -13,7 +13,7 @@ {{hostSet.displayName}} @@ -28,8 +28,8 @@ {{hostSet.id}} @@ -42,15 +42,20 @@ {{else}} - + - {{t "resources.host-set.description"}} + {{t 'resources.host-set.description'}} - - - {{t "titles.new"}} + + + {{t 'titles.new'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs index 9dc07bc79..9f68f1549 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs @@ -2,6 +2,6 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new/-header.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new/-header.hbs index 38ae01334..490891bfc 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new/-header.hbs @@ -1,4 +1,4 @@

            - {{t "titles.new"}} - -

            + {{t 'titles.new'}} + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts.hbs index 450a3c4bf..c78470ec0 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts.hbs @@ -1,3 +1,3 @@ -{{page-title (t "resources.host.title_plural")}} +{{page-title (t 'resources.host.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host.hbs index fdb14a71f..7d32ecb0d 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host.hbs @@ -1,3 +1,3 @@ {{page-title @model.displayName}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-actions.hbs index 4c9a91aa3..5529db8d5 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-actions.hbs @@ -1,9 +1,13 @@ - + {{t 'resources.host.actions.delete'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-header.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-header.hbs index 7b15e6f0f..379eb4f8b 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.host.title"}} - + {{t 'resources.host.title'}} +

            -

            {{t "resources.host.description"}}

            +

            {{t 'resources.host.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-navigation.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-navigation.hbs index 157f7472f..82f59b693 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/-navigation.hbs @@ -2,4 +2,4 @@ {{t 'titles.details'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/index.hbs index 6cc780607..9a09f8c90 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/host/index.hbs @@ -1,5 +1,5 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs index dcf9b3b63..c7079adec 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs @@ -3,10 +3,10 @@ - {{t "form.name.label"}} - {{t "form.type.label"}} - {{t "form.id.label"}} - {{t "form.address.label"}} + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} + {{t 'form.address.label'}} @@ -14,7 +14,7 @@ {{host.displayName}} @@ -29,8 +29,8 @@ {{host.id}} @@ -46,15 +46,18 @@ {{else}} - + - {{t "resources.host.description"}} + {{t 'resources.host.description'}} - - - {{t "titles.new"}} + + + {{t 'titles.new'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new.hbs index 2a3d19cf1..fca1272d4 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new.hbs @@ -2,6 +2,6 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new/-header.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new/-header.hbs index 3122f3b43..8ed415938 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/new/-header.hbs @@ -1,4 +1,4 @@

            - {{t "titles.new"}} - -

            + {{t 'titles.new'}} + + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/index.hbs index 71bdd4437..e3c238cad 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/index.hbs @@ -1,5 +1,5 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs index 7fdf6fc12..dcc1f811c 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs @@ -6,18 +6,21 @@

            - {{t "resources.host-catalog.title_plural"}} - + {{t 'resources.host-catalog.title_plural'}} +

            {{#if @model}} -

            {{t "resources.host-catalog.description"}}

            +

            {{t 'resources.host-catalog.description'}}

            {{/if}}
            {{#if @model}} - - {{t "titles.new"}} + + {{t 'titles.new'}} {{/if}} @@ -29,9 +32,9 @@ - {{t "form.name.label"}} - {{t "form.type.label"}} - {{t "form.id.label"}} + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} @@ -39,7 +42,7 @@ {{hostCatalog.displayName}} @@ -48,14 +51,16 @@ - {{t (concat 'resources.host-catalog.types.' hostCatalog.type)}} + {{t + (concat 'resources.host-catalog.types.' hostCatalog.type) + }} {{hostCatalog.id}} @@ -68,13 +73,16 @@ {{else}} - + - {{t "resources.host-catalog.description"}} + {{t 'resources.host-catalog.description'}} - - - {{t "titles.new"}} + + + {{t 'titles.new'}} @@ -83,4 +91,4 @@ - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs index 4e413c5e1..fb936598e 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs @@ -8,17 +8,17 @@

            - {{t "titles.new"}} - + {{t 'titles.new'}} +

            - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/index.hbs b/ui/admin/app/templates/scopes/scope/index.hbs index c24cd6895..e2147cab0 100644 --- a/ui/admin/app/templates/scopes/scope/index.hbs +++ b/ui/admin/app/templates/scopes/scope/index.hbs @@ -1 +1 @@ -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/new.hbs b/ui/admin/app/templates/scopes/scope/new.hbs index 4718f24e8..ead78ec21 100644 --- a/ui/admin/app/templates/scopes/scope/new.hbs +++ b/ui/admin/app/templates/scopes/scope/new.hbs @@ -8,10 +8,10 @@

            - {{t "titles.new"}} + {{t 'titles.new'}}

            @@ -19,9 +19,9 @@ - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles.hbs b/ui/admin/app/templates/scopes/scope/roles.hbs index ad3b5c1c1..32536984b 100644 --- a/ui/admin/app/templates/scopes/scope/roles.hbs +++ b/ui/admin/app/templates/scopes/scope/roles.hbs @@ -1,3 +1,3 @@ -{{page-title (t "resources.role.title_plural")}} +{{page-title (t 'resources.role.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs index 8acc8ee3a..7fb62530c 100644 --- a/ui/admin/app/templates/scopes/scope/roles/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs @@ -6,17 +6,19 @@

            - {{t "resources.role.title_plural"}} - + {{t 'resources.role.title_plural'}} +

            {{#if @model}} -

            {{t "resources.role.description"}}

            +

            {{t 'resources.role.description'}}

            {{/if}}
            {{#if @model}} - {{t 'titles.new'}} + {{t + 'titles.new' + }} {{/if}} @@ -27,18 +29,15 @@ - {{t "form.name.label"}} - {{t "form.id.label"}} + {{t 'form.name.label'}} + {{t 'form.id.label'}} {{#each @model as |role|}} - + {{role.displayName}}

            {{role.description}}

            @@ -46,8 +45,8 @@ {{role.id}} @@ -60,12 +59,15 @@ {{else}} - + {{t 'resources.role.description'}} - - + + {{t 'titles.new'}} @@ -75,4 +77,4 @@ - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/new.hbs b/ui/admin/app/templates/scopes/scope/roles/new.hbs index 0d074a456..a3bbfdaa7 100644 --- a/ui/admin/app/templates/scopes/scope/roles/new.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/new.hbs @@ -6,14 +6,14 @@ -

            {{t "titles.new"}}

            +

            {{t 'titles.new'}}

            - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role.hbs b/ui/admin/app/templates/scopes/scope/roles/role.hbs index 03cf768df..33d5e4cdc 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role.hbs @@ -7,19 +7,19 @@ - {{outlet "header"}} + {{outlet 'header'}} - {{outlet "actions"}} + {{outlet 'actions'}} - {{outlet "navigation"}} + {{outlet 'navigation'}} {{outlet}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs b/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs index 12da9b078..e330566ad 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs @@ -1,13 +1,17 @@ - - + + {{t 'resources.role.principal.actions.add-principals'}} {{t 'resources.role.actions.delete'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role/-header.hbs b/ui/admin/app/templates/scopes/scope/roles/role/-header.hbs index 142af2e8d..6ebe89aaa 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.role.title"}} - + {{t 'resources.role.title'}} +

            -

            {{t "resources.role.description"}}

            +

            {{t 'resources.role.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role/-navigation.hbs b/ui/admin/app/templates/scopes/scope/roles/role/-navigation.hbs index 023542087..6126b2df9 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/-navigation.hbs @@ -8,4 +8,4 @@ {{t 'resources.role.grant.title_plural'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs index b2da50ea6..059142299 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/add-principals.hbs @@ -1,9 +1,9 @@ -{{page-title (t "resources.role.principal.actions.add-principals")}} +{{page-title (t 'resources.role.principal.actions.add-principals')}} + @submit={{route-action 'addPrincipals' @model.role}} + @cancel={{route-action 'cancel'}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role/add-principals/-header.hbs b/ui/admin/app/templates/scopes/scope/roles/role/add-principals/-header.hbs index f49d2b130..8264b0ae5 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/add-principals/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/add-principals/-header.hbs @@ -1,5 +1,5 @@

            - {{t "resources.role.principal.messages.add-principals.title"}} - + {{t 'resources.role.principal.messages.add-principals.title'}} +

            -

            {{t "resources.role.principal.messages.add-principals.description"}}

            +

            {{t 'resources.role.principal.messages.add-principals.description'}}

            \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs b/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs index cdf0922c7..79ccf9ede 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs @@ -2,8 +2,8 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} + @addGrant={{route-action 'addGrant' @model}} + @removeGrant={{route-action 'removeGrant' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role/grants/-header.hbs b/ui/admin/app/templates/scopes/scope/roles/role/grants/-header.hbs index 4aea69c7e..4097a2ecf 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/grants/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/grants/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.role.title"}} - + {{t 'resources.role.title'}} +

            -

            {{t "resources.role.grant.description"}}

            +

            {{t 'resources.role.grant.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role/index.hbs b/ui/admin/app/templates/scopes/scope/roles/role/index.hbs index 44c14fe3a..99dc29cc6 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/index.hbs @@ -1,6 +1,6 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file 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 d601d4475..03d497c2a 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs @@ -8,7 +8,7 @@ {{t 'form.name.label'}} {{t 'form.type.label'}} {{t 'form.id.label'}} - {{t "titles.actions"}} + {{t 'titles.actions'}} @@ -23,25 +23,26 @@ {{principal.model.id}} - + - {{t "actions.remove"}} + {{t 'actions.remove'}} @@ -53,15 +54,18 @@ {{else}} - + - {{t "resources.role.principal.messages.welcome.description"}} + {{t 'resources.role.principal.messages.welcome.description'}} - - + + {{t 'resources.role.principal.actions.add-principals'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/roles/role/principals/-header.hbs b/ui/admin/app/templates/scopes/scope/roles/role/principals/-header.hbs index b6c179259..3f483d4d2 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/principals/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/principals/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.role.title"}} - + {{t 'resources.role.title'}} +

            -

            {{t "resources.role.principal.description"}}

            +

            {{t 'resources.role.principal.description'}}

            {{@model.role.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/scopes.hbs b/ui/admin/app/templates/scopes/scope/scopes.hbs index 91975612e..c464a1a2f 100644 --- a/ui/admin/app/templates/scopes/scope/scopes.hbs +++ b/ui/admin/app/templates/scopes/scope/scopes.hbs @@ -1,9 +1,9 @@ {{#if @model.currentScope.isGlobal}} - {{page-title (t "resources.org.title_plural") }} + {{page-title (t 'resources.org.title_plural')}} {{/if}} {{#if @model.currentScope.isOrg}} - {{page-title (t "resources.project.title_plural") }} + {{page-title (t 'resources.project.title_plural')}} {{/if}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs index 295eb06f3..93df2c2cd 100644 --- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs @@ -7,30 +7,27 @@ {{#if @model.currentScope.isGlobal}}

            - {{t "resources.org.title_plural"}} - + {{t 'resources.org.title_plural'}} +

            {{#if @model.subScopes}} -

            {{t "resources.org.description"}}

            +

            {{t 'resources.org.description'}}

            {{/if}} {{/if}} {{#if @model.currentScope.isOrg}}

            - {{t "resources.project.title_plural"}} - + {{t 'resources.project.title_plural'}} +

            {{#if @model.subScopes}} -

            {{t "resources.project.description"}}

            +

            {{t 'resources.project.description'}}

            {{/if}} {{/if}}
            {{#if @model.subScopes}} - + {{t 'titles.new'}} {{/if}} @@ -46,8 +43,8 @@ @title={{scope.name}} @description={{scope.description}} @id={{scope.id}} - @icon={{if scope.isOrg "app-icons/org" "app-icons/project"}} - @route="scopes.scope" + @icon={{if scope.isOrg 'app-icons/org' 'app-icons/project'}} + @route='scopes.scope' @model={{scope.id}} /> {{/each}} @@ -57,12 +54,15 @@ {{#if @model.currentScope.isGlobal}} - + {{t 'resources.org.description'}} - - + + {{t 'titles.new'}} @@ -71,12 +71,15 @@ {{#if @model.currentScope.isOrg}} - + {{t 'resources.project.description'}} - - + + {{t 'titles.new'}} @@ -87,4 +90,4 @@ - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/sessions.hbs b/ui/admin/app/templates/scopes/scope/sessions.hbs index 41222bd30..82214be60 100644 --- a/ui/admin/app/templates/scopes/scope/sessions.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions.hbs @@ -1,3 +1,3 @@ -{{page-title (t "resources.session.title_plural")}} +{{page-title (t 'resources.session.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index 8865b085f..d97fc2fd0 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -6,10 +6,10 @@

            - {{t "resources.session.title_plural"}} - + {{t 'resources.session.title_plural'}} +

            -

            {{t "resources.session.description"}}

            +

            {{t 'resources.session.description'}}

            @@ -19,26 +19,30 @@ - {{t "form.id.label"}} - {{t "resources.user.title"}} - {{t "resources.target.title"}} - {{t "form.started.label"}} - {{t "form.status.label"}} - {{t "titles.actions"}} + {{t 'form.id.label'}} + {{t 'resources.user.title'}} + {{t 'resources.target.title'}} + {{t 'form.started.label'}} + {{t 'form.status.label'}} + {{t 'titles.actions'}} {{#each @model as |sessionAggregate|}} - + + class={{concat + 'session-status-' + sessionAggregate.session.status + }} + @name='app-icons/action-session' + @size='medium' + /> {{sessionAggregate.session.id}} @@ -46,8 +50,14 @@ {{sessionAggregate.user.displayName}} {{sessionAggregate.target.displayName}} - @@ -55,8 +65,14 @@ {{#if sessionAggregate.session.isCancelable}} - - {{t "actions.cancel"}} + + {{t 'actions.cancel'}} {{/if}} @@ -68,9 +84,12 @@ {{else}} - + - {{t "resources.session.messages.none.description"}} + {{t 'resources.session.messages.none.description'}} @@ -79,4 +98,4 @@ - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets.hbs b/ui/admin/app/templates/scopes/scope/targets.hbs index 1cb39a182..d97f37895 100644 --- a/ui/admin/app/templates/scopes/scope/targets.hbs +++ b/ui/admin/app/templates/scopes/scope/targets.hbs @@ -1,3 +1,3 @@ -{{page-title (t "resources.target.title_plural")}} +{{page-title (t 'resources.target.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/index.hbs b/ui/admin/app/templates/scopes/scope/targets/index.hbs index 2aa1d6376..ec9a8d5f1 100644 --- a/ui/admin/app/templates/scopes/scope/targets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/index.hbs @@ -6,18 +6,18 @@

            - {{t "resources.target.title_plural"}} - + {{t 'resources.target.title_plural'}} +

            {{#if @model}} -

            {{t "resources.target.description"}}

            +

            {{t 'resources.target.description'}}

            {{/if}}
            {{#if @model}} - - {{t "titles.new"}} + + {{t 'titles.new'}} {{/if}} @@ -29,9 +29,9 @@ - {{t "form.name.label"}} - {{t "form.type.label"}} - {{t "form.id.label"}} + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} @@ -39,7 +39,7 @@ {{target.displayName}} @@ -49,15 +49,15 @@ {{#if target.type}} - {{t (concat "resources.target.types." target.type)}} + {{t (concat 'resources.target.types.' target.type)}} {{/if}} {{target.id}} @@ -70,13 +70,16 @@ {{else}} - + - {{t "resources.target.description"}} + {{t 'resources.target.description'}} - - - {{t "titles.new"}} + + + {{t 'titles.new'}} @@ -85,4 +88,4 @@ - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/new.hbs b/ui/admin/app/templates/scopes/scope/targets/new.hbs index 24d1fb28a..c8d37f564 100644 --- a/ui/admin/app/templates/scopes/scope/targets/new.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/new.hbs @@ -8,17 +8,17 @@

            - {{t "titles.new"}} - + {{t 'titles.new'}} +

            - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target.hbs b/ui/admin/app/templates/scopes/scope/targets/target.hbs index 016b284ad..837d1f984 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target.hbs @@ -7,19 +7,19 @@ - {{outlet "header"}} + {{outlet 'header'}} - {{outlet "navigation"}} + {{outlet 'navigation'}} - {{outlet "actions"}} + {{outlet 'actions'}} {{outlet}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/-actions.hbs b/ui/admin/app/templates/scopes/scope/targets/target/-actions.hbs index 1d87ec790..9b6b207e3 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/-actions.hbs @@ -1,13 +1,17 @@ - - + + {{t 'resources.target.actions.add-host-sets'}} {{t 'resources.target.actions.delete'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/-header.hbs b/ui/admin/app/templates/scopes/scope/targets/target/-header.hbs index 14e01c1de..fef34c900 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.target.title"}} - + {{t 'resources.target.title'}} +

            -

            {{t "resources.target.description"}}

            +

            {{t 'resources.target.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs b/ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs index e2117fe9a..adbeded12 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/-navigation.hbs @@ -5,4 +5,4 @@ {{t 'resources.host-set.title_plural'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs index 450ca7763..ddf08b109 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs @@ -5,21 +5,24 @@ @model={{@model.target}} @hostCatalogs={{@model.hostCatalogs}} @hostSets={{@model.hostSets}} - @submit={{route-action "save" @model.target}} - @cancel={{route-action "cancel"}} + @submit={{route-action 'save' @model.target}} + @cancel={{route-action 'cancel'}} /> {{/if}} {{#unless @model.hostSets}} - + - {{t "resources.target.host-set.messages.none.description"}} + {{t 'resources.target.host-set.messages.none.description'}} - - - {{t "actions.back"}} + + + {{t 'actions.back'}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets/-header.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets/-header.hbs index 64fc3df9a..5f127e68c 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets/-header.hbs @@ -1,5 +1,5 @@

            - {{t "resources.target.host-set.messages.add.title"}} - + {{t 'resources.target.host-set.messages.add.title'}} +

            -

            {{t "resources.target.host-set.messages.add.description"}}

            +

            {{t 'resources.target.host-set.messages.add.description'}}

            \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs index 84657ce33..81a8e4c3c 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs @@ -1,14 +1,14 @@ -{{page-title (t "resources.host-set.title_plural")}} +{{page-title (t 'resources.host-set.title_plural')}} {{#if @model.hostSets}} - {{t "form.name.label"}} - {{t "form.type.label"}} - {{t "form.id.label"}} - {{t "titles.actions"}} + {{t 'form.name.label'}} + {{t 'form.type.label'}} + {{t 'form.id.label'}} + {{t 'titles.actions'}} @@ -19,30 +19,36 @@

            {{hostSet.model.description}}

            - {{t (concat 'resources.host-set.types.' hostSet.model.type)}} + {{t + (concat 'resources.host-set.types.' hostSet.model.type) + }} {{hostSet.model.id}} - {{t "actions.remove"}} + {{t 'actions.remove'}} @@ -54,15 +60,18 @@ {{else}} - + - {{t "resources.target.host-set.messages.welcome.description"}} + {{t 'resources.target.host-set.messages.welcome.description'}} - - + + {{t 'resources.target.actions.add-host-sets'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/targets/target/index.hbs b/ui/admin/app/templates/scopes/scope/targets/target/index.hbs index 83fc83598..ae63ba2b2 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/index.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/index.hbs @@ -1,5 +1,5 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users.hbs b/ui/admin/app/templates/scopes/scope/users.hbs index ebf89e0c7..0a50d686e 100644 --- a/ui/admin/app/templates/scopes/scope/users.hbs +++ b/ui/admin/app/templates/scopes/scope/users.hbs @@ -1,3 +1,3 @@ -{{page-title (t "resources.user.title_plural")}} +{{page-title (t 'resources.user.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs index 2cc8357ed..5d44a46b0 100644 --- a/ui/admin/app/templates/scopes/scope/users/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/index.hbs @@ -6,17 +6,19 @@

            - {{t "resources.user.title_plural"}} - + {{t 'resources.user.title_plural'}} +

            {{#if @model}} -

            {{t "resources.user.description"}}

            +

            {{t 'resources.user.description'}}

            {{/if}}
            {{#if @model}} - {{t 'titles.new'}} + {{t + 'titles.new' + }} {{/if}} @@ -27,18 +29,15 @@ - {{t "form.name.label"}} - {{t "form.id.label"}} + {{t 'form.name.label'}} + {{t 'form.id.label'}} {{#each @model as |user|}} - + {{user.displayName}}

            {{user.description}}

            @@ -46,8 +45,8 @@ {{user.id}} @@ -60,12 +59,15 @@ {{else}} - + {{t 'resources.user.description'}} - - + + {{t 'titles.new'}} @@ -75,4 +77,4 @@ - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/new.hbs b/ui/admin/app/templates/scopes/scope/users/new.hbs index 630e7e547..39674ace5 100644 --- a/ui/admin/app/templates/scopes/scope/users/new.hbs +++ b/ui/admin/app/templates/scopes/scope/users/new.hbs @@ -7,15 +7,15 @@ -

            {{t "titles.new"}}

            +

            {{t 'titles.new'}}

            - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/user.hbs b/ui/admin/app/templates/scopes/scope/users/user.hbs index 016b284ad..837d1f984 100644 --- a/ui/admin/app/templates/scopes/scope/users/user.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user.hbs @@ -7,19 +7,19 @@ - {{outlet "header"}} + {{outlet 'header'}} - {{outlet "navigation"}} + {{outlet 'navigation'}} - {{outlet "actions"}} + {{outlet 'actions'}} {{outlet}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs b/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs index 126c79071..0947bef21 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs @@ -1,13 +1,17 @@ - - - {{t "resources.user.actions.add-accounts"}} + + + {{t 'resources.user.actions.add-accounts'}} {{t 'resources.user.actions.delete'}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/user/-header.hbs b/ui/admin/app/templates/scopes/scope/users/user/-header.hbs index d6208892e..18c25edae 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/-header.hbs @@ -1,12 +1,12 @@

            - {{t "resources.user.title"}} - + {{t 'resources.user.title'}} +

            -

            {{t "resources.user.description"}}

            +

            {{t 'resources.user.description'}}

            {{@model.id}} - + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/user/-navigation.hbs b/ui/admin/app/templates/scopes/scope/users/user/-navigation.hbs index 0228c92e8..5c9dfbbf6 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/-navigation.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/-navigation.hbs @@ -5,4 +5,4 @@ {{t 'resources.user.messages.accounts.title'}} - + \ No newline at end of file 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 46c571982..bfd570a38 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs @@ -8,7 +8,7 @@ {{t 'form.name.label'}} {{t 'form.login_name.label'}} {{t 'form.id.label'}} - {{t "titles.actions"}} + {{t 'titles.actions'}} @@ -24,25 +24,29 @@ {{account.id}} - + - {{t "actions.remove"}} + {{t 'actions.remove'}} @@ -54,15 +58,18 @@ {{else}} - + - {{t "resources.user.messages.accounts.description"}} + {{t 'resources.user.messages.accounts.description'}} - - + + {{t 'resources.user.actions.add-accounts'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs index fd8020126..5d79b28c8 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs @@ -5,21 +5,24 @@ @model={{@model.user}} @authMethods={{@model.authMethods}} @accounts={{@model.accounts}} - @submit={{route-action "addAccounts" @model.user}} - @cancel={{route-action "cancel"}} + @submit={{route-action 'addAccounts' @model.user}} + @cancel={{route-action 'cancel'}} /> {{/if}} {{#unless @model.accounts}} - + - {{t "resources.user.messages.no-accounts.description"}} + {{t 'resources.user.messages.no-accounts.description'}} - - - {{t "actions.back"}} + + + {{t 'actions.back'}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/user/add-accounts/-header.hbs b/ui/admin/app/templates/scopes/scope/users/user/add-accounts/-header.hbs index d9a819fe8..91acf84fd 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/add-accounts/-header.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/add-accounts/-header.hbs @@ -1,2 +1,2 @@ -

            {{t "resources.user.messages.add-accounts.title"}}

            -

            {{t "resources.user.messages.add-accounts.description"}}

            +

            {{t 'resources.user.messages.add-accounts.title'}}

            +

            {{t 'resources.user.messages.add-accounts.description'}}

            \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/user/index.hbs b/ui/admin/app/templates/scopes/scope/users/user/index.hbs index 67714eca0..e90a1ff9a 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/index.hbs @@ -1,5 +1,5 @@ + @submit={{route-action 'save' @model}} + @cancel={{route-action 'cancel' @model}} +/> \ No newline at end of file diff --git a/ui/admin/package.json b/ui/admin/package.json index 1a2664b1e..8107ffb7c 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -20,6 +20,7 @@ "lint:js": "eslint .", "lint:sass": "sass-lint -v -q", "format": "npm-run-all format:*", + "format:hbs": "prettier --write 'app/**/*.hbs'", "format:js": "prettier --write '{app,config,stories,tests}/**/*.js' *.js", "format:sass": "prettier --write app/**/*.scss", "lint:js:fix": "eslint . --fix", @@ -83,7 +84,7 @@ "faker": "^5.5.3", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", + "prettier": "^2.3.0", "qunit": "^2.13.0", "qunit-dom": "^1.6.0", "rose": "*", diff --git a/yarn.lock b/yarn.lock index 70b0c0a46..3fe573550 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17111,6 +17111,11 @@ prettier@^2.2.1, prettier@~2.2.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== +prettier@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" + integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w== + pretty-bytes@^1.0.2: version "1.0.4" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-1.0.4.tgz#0a22e8210609ad35542f8c8d5d2159aff0751c84" From e551ec4008d15883300f3e3f136875e182ac2b8f Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 11 May 2021 15:29:46 -0400 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20prettier=20hb?= =?UTF-8?q?s=20linting=20plugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/.template-lintrc.js | 3 ++- ui/admin/ember-cli-build.js | 1 + ui/admin/package.json | 1 + yarn.lock | 40 ++++++++++++++++++++++++++++-------- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/ui/admin/.template-lintrc.js b/ui/admin/.template-lintrc.js index be0764215..de5f6f270 100644 --- a/ui/admin/.template-lintrc.js +++ b/ui/admin/.template-lintrc.js @@ -1,7 +1,8 @@ 'use strict'; module.exports = { - extends: 'octane', + plugins: ['ember-template-lint-plugin-prettier'], + extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'], rules: { 'no-bare-strings': true, 'no-curly-component-invocation': { diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js index 68a02a237..a7b391110 100644 --- a/ui/admin/ember-cli-build.js +++ b/ui/admin/ember-cli-build.js @@ -4,6 +4,7 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app'); module.exports = function (defaults) { let app = new EmberApp(defaults, { + hinting: false, 'ember-cli-babel': { includeExternalHelpers: true, }, diff --git a/ui/admin/package.json b/ui/admin/package.json index 8107ffb7c..1f0a4ef6f 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -76,6 +76,7 @@ "ember-resolver": "^8.0.2", "ember-source": "~3.24.0", "ember-template-lint": "^2.15.0", + "ember-template-lint-plugin-prettier": "^2.0.0", "eslint": "^7.17.0", "eslint-config-prettier": "^7.1.0", "eslint-plugin-ember": "^10.1.1", diff --git a/yarn.lock b/yarn.lock index 3fe573550..8e43f086e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6324,9 +6324,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001208: - version "1.0.30001219" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz#5bfa5d0519f41f993618bd318f606a4c4c16156b" - integrity sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ== + version "1.0.30001228" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" + integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== capture-exit@^2.0.0: version "2.0.0" @@ -7578,7 +7578,7 @@ debug@~4.1.0: dependencies: ms "^2.1.1" -debuglog@^1.0.1: +debuglog@*, debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -9320,6 +9320,13 @@ ember-source@~3.24.0: semver "^6.1.1" silent-error "^1.1.1" +ember-template-lint-plugin-prettier@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ember-template-lint-plugin-prettier/-/ember-template-lint-plugin-prettier-2.0.0.tgz#d999228fc375e9d8228296c1c80eaa192197817b" + integrity sha512-lLdpaYAgn2m5U4Y6bwpiwgFdn7SrpiO1rE1qUHM79LE+yAc26qyDEWNIZfRj9BrhmJMhWZKKOasCJnZ3b4PvIw== + dependencies: + prettier-linter-helpers "^1.0.0" + ember-template-lint@^2.0.1, ember-template-lint@^2.15.0: version "2.21.0" resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.21.0.tgz#7e120abf309a8810eeed26c52377943faf15a95b" @@ -12373,7 +12380,7 @@ import-lazy@^4.0.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== -imurmurhash@^0.1.4: +imurmurhash@*, imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -14071,6 +14078,11 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" +lodash._baseindexof@*: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" + integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= + lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -14079,11 +14091,16 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@^3.0.0: +lodash._bindcallback@*, lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= +lodash._cacheindexof@*: + version "3.0.2" + resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" + integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= + lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -14093,12 +14110,19 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" +lodash._createcache@*: + version "3.1.2" + resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" + integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= + dependencies: + lodash._getnative "^3.0.0" + lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@^3.0.0: +lodash._getnative@*, lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -14316,7 +14340,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@^3.0.0: +lodash.restparam@*, lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= From 0d67b512a21340250fdd6870430c357f20b0e413 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 11 May 2021 15:39:59 -0400 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20prettier=202.?= =?UTF-8?q?3=20and=20apply=20hbs=20formatting=20and=20linting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/.template-lintrc.js | 3 +- .../app/components/branded-card/index.hbs | 8 +- ui/desktop/app/components/copyable/index.hbs | 12 +-- ui/desktop/app/templates/application.hbs | 99 ++++++++++--------- ui/desktop/app/templates/error.hbs | 8 +- ui/desktop/app/templates/index.hbs | 2 +- ui/desktop/app/templates/origin.hbs | 21 ++-- ui/desktop/app/templates/scopes.hbs | 2 +- ui/desktop/app/templates/scopes/index.hbs | 2 +- .../templates/scopes/scope/-header-nav.hbs | 19 ++-- .../templates/scopes/scope/authenticate.hbs | 55 ++++++----- .../scopes/scope/authenticate/index.hbs | 11 ++- .../scopes/scope/authenticate/method.hbs | 2 +- .../scope/authenticate/method/index.hbs | 6 +- .../scopes/scope/authenticate/method/oidc.hbs | 10 +- .../app/templates/scopes/scope/index.hbs | 2 +- .../app/templates/scopes/scope/projects.hbs | 18 ++-- .../templates/scopes/scope/projects/error.hbs | 10 +- .../scopes/scope/projects/sessions/index.hbs | 53 +++++----- .../scopes/scope/projects/targets.hbs | 2 +- .../scopes/scope/projects/targets/index.hbs | 46 +++++---- .../scopes/scope/projects/targets/target.hbs | 8 +- .../projects/targets/target/-actions.hbs | 6 +- .../scope/projects/targets/target/-header.hbs | 10 +- .../projects/targets/target/-navigation.hbs | 2 +- .../scope/projects/targets/target/hosts.hbs | 26 +++-- .../scope/projects/targets/target/index.hbs | 2 +- .../projects/targets/target/sessions.hbs | 38 +++---- ui/desktop/electron-app/src/app-updater.js | 8 +- ui/desktop/electron-app/src/handlers.js | 4 +- ui/desktop/ember-cli-build.js | 1 + ui/desktop/package.json | 4 +- 32 files changed, 275 insertions(+), 225 deletions(-) diff --git a/ui/desktop/.template-lintrc.js b/ui/desktop/.template-lintrc.js index c95107553..8741adbc7 100644 --- a/ui/desktop/.template-lintrc.js +++ b/ui/desktop/.template-lintrc.js @@ -1,7 +1,8 @@ 'use strict'; module.exports = { - extends: 'octane', + plugins: ['ember-template-lint-plugin-prettier'], + extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'], rules: { 'no-bare-strings': true, 'no-curly-component-invocation': { allow: ['app-name'] }, diff --git a/ui/desktop/app/components/branded-card/index.hbs b/ui/desktop/app/components/branded-card/index.hbs index bf8af81d2..6b97c713b 100644 --- a/ui/desktop/app/components/branded-card/index.hbs +++ b/ui/desktop/app/components/branded-card/index.hbs @@ -1,5 +1,5 @@ -
            -

            {{@title}}

            -

            {{@description}}

            +
            +

            {{@title}}

            +

            {{@description}}

            {{yield}} -
            +
            \ No newline at end of file diff --git a/ui/desktop/app/components/copyable/index.hbs b/ui/desktop/app/components/copyable/index.hbs index ac3474940..a1a62e7f2 100644 --- a/ui/desktop/app/components/copyable/index.hbs +++ b/ui/desktop/app/components/copyable/index.hbs @@ -1,16 +1,16 @@ {{#if this.copied}} - + {{yield}} {{else}} - + {{yield}} {{/if}} @@ -19,12 +19,12 @@ {{this.actionText}} {{/if}} - + \ No newline at end of file diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index b3750e04b..6407a15d2 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -3,43 +3,48 @@ - - + + {{#if this.session.isAuthenticated}} - {{outlet "header-nav"}} + {{outlet 'header-nav'}} - + {{t 'actions.deauthenticate'}} - + + @changed={{route-action 'toggleTheme'}} + as |radioGroup| + > - + - + - + @@ -72,21 +77,23 @@ {{#if confirmation.options.isConnectSuccess}} + as |dialog| + > - {{t 'states.connection.success.description' + {{t + 'states.connection.success.description' port=confirmation.text.port address=confirmation.text.address protocol=confirmation.text.protocol @@ -95,57 +102,59 @@ - - {{t "actions.ok"}} + + {{t 'actions.ok'}} {{else if confirmation.options.isConnectError}} + as |dialog| + >

            {{confirmation.text}}

            - {{t "questions.retry-confirm"}} + {{t 'questions.retry-confirm'}}

            - - {{t "actions.retry"}} + + {{t 'actions.retry'}} - - {{t "actions.cancel"}} + + {{t 'actions.cancel'}}
            {{else}} + as |dialog| + >

            {{confirmation.text}}

            - - {{t "actions.ok"}} + + {{t 'actions.ok'}} - - {{t "actions.cancel"}} + + {{t 'actions.cancel'}}
            {{/if}} -
            + \ No newline at end of file diff --git a/ui/desktop/app/templates/error.hbs b/ui/desktop/app/templates/error.hbs index f5fcb9fbf..9f2d6a267 100644 --- a/ui/desktop/app/templates/error.hbs +++ b/ui/desktop/app/templates/error.hbs @@ -1,4 +1,4 @@ -{{page-title (t "errors.generic.title") }} +{{page-title (t 'errors.generic.title')}}
            @@ -7,9 +7,9 @@ - - {{t "actions.disconnect"}} + + {{t 'actions.disconnect'}} -
            + \ No newline at end of file diff --git a/ui/desktop/app/templates/index.hbs b/ui/desktop/app/templates/index.hbs index f3994d28f..2ed8bff0b 100644 --- a/ui/desktop/app/templates/index.hbs +++ b/ui/desktop/app/templates/index.hbs @@ -1,2 +1,2 @@ {{outlet}} -{{@model.message}} +{{@model.message}} \ No newline at end of file diff --git a/ui/desktop/app/templates/origin.hbs b/ui/desktop/app/templates/origin.hbs index 8fbae5380..5ecd70b94 100644 --- a/ui/desktop/app/templates/origin.hbs +++ b/ui/desktop/app/templates/origin.hbs @@ -4,22 +4,21 @@ @description={{t 'descriptions.origin-initialization'}} > - + @label={{t 'form.origin.label'}} + @helperText={{t 'form.origin.description'}} + {{autofocus}} + /> + - + \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes.hbs b/ui/desktop/app/templates/scopes.hbs index c24cd6895..e2147cab0 100644 --- a/ui/desktop/app/templates/scopes.hbs +++ b/ui/desktop/app/templates/scopes.hbs @@ -1 +1 @@ -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/index.hbs b/ui/desktop/app/templates/scopes/index.hbs index c24cd6895..e2147cab0 100644 --- a/ui/desktop/app/templates/scopes/index.hbs +++ b/ui/desktop/app/templates/scopes/index.hbs @@ -1 +1 @@ -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/-header-nav.hbs b/ui/desktop/app/templates/scopes/scope/-header-nav.hbs index 4a383eb6d..cbb597ea5 100644 --- a/ui/desktop/app/templates/scopes/scope/-header-nav.hbs +++ b/ui/desktop/app/templates/scopes/scope/-header-nav.hbs @@ -1,16 +1,21 @@ {{!-- {{#if this.session.data.authenticated.isGlobal}} --}} - - {{t "titles.global"}} - - + + {{t 'titles.global'}} + + {{!-- {{/if}} --}} {{#each this.scopes.orgs as |scope|}} - + {{scope.displayName}} {{/each}} - +
            \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs index 027736bc3..60ccaefa0 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs @@ -1,20 +1,24 @@ -{{page-title (t "actions.authenticate")}} +{{page-title (t 'actions.authenticate')}}
            - - {{t "titles.global"}} + @text={{t 'actions.choose-different-org'}} + @icon='user-organization' + as |dropdown| + > + + {{t 'titles.global'}} {{#each this.sortedScopes as |scope|}} - + {{scope.displayName}} {{/each}} @@ -24,16 +28,22 @@ {{#if (feature-flag 'oidc')}} {{! OIDC enable: list all auth methods }} {{#each @model.authMethods as |authMethod|}} - - {{t (concat "resources.auth-method.types." authMethod.type)}} + + {{t (concat 'resources.auth-method.types.' authMethod.type)}} {{/each}} {{else}} {{! OIDC disabled: filter out OIDC auth methods}} {{#each @model.authMethods as |authMethod|}} {{#unless authMethod.isOIDC}} - - {{t (concat "resources.auth-method.types." authMethod.type)}} + + {{t (concat 'resources.auth-method.types.' authMethod.type)}} {{/unless}} {{/each}} @@ -43,12 +53,12 @@ {{#if @model.authMethods}} {{outlet}} -

            - {{t "origin.connected-to"}}: +

            + {{t 'origin.connected-to'}}: {{this.origin}} -
            - - {{t "actions.change-origin"}} +
            + + {{t 'actions.change-origin'}}

            @@ -56,15 +66,16 @@ {{#unless @model.authMethods}} + @title={{t 'resources.auth-method.messages.none.title'}} + @icon='alert-circle-outline' + as |message| + > - {{t "resources.auth-method.messages.none.description"}} + {{t 'resources.auth-method.messages.none.description'}} {{/unless}}
            -
            + \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs index effd53cbd..b8dbc824f 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs @@ -1,12 +1,13 @@ {{#unless @model}} + @title={{t 'resources.auth-method.messages.none.title'}} + @icon='alert-circle-outline' + as |message| + > - {{t "resources.auth-method.messages.none.description"}} + {{t 'resources.auth-method.messages.none.description'}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/method.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/method.hbs index c24cd6895..e2147cab0 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate/method.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate/method.hbs @@ -1 +1 @@ -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/method/index.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/method/index.hbs index e05057cee..14266bf9c 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate/method/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate/method/index.hbs @@ -2,7 +2,7 @@ {{! OIDC enabled: show form for any auth method}} {{else}} @@ -10,8 +10,8 @@ {{#unless @model.isOIDC}} {{/unless}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/method/oidc.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/method/oidc.hbs index c6e38e882..09fe1248c 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate/method/oidc.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate/method/oidc.hbs @@ -6,18 +6,14 @@

            {{t 'resources.auth-method.messages.pending.description'}}

            {{t 'resources.auth-method.questions.no-see-window'}} - + {{t 'actions.retry'}}

            - + {{t 'actions.cancel'}}

            - + \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/index.hbs b/ui/desktop/app/templates/scopes/scope/index.hbs index c24cd6895..e2147cab0 100644 --- a/ui/desktop/app/templates/scopes/scope/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/index.hbs @@ -1 +1 @@ -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects.hbs b/ui/desktop/app/templates/scopes/scope/projects.hbs index 6a8cd0d89..4c68c45ca 100644 --- a/ui/desktop/app/templates/scopes/scope/projects.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects.hbs @@ -1,18 +1,14 @@ - - - {{t "resources.target.title_plural"}} + + + {{t 'resources.target.title_plural'}} - - - {{t "resources.session.title_plural"}} + + + {{t 'resources.session.title_plural'}} @@ -22,4 +18,4 @@ {{outlet}} - + \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/error.hbs b/ui/desktop/app/templates/scopes/scope/projects/error.hbs index 57529c9f8..6142bbbd5 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/error.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/error.hbs @@ -1,10 +1,10 @@ -{{page-title (t "errors.generic.title") }} +{{page-title (t 'errors.generic.title')}} {{! Most error types will land here }} {{#if @model.errors}} {{#each @model.errors as |error|}} - + {{/each}} {{/if}} @@ -16,8 +16,8 @@ - - {{t "actions.disconnect"}} + + {{t 'actions.disconnect'}} -{{/unless}} +{{/unless}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs index 123bc2007..58abacbc3 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs @@ -2,10 +2,10 @@

            - {{t "resources.session.title_plural"}} - + {{t 'resources.session.title_plural'}} +

            -

            {{t "resources.session.description"}}

            +

            {{t 'resources.session.description'}}

            @@ -15,33 +15,34 @@ - {{t "form.id.label"}} - {{t "resources.target.title"}} - {{t "form.proxy.label"}} - {{t "form.started.label"}} - {{t "form.status.label"}} + {{t 'form.id.label'}} + {{t 'resources.target.title'}} + {{t 'form.proxy.label'}} + {{t 'form.started.label'}} + {{t 'form.status.label'}} {{#each this.sorted as |model|}} - + + class={{concat 'session-status-' model.status}} + @name='app-icons/action-session' + @size='medium' + /> {{model.id}} {{model.target.displayName}} - {{!-- + {{! Two if's here because: 1) Local proxy info is only relevant if the session is active or pending (aka isCancelable). Once the session @@ -51,13 +52,13 @@ with it. It's possible for the user to start sessions from other devices (or even another tab), in which case we won't have the local proxy info available here. - --}} + }} {{#if model.isCancelable}} {{#if model.proxy}} {{model.proxy}} @@ -74,8 +75,11 @@ {{#if model.isCancelable}} - - {{t "actions.cancel"}} + + {{t 'actions.cancel'}} {{/if}} @@ -87,9 +91,12 @@ {{else}} - + - {{t "resources.session.messages.none-friendly.description"}} + {{t 'resources.session.messages.none-friendly.description'}} @@ -98,4 +105,4 @@ - + \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs index f0feb5185..d97f37895 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs @@ -1,3 +1,3 @@ {{page-title (t 'resources.target.title_plural')}} -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs index cb352055d..99ca234d9 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs @@ -2,10 +2,10 @@

            - {{t "resources.target.title_plural"}} - + {{t 'resources.target.title_plural'}} +

            -

            {{t "resources.target.description"}}

            +

            {{t 'resources.target.description'}}

            @@ -13,10 +13,10 @@ - {{t "form.name.label"}} - {{t "form.id.label"}} - {{t "form.type.label"}} - {{t "resources.project.title"}} + {{t 'form.name.label'}} + {{t 'form.id.label'}} + {{t 'form.type.label'}} + {{t 'resources.project.title'}} @@ -25,7 +25,7 @@ {{model.displayName}} @@ -34,16 +34,16 @@

            {{model.target.description}}

            {{/if}} {{#if model.target.isActive}} - - {{t "states.active"}} + + {{t 'states.active'}} {{/if}}
            {{model.id}} @@ -51,7 +51,7 @@ {{#if model.type}} - {{t (concat "resources.target.types." model.type)}} + {{t (concat 'resources.target.types.' model.type)}} {{/if}} @@ -59,8 +59,8 @@
            {{model.project.id}} @@ -70,8 +70,11 @@ - - {{t "resources.session.actions.connect"}} + + {{t 'resources.session.actions.connect'}} @@ -81,9 +84,12 @@ {{else}} - + - {{t "resources.target.messages.none.description"}} + {{t 'resources.target.messages.none.description'}} @@ -91,4 +97,4 @@ {{/if}} - + \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs index e9354d3f0..901c911ae 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs @@ -3,19 +3,19 @@ - {{outlet "header"}} + {{outlet 'header'}} - {{outlet "actions"}} + {{outlet 'actions'}} - {{outlet "navigation"}} + {{outlet 'navigation'}} {{outlet}} - + \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/-actions.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/-actions.hbs index b82595c94..76fce67d7 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/-actions.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/-actions.hbs @@ -1,3 +1,3 @@ - - {{t "resources.session.actions.connect"}} - + + {{t 'resources.session.actions.connect'}} + \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/-header.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/-header.hbs index 228a2887b..a2a93c449 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/-header.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/-header.hbs @@ -2,8 +2,8 @@ {{@model.displayName}} {{#if @model.isActive}}   - - {{t "states.active"}} + + {{t 'states.active'}} {{/if}} @@ -11,9 +11,9 @@

            {{@model.id}} -

            +

            \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/-navigation.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/-navigation.hbs index 12bfe97f8..54275ed07 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/-navigation.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/-navigation.hbs @@ -5,4 +5,4 @@ {{t 'resources.host.title_plural'}} - + \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs index 92ae3eebe..3a4dfbd65 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/hosts.hbs @@ -1,4 +1,4 @@ -{{page-title (t "resources.host-set.title_plural")}} +{{page-title (t 'resources.host-set.title_plural')}} {{#if @model.hosts}} @@ -13,19 +13,24 @@ {{host.id}} {{host.attributes.address}} - {{t (concat 'resources.host.types.' host.type)}} + {{t + (concat 'resources.host.types.' host.type) + }} - - {{t "resources.session.actions.connect"}} + + {{t 'resources.session.actions.connect'}} @@ -36,11 +41,14 @@ {{else}} - + - {{t "resources.host.messages.none-friendly.description"}} + {{t 'resources.host.messages.none-friendly.description'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/index.hbs index c24cd6895..e2147cab0 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/index.hbs @@ -1 +1 @@ -{{outlet}} +{{outlet}} \ No newline at end of file diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs index 8593787fe..46d8dfad6 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target/sessions.hbs @@ -3,9 +3,9 @@ - {{t "form.id.label"}} - {{t "form.proxy.label"}} - {{t "form.started.label"}} + {{t 'form.id.label'}} + {{t 'form.proxy.label'}} + {{t 'form.started.label'}} @@ -14,15 +14,16 @@ {{#each this.cancelableUserSessions as |session|}} - + + class={{concat 'session-status-' session.status}} + @name='app-icons/action-session' + @size='medium' + /> {{session.id}} @@ -33,8 +34,8 @@ {{#if session.proxy}} {{session.proxy}} @@ -50,10 +51,10 @@ {{#if session.isCancelable}} - {{t "actions.cancel"}} + {{t 'actions.cancel'}} {{/if}} @@ -67,11 +68,14 @@ {{else}} - + - {{t "resources.session.messages.none-active-friendly.description"}} + {{t 'resources.session.messages.none-active-friendly.description'}} -{{/if}} +{{/if}} \ No newline at end of file diff --git a/ui/desktop/electron-app/src/app-updater.js b/ui/desktop/electron-app/src/app-updater.js index 6409ef198..1898c6ac6 100644 --- a/ui/desktop/electron-app/src/app-updater.js +++ b/ui/desktop/electron-app/src/app-updater.js @@ -46,7 +46,8 @@ const findUpdateArchive = (version) => { // Create update config using downloaded archive const createAppUpdaterConfig = (url, version, destination) => { - if (debug) console.log(`[app-updater] url: ${url}, destination: ${destination}`); + if (debug) + console.log(`[app-updater] url: ${url}, destination: ${destination}`); const json = { url, version }; const config = JSON.stringify(json); const configPath = `${destination}/feed.json`; @@ -144,7 +145,10 @@ module.exports = { const location = process.env.APP_UPDATER_LATEST_VERSION_LOCATION; if (debug && location) { // Support hosted url and file paths - displayDownloadPrompt(latestVersion, location.match(/^http/i) ? location : `file://${location}`); + displayDownloadPrompt( + latestVersion, + location.match(/^http/i) ? location : `file://${location}` + ); return; } diff --git a/ui/desktop/electron-app/src/handlers.js b/ui/desktop/electron-app/src/handlers.js index 4e102212a..3f4eb94c7 100644 --- a/ui/desktop/electron-app/src/handlers.js +++ b/ui/desktop/electron-app/src/handlers.js @@ -33,8 +33,8 @@ handle('resetOrigin', async (requestOrigin) => { */ handle('openExternal', async (href) => { const isSecure = href.startsWith('https://'); - const isLocalhost = href.startsWith('http://localhost') - || href.startsWith('http://127.0.0.1'); + const isLocalhost = + href.startsWith('http://localhost') || href.startsWith('http://127.0.0.1'); if (isSecure || isLocalhost || isDev) { // openExternal is necessary in order to display documentation and to // support arbitrary OIDC flows. The protocol is validated (see above). diff --git a/ui/desktop/ember-cli-build.js b/ui/desktop/ember-cli-build.js index 2bec26235..91b6adad0 100644 --- a/ui/desktop/ember-cli-build.js +++ b/ui/desktop/ember-cli-build.js @@ -4,6 +4,7 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app'); module.exports = function (defaults) { let app = new EmberApp(defaults, { + hinting: false, 'ember-cli-babel': { includeExternalHelpers: true, }, diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 3319db39b..ad95f6b81 100644 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -23,6 +23,7 @@ "lint:sass": "stylelint '**/*.scss'", "lint:electron": "electronegativity -r -i ./electron-app", "format": "npm-run-all format:*", + "format:hbs": "prettier --write 'app/**/*.hbs'", "format:js": "prettier --write '{app,config,stories,tests,electron-app/src}/**/*.js' *.js", "format:sass": "prettier --write app/**/*.scss", "lint:js:fix": "eslint . --fix", @@ -81,6 +82,7 @@ "ember-resolver": "^8.0.2", "ember-source": "~3.24.0", "ember-template-lint": "^2.15.0", + "ember-template-lint-plugin-prettier": "^2.0.0", "eslint": "^7.17.0", "eslint-config-prettier": "^7.1.0", "eslint-plugin-ember": "^10.1.1", @@ -89,7 +91,7 @@ "faker": "^5.5.3", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^2.2.1", + "prettier": "^2.3.0", "qunit": "^2.13.0", "qunit-dom": "^1.6.0", "rose": "*",