diff --git a/addons/rose/addon/components/rose/layout/page/index.hbs b/addons/rose/addon/components/rose/layout/page/index.hbs index 72609c244..902a2b316 100644 --- a/addons/rose/addon/components/rose/layout/page/index.hbs +++ b/addons/rose/addon/components/rose/layout/page/index.hbs @@ -6,11 +6,7 @@
{{yield (hash - breadcrumbs=(component - 'rose/anonymous' class='rose-layout-page-breadcrumbs' - ) header=(component 'rose/anonymous' class='rose-layout-page-header') - actions=(component 'rose/anonymous' class='rose-layout-page-actions') navigation=(component 'rose/anonymous' class='rose-layout-page-navigation' ) diff --git a/addons/rose/app/styles/rose/components/header/_dropdown.scss b/addons/rose/app/styles/rose/components/header/_dropdown.scss index 931955817..3a277aef8 100644 --- a/addons/rose/app/styles/rose/components/header/_dropdown.scss +++ b/addons/rose/app/styles/rose/components/header/_dropdown.scss @@ -5,7 +5,7 @@ .rose-header { // Temporary fix: This header component will be retired upon integrating HDS side nav for desktop. - .header-dropdown-button-override > button { + .header-dropdown-button-override > button { background: var(--black); border: none; color: var(--white); diff --git a/addons/rose/app/styles/rose/components/layout/_page.scss b/addons/rose/app/styles/rose/components/layout/_page.scss index b0ca8ceaf..b924f2963 100644 --- a/addons/rose/app/styles/rose/components/layout/_page.scss +++ b/addons/rose/app/styles/rose/components/layout/_page.scss @@ -9,36 +9,32 @@ .rose-layout-page { display: grid; grid-template-areas: - 'breadcrumbs breadcrumbs breadcrumbs' - 'header header actions' + 'header header header' 'navigation navigation navigation' 'body body body'; grid-template-columns: repeat(3, 1fr); grid-template-rows: auto 1fr; - .rose-layout-page-breadcrumbs { - grid-area: breadcrumbs; - } - .rose-layout-page-header { grid-area: header; + margin-bottom: sizing.rems(s); - h2 { + h1 { display: flex; - gap: sizing.rems(xxs); + align-items: center; + gap: sizing.rems(xs); + margin: 0; .doc-link { display: flex; align-items: center; } } - } - .rose-layout-page-actions { - grid-area: actions; - display: flex; - justify-content: flex-end; - align-items: center; + .hds-copy-snippet { + align-self: start; + margin-top: sizing.rems(s); + } } .rose-layout-page-navigation { @@ -55,9 +51,7 @@ .rose-layout-page { grid-template-columns: 1fr; grid-template-areas: - 'breadcrumbs' 'header' - 'actions' 'navigation' 'body'; } diff --git a/e2e-tests/desktop/tests/authentication.spec.js b/e2e-tests/desktop/tests/authentication.spec.js index 24c573967..d1e3cd947 100644 --- a/e2e-tests/desktop/tests/authentication.spec.js +++ b/e2e-tests/desktop/tests/authentication.spec.js @@ -22,9 +22,7 @@ test.describe('user/password authentication tests', () => { ); // click dropdown - await electronPage - .getByRole('button', { name: 'admin' }) - .click(); + await electronPage.getByRole('button', { name: 'admin' }).click(); await electronPage.getByRole('button', { name: 'Sign Out' }).click(); await expect(electronPage).toHaveURL(/.*\/scopes\/global\/authenticate\//); diff --git a/e2e-tests/desktop/tests/scope.spec.js b/e2e-tests/desktop/tests/scope.spec.js index 969e3abd9..fad0beda5 100644 --- a/e2e-tests/desktop/tests/scope.spec.js +++ b/e2e-tests/desktop/tests/scope.spec.js @@ -52,7 +52,9 @@ test.describe('Scope tests', () => { }) => { const headerNavLocator = authedPage.getByLabel('header-nav'); await expect(headerNavLocator).toBeVisible(); - await expect(headerNavLocator.locator('.hds-dropdown-toggle-button')).toHaveText('Global'); + await expect( + headerNavLocator.locator('.hds-dropdown-toggle-button'), + ).toHaveText('Global'); await expect( authedPage.getByRole('link', { name: targetA.name }), @@ -67,7 +69,9 @@ test.describe('Scope tests', () => { }); await orgAHeaderNavLink.click(); - await expect(headerNavLocator.locator('.hds-dropdown-toggle-button')).toHaveText(orgA.name); + await expect( + headerNavLocator.locator('.hds-dropdown-toggle-button'), + ).toHaveText(orgA.name); await expect( authedPage.getByRole('link', { name: targetA.name }), ).toBeVisible(); @@ -82,7 +86,9 @@ test.describe('Scope tests', () => { await orgBHeaderNavLink.click(); - await expect(headerNavLocator.locator('.hds-dropdown-toggle-button')).toHaveText(orgB.name); + await expect( + headerNavLocator.locator('.hds-dropdown-toggle-button'), + ).toHaveText(orgB.name); await expect( authedPage.getByRole('link', { name: targetB.name }), ).toBeVisible(); diff --git a/ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs b/ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs index 0a823bfc4..28f073031 100644 --- a/ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs +++ b/ui/admin/app/components/auth-methods/auth-method/accounts/account/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.account.title'}} - - + +<@header.Description> {{t 'resources.account.description'}} - - \ No newline at end of file + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/auth-methods/auth-method/header/index.hbs b/ui/admin/app/components/auth-methods/auth-method/header/index.hbs index 8001fea5c..12b9f62e0 100644 --- a/ui/admin/app/components/auth-methods/auth-method/header/index.hbs +++ b/ui/admin/app/components/auth-methods/auth-method/header/index.hbs @@ -3,16 +3,16 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.auth-method.title'}} {{#if @model.isPrimary}} -   -   {{/if}} - -{{t - 'resources.auth-method.description' - }} - \ No newline at end of file + +<@header.Description> + {{t 'resources.auth-method.description'}} + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs index 9fef5798b..59e5b0797 100644 --- a/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs +++ b/ui/admin/app/components/auth-methods/auth-method/managed-groups/managed-group/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.managed-group.title'}} - -{{t - 'resources.managed-group.description' - }} - \ No newline at end of file + +<@header.Description> + {{t 'resources.managed-group.description'}} + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/credential-stores/credential-store/header/index.hbs b/ui/admin/app/components/credential-stores/credential-store/header/index.hbs index ced2e1a74..1d56c19af 100644 --- a/ui/admin/app/components/credential-stores/credential-store/header/index.hbs +++ b/ui/admin/app/components/credential-stores/credential-store/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.credential-store.title'}} - -{{t - 'resources.credential-store.description' - }} - \ No newline at end of file + +<@header.Description> + {{t 'resources.credential-store.description'}} + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/form/account/ldap/index.hbs b/ui/admin/app/components/form/account/ldap/index.hbs index fcd25ed03..9c1d6a4d1 100644 --- a/ui/admin/app/components/form/account/ldap/index.hbs +++ b/ui/admin/app/components/form/account/ldap/index.hbs @@ -80,8 +80,8 @@
diff --git a/ui/admin/app/components/form/auth-method/ldap/index.hbs b/ui/admin/app/components/form/auth-method/ldap/index.hbs index 64c37679d..bb907b339 100644 --- a/ui/admin/app/components/form/auth-method/ldap/index.hbs +++ b/ui/admin/app/components/form/auth-method/ldap/index.hbs @@ -48,8 +48,8 @@
@@ -222,8 +222,8 @@
@@ -307,8 +307,8 @@
@@ -350,8 +350,8 @@
@@ -448,8 +448,8 @@
diff --git a/ui/admin/app/components/form/scope/add-storage-policy/create.hbs b/ui/admin/app/components/form/scope/add-storage-policy/create.hbs index 988ccec35..325fdfccf 100644 --- a/ui/admin/app/components/form/scope/add-storage-policy/create.hbs +++ b/ui/admin/app/components/form/scope/add-storage-policy/create.hbs @@ -10,13 +10,15 @@ /> - - - - - - {{t 'resources.policy.titles.new'}} + + + + + + {{t 'resources.policy.titles.new'}} + + @@ -26,5 +28,4 @@ @cancel={{fn this.cancel @model}} /> - \ No newline at end of file diff --git a/ui/admin/app/components/groups/group/header/index.hbs b/ui/admin/app/components/groups/group/header/index.hbs index 846d61991..ecdd226bd 100644 --- a/ui/admin/app/components/groups/group/header/index.hbs +++ b/ui/admin/app/components/groups/group/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.group.title'}} - - + +<@header.Description> {{t 'resources.group.description'}} - - \ No newline at end of file + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/host-catalogs/host-catalog/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/header/index.hbs index 68773f2fd..d46ddc979 100644 --- a/ui/admin/app/components/host-catalogs/host-catalog/header/index.hbs +++ b/ui/admin/app/components/host-catalogs/host-catalog/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.host-catalog.title'}} - - + +<@header.Description> {{t 'resources.host-catalog.description'}} - - \ No newline at end of file + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/add-hosts/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/add-hosts/header/index.hbs index bd46567b1..4ca943bfd 100644 --- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/add-hosts/header/index.hbs +++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/add-hosts/header/index.hbs @@ -3,10 +3,10 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.host-set.host.messages.add.title'}} - - + +<@header.Description> {{t 'resources.host-set.host.messages.add.description'}} - \ No newline at end of file + \ No newline at end of file diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/header/index.hbs index 620f67fdd..d0e6fd5f9 100644 --- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/header/index.hbs +++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host/header/index.hbs @@ -3,7 +3,7 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.host-set.actions.create-and-add-host'}} - \ No newline at end of file + \ No newline at end of file diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/header/index.hbs index 8394140fb..1b2473ee9 100644 --- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/header/index.hbs +++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/host-set/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.host-set.title'}} - - + +<@header.Description> {{t 'resources.host-set.description'}} - - \ No newline at end of file + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/new/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/new/header/index.hbs index fe3ad3970..2542e1c1b 100644 --- a/ui/admin/app/components/host-catalogs/host-catalog/host-sets/new/header/index.hbs +++ b/ui/admin/app/components/host-catalogs/host-catalog/host-sets/new/header/index.hbs @@ -3,10 +3,10 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.host-set.titles.new'}} - - + +<@header.Description> {{t 'resources.host-set.description'}} - \ No newline at end of file + \ No newline at end of file diff --git a/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/header/index.hbs index 7c08bac6c..bc9e9cdbd 100644 --- a/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/header/index.hbs +++ b/ui/admin/app/components/host-catalogs/host-catalog/hosts/host/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.host.title'}} - - + +<@header.Description> {{t 'resources.host.description'}} - - \ No newline at end of file + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/host-catalogs/host-catalog/hosts/new/header/index.hbs b/ui/admin/app/components/host-catalogs/host-catalog/hosts/new/header/index.hbs index 75ab9cfb7..00d315c31 100644 --- a/ui/admin/app/components/host-catalogs/host-catalog/hosts/new/header/index.hbs +++ b/ui/admin/app/components/host-catalogs/host-catalog/hosts/new/header/index.hbs @@ -3,10 +3,10 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.host.titles.new'}} - - + +<@header.Description> {{t 'resources.host.description'}} - \ No newline at end of file + \ No newline at end of file diff --git a/ui/admin/app/components/roles/role/header/index.hbs b/ui/admin/app/components/roles/role/header/index.hbs index 4d1863b64..99953dc0b 100644 --- a/ui/admin/app/components/roles/role/header/index.hbs +++ b/ui/admin/app/components/roles/role/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.role.title'}} - - + +<@header.Description> {{t 'resources.role.description'}} - - \ No newline at end of file + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/targets/target/header/index.hbs b/ui/admin/app/components/targets/target/header/index.hbs index c86f0be15..d055be83d 100644 --- a/ui/admin/app/components/targets/target/header/index.hbs +++ b/ui/admin/app/components/targets/target/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.target.title'}} - - + +<@header.Description> {{t 'resources.target.description'}} - - \ No newline at end of file + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/users/user/header/index.hbs b/ui/admin/app/components/users/user/header/index.hbs index a101c9b8c..d9ce8f01b 100644 --- a/ui/admin/app/components/users/user/header/index.hbs +++ b/ui/admin/app/components/users/user/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.user.title'}} - - + +<@header.Description> {{t 'resources.user.description'}} - - \ No newline at end of file + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/components/workers/worker/header/index.hbs b/ui/admin/app/components/workers/worker/header/index.hbs index 3b582292c..f0184b84b 100644 --- a/ui/admin/app/components/workers/worker/header/index.hbs +++ b/ui/admin/app/components/workers/worker/header/index.hbs @@ -3,11 +3,13 @@ SPDX-License-Identifier: BUSL-1.1 }} - +<@header.Title> {{t 'resources.worker.title'}} - - + +<@header.Description> {{t 'resources.worker.description'}} - - \ No newline at end of file + +<@header.Generic> + + \ No newline at end of file diff --git a/ui/admin/app/controllers/scopes/scope/edit.js b/ui/admin/app/controllers/scopes/scope/edit.js index ebe02ed1f..aa9870b7d 100644 --- a/ui/admin/app/controllers/scopes/scope/edit.js +++ b/ui/admin/app/controllers/scopes/scope/edit.js @@ -7,4 +7,33 @@ import Controller, { inject as controller } from '@ember/controller'; export default class ScopesScopeEditController extends Controller { @controller('scopes/scope/index') scopes; + + get scopeTypes() { + return [ + { + key: 'isGlobal', + title: 'resources.global.title', + description: 'resources.global.description', + doc: 'global', + }, + { + key: 'isOrg', + title: 'resources.org.title', + description: 'resources.org.description', + doc: 'org', + }, + { + key: 'isProject', + title: 'resources.project.title', + description: 'resources.project.description', + doc: 'project', + }, + { + key: 'isScope', + title: 'resources.scope.title', + description: 'resources.scope.description', + doc: 'scope', + }, + ]; + } } diff --git a/ui/admin/app/templates/scopes/scope/add-storage-policy/create.hbs b/ui/admin/app/templates/scopes/scope/add-storage-policy/create.hbs index 5f4b00052..17f85ff2d 100644 --- a/ui/admin/app/templates/scopes/scope/add-storage-policy/create.hbs +++ b/ui/admin/app/templates/scopes/scope/add-storage-policy/create.hbs @@ -10,18 +10,20 @@ /> - - - - - {{t 'resources.policy.titles.new'}} - - - - {{t 'resources.policy.description'}} - + + + + + + {{t 'resources.policy.titles.new'}} + + + + {{t 'resources.policy.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/add-storage-policy/index.hbs b/ui/admin/app/templates/scopes/scope/add-storage-policy/index.hbs index 802cbebc4..cc9c79f6f 100644 --- a/ui/admin/app/templates/scopes/scope/add-storage-policy/index.hbs +++ b/ui/admin/app/templates/scopes/scope/add-storage-policy/index.hbs @@ -9,15 +9,16 @@ /> - - - - - - {{t 'resources.policy.actions.add'}} - - + + + + + + {{t 'resources.policy.actions.add'}} + + + @@ -28,5 +29,4 @@ @cancel={{fn this.cancel @model}} /> - \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs b/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs index 1e69c38ec..6be11cc3f 100644 --- a/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs +++ b/ui/admin/app/templates/scopes/scope/aliases/alias/index.hbs @@ -4,18 +4,56 @@ }} - - - - - {{t 'resources.alias.title'}} - - - - {{t 'resources.alias.description'}} - - + + + + + + {{t 'resources.alias.title'}} + + + + {{t 'resources.alias.description'}} + + + {{#let + (hash + canUpdate=(can 'update model' @model) + canDelete=(can 'delete model' @model) + ) + as |perms| + }} + {{#if (or perms.canUpdate perms.canDelete)}} + + + {{#if (and perms.canUpdate @model.destination_id)}} + + {{t 'actions.clear'}} + + {{/if}} + {{#if perms.canDelete}} + + {{t 'actions.delete'}} + + {{/if}} + + {{/if}} + {{/let}} + + + + + @@ -25,39 +63,7 @@ - {{#let - (hash - canUpdate=(can 'update model' @model) - canDelete=(can 'delete model' @model) - ) - as |perms| - }} - - {{#if (or perms.canUpdate perms.canDelete)}} - - - {{#if (and perms.canUpdate @model.destination_id)}} - - {{t 'actions.clear'}} - - {{/if}} - {{#if perms.canDelete}} - - {{t 'actions.delete'}} - - {{/if}} - - - {{/if}} - - {{/let}} - - - - - {{t 'resources.alias.title_plural'}} - - - - {{t 'resources.alias.description'}} - + + + + + + {{t 'resources.alias.title_plural'}} + + + + {{t 'resources.alias.description'}} + + + {{#if (can 'create model' this.scope collection='aliases')}} + {{#if @model.doAliasesExist}} + + {{/if}} + {{/if}} + + - - {{#if (can 'create model' this.scope collection='aliases')}} - {{#if @model.doAliasesExist}} - - {{/if}} - {{/if}} - - {{#if @model.doAliasesExist}} diff --git a/ui/admin/app/templates/scopes/scope/aliases/new.hbs b/ui/admin/app/templates/scopes/scope/aliases/new.hbs index 29beba4b6..fe44ec807 100644 --- a/ui/admin/app/templates/scopes/scope/aliases/new.hbs +++ b/ui/admin/app/templates/scopes/scope/aliases/new.hbs @@ -10,20 +10,21 @@ /> - - - - - - {{t 'resources.alias.titles.new'}} - - - - {{t 'resources.alias.description'}} - - + + + + + + {{t 'resources.alias.titles.new'}} + + + + {{t 'resources.alias.description'}} + + + - - - - - + + + + + + + + + - - - - - - - - - {{t - 'resources.account.title' - }} - - {{t 'resources.account.messages.set-password.description'}} - - + + + + + + {{t 'resources.account.title'}} + + + {{t 'resources.account.messages.set-password.description'}} + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - {{#if @model.accounts}} {{! OIDC accounts display more fields }} 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 3d8f7e969..7d1754d28 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 @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.account.titles.new'}} - - - - {{t 'resources.account.description'}} - + + + + + + {{t 'resources.account.titles.new'}} + + + + {{t 'resources.account.description'}} + + 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 a9bbbaa1c..02140cf00 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 @@ -4,29 +4,28 @@ }} - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - {{#if @model.managedGroups}} {{#if (get @model.managedGroups '0.isOIDC')}} diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs index 6504d3fcb..62ef2744f 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/index.hbs @@ -4,15 +4,22 @@ }} - - - - - - + + + + + + + + + @@ -21,13 +28,6 @@ /> - - - - - - - - - - + + + + + + + + + @@ -27,13 +34,6 @@ /> - - - - {{#if @model.members}} {{#if (get @model.members '0.isOIDC')}} diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs index 937a52e70..79377c3d8 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/managed-groups/new.hbs @@ -10,19 +10,19 @@ /> - - - - - - - {{t 'resources.managed-group.titles.new'}} - - - - {{t 'resources.managed-group.description'}} - + + + + + + {{t 'resources.managed-group.titles.new'}} + + + + {{t 'resources.managed-group.description'}} + + 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 33a404007..0268f9fab 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -5,42 +5,42 @@ - - {{t 'resources.auth-method.title_plural'}} - - - - {{t 'resources.auth-method.description'}} - - - - - - - - - {{#if (can 'create model' this.scopeModel collection='auth-methods')}} - - - {{t 'resources.auth-method.types.password'}} - {{t 'resources.auth-method.types.oidc'}} - {{#if (feature-flag 'ldap-auth-methods')}} - - {{t 'resources.auth-method.types.ldap'}} - + + + + + + {{t 'resources.auth-method.title_plural'}} + + + + {{t 'resources.auth-method.description'}} + + + {{#if (can 'create model' this.scopeModel collection='auth-methods')}} + + + {{t 'resources.auth-method.types.password'}} + {{t 'resources.auth-method.types.oidc'}} + {{#if (feature-flag 'ldap-auth-methods')}} + + {{t 'resources.auth-method.types.ldap'}} + + {{/if}} + {{/if}} - - {{/if}} - + + + {{#if @model.doAuthMethodsExist}} 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 9c5527db6..536d77161 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/new.hbs @@ -11,19 +11,20 @@ - - {{t 'resources.auth-method.titles.new'}} - - - - {{t 'resources.auth-method.description'}} - + + + + + + {{t 'resources.auth-method.titles.new'}} + + + + {{t 'resources.auth-method.description'}} + + - - - - - - - - - - - {{t 'resources.credential-library.title'}} - - - - {{t 'resources.credential-library.description'}} - - + + + + + + {{t 'resources.credential-library.title'}} + + + + {{t 'resources.credential-library.description'}} + + {{#if (can 'delete model' @model)}} + + + + + {{t 'resources.credential-library.actions.delete'}} + + + + {{/if}} + + + + @@ -30,19 +45,6 @@ - - {{#if (can 'delete model' @model)}} - - - - {{t 'resources.credential-library.actions.delete'}} - - {{/if}} - - - - - - - - + + + + + + + + + + - - - - {{#if @model}} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs index 613cb9900..a7b41f1e6 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs @@ -10,19 +10,19 @@ /> - - - - - - - {{t 'resources.credential-library.titles.new'}} - - - - {{t 'resources.credential-library.description'}} - + + + + + + {{t 'resources.credential-library.titles.new'}} + + + + {{t 'resources.credential-library.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs index 86d6b0552..1d1331187 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs @@ -4,20 +4,33 @@ }} - - - - - - - {{t 'resources.credential.title'}} - - - - {{t 'resources.credential.description'}} - - + + + + + + {{t 'resources.credential.title'}} + + + + {{t 'resources.credential.description'}} + + {{#if (can 'delete model' @model)}} + + + + {{t 'resources.credential.actions.delete'}} + + + {{/if}} + + + + @@ -30,18 +43,6 @@ - - {{#if (can 'delete model' @model)}} - - - {{t 'resources.credential.actions.delete'}} - - {{/if}} - - - - - - - - + + + + + + + + + - - - - {{#if @model}} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs index 2a061029a..ddfd8ae4f 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs @@ -10,19 +10,19 @@ /> - - - - - - - {{t 'resources.credential.titles.new'}} - - - - {{t 'resources.credential.description'}} - + + + + + + {{t 'resources.credential.titles.new'}} + + + + {{t 'resources.credential.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/edit-worker-filter.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/edit-worker-filter.hbs index 1ccd8e74d..549ae62ad 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/edit-worker-filter.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/edit-worker-filter.hbs @@ -10,18 +10,21 @@ /> - - - - - - {{t 'actions.edit-worker-filter'}} - - - - {{t 'resources.credential-store.worker-filter.messages.edit.description'}} - + + + + + + {{t 'actions.edit-worker-filter'}} + + + + {{t + 'resources.credential-store.worker-filter.messages.edit.description' + }} + + diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs index 8e918cd49..b77310e6e 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs @@ -4,26 +4,28 @@ }} - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - {{#if @model.worker_filter}} - - - - - - {{t 'resources.credential-store.title_plural'}} - - - {{#if @model.doCredentialStoresExist}} - - {{t 'resources.credential-store.description'}} - - {{/if}} + + + + + + {{t 'resources.credential-store.title_plural'}} + + + + {{#if @model.doCredentialStoresExist}} + {{t 'resources.credential-store.description'}} + {{/if}} + + + {{#if (can 'create model' this.scope collection='credential-stores')}} + {{#if @model.doCredentialStoresExist}} + + {{/if}} + {{/if}} + + - - - {{#if (can 'create model' this.scope collection='credential-stores')}} - {{#if @model.doCredentialStoresExist}} - - {{/if}} - {{/if}} - - {{#if @model.doCredentialStoresExist}} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs index f75d39f4e..8924e158d 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs @@ -10,18 +10,19 @@ /> - - - - - - {{t 'resources.credential-store.titles.new'}} - - - - {{t 'resources.credential-store.description'}} - + + + + + + {{t 'resources.credential-store.titles.new'}} + + + + {{t 'resources.credential-store.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs index 4a9df5175..3239ddf62 100644 --- a/ui/admin/app/templates/scopes/scope/edit.hbs +++ b/ui/admin/app/templates/scopes/scope/edit.hbs @@ -15,39 +15,43 @@ - - - - - {{#if @model.isGlobal}} - - {{t 'resources.global.title'}} - - - - {{t 'resources.global.description'}} - - {{/if}} - {{#if @model.isOrg}} - - {{t 'resources.org.title'}} - - - - {{t 'resources.org.description'}} - - {{/if}} - {{#if @model.isProject}} - - {{t 'resources.project.title'}} - - - - {{t 'resources.project.description'}} - - {{/if}} - + + + + + {{#each this.scopeTypes as |scope|}} + {{#if (get @model scope.key)}} + + {{t scope.title}} + + + + {{t scope.description}} + + {{/if}} + {{/each}} + {{#if (and (can 'delete model' @model) (not @model.isGlobal))}} + + + + {{t + (if + @model.isOrg + 'resources.org.actions.delete' + 'resources.project.actions.delete' + ) + }} + + + {{/if}} + + + + {{#if (can 'read model' @model)}} @@ -60,24 +64,6 @@ {{/if}} - {{#if (and (can 'delete model' @model) (not @model.isGlobal))}} - - - - {{t - (if - @model.isOrg - 'resources.org.actions.delete' - 'resources.project.actions.delete' - ) - }} - - - {{/if}} - @@ -98,7 +84,7 @@ {{#if (can 'attachStoragePolicy scope' @model)}}
- + {{t 'resources.policy.title'}} 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 8efc08bb4..0295a9c6f 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 @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.group.messages.add-members.title'}} - - - - {{t 'resources.group.messages.add-members.description'}} - + + + + + + {{t 'resources.group.messages.add-members.title'}} + + + + {{t 'resources.group.messages.add-members.description'}} + + 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 70030c247..3438e7b40 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/index.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/index.hbs @@ -5,25 +5,26 @@ - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - {{#if @model.members}} diff --git a/ui/admin/app/templates/scopes/scope/groups/index.hbs b/ui/admin/app/templates/scopes/scope/groups/index.hbs index fd2ce17a4..4d97ff6e1 100644 --- a/ui/admin/app/templates/scopes/scope/groups/index.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/index.hbs @@ -5,32 +5,32 @@ - - - - - - {{t 'resources.group.title_plural'}} - - - {{#if @model.doGroupsExist}} - - {{t 'resources.group.description'}} - - {{/if}} - - - - {{#if (can 'create model' this.scope collection='groups')}} + + + + + + {{t 'resources.group.title_plural'}} + + {{#if @model.doGroupsExist}} - + + {{t 'resources.group.description'}} + {{/if}} - {{/if}} - + {{#if (can 'create model' this.scope collection='groups')}} + {{#if @model.doGroupsExist}} + + + + {{/if}} + {{/if}} + + diff --git a/ui/admin/app/templates/scopes/scope/groups/new.hbs b/ui/admin/app/templates/scopes/scope/groups/new.hbs index 455749ba6..576471a59 100644 --- a/ui/admin/app/templates/scopes/scope/groups/new.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/new.hbs @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.group.titles.new'}} - - - - {{t 'resources.group.description'}} - + + + + + + {{t 'resources.group.titles.new'}} + + + + {{t 'resources.group.description'}} + + 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 2308ccee1..e3f97bd30 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 @@ -10,12 +10,15 @@ /> - - - - - + + + + + + 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 7609d0d5a..64a8595c3 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 @@ -10,14 +10,16 @@ /> - - - - + + + + + + diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.hbs index 56942cd75..fd10e66b9 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host/index.hbs @@ -4,14 +4,17 @@ }} - - - - + + + + + + diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs index 5c3a7f98d..e89da8f12 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/index.hbs @@ -4,23 +4,25 @@ }} - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - 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 7ae243f8e..78441364c 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 @@ -10,12 +10,16 @@ /> - - - - - + + + + + + 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 c1ec0996f..911e3b7f9 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 @@ -4,21 +4,25 @@ }} - - - - + + + + + + + + + - - - - 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 359927203..a4ffc73ec 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 @@ -4,21 +4,25 @@ }} - - - - + + + + + + + + + - - - - 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 9ec10ab64..6852ef1dd 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 @@ -10,12 +10,14 @@ /> - - - - + + + + + + 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 c728d6ac1..8d6299b19 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 @@ -4,25 +4,26 @@ }} - - - - + + + + + + + + + - - - - - - - - - - {{t 'resources.host-catalog.title_plural'}} - - - {{#if @model.doHostCatalogsExist}} - - {{t 'resources.host-catalog.description'}} - - {{/if}} - - - - {{#if (can 'create model' this.scope collection='host-catalogs')}} + + + + + + {{t 'resources.host-catalog.title_plural'}} + + {{#if @model.doHostCatalogsExist}} - + + {{t 'resources.host-catalog.description'}} + {{/if}} - {{/if}} - + {{#if (can 'create model' this.scope collection='host-catalogs')}} + {{#if @model.doHostCatalogsExist}} + + + + {{/if}} + {{/if}} + + {{#if @model.doHostCatalogsExist}} 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 ff84dcc89..18bdbebac 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.host-catalog.titles.new'}} - - - - {{t 'resources.host-catalog.description'}} - + + + + + + {{t 'resources.host-catalog.titles.new'}} + + + + {{t 'resources.host-catalog.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/policies/index.hbs b/ui/admin/app/templates/scopes/scope/policies/index.hbs index 1d481ed5e..1732fe194 100644 --- a/ui/admin/app/templates/scopes/scope/policies/index.hbs +++ b/ui/admin/app/templates/scopes/scope/policies/index.hbs @@ -3,29 +3,30 @@ SPDX-License-Identifier: BUSL-1.1 }} - - - - - {{t 'resources.policy.title_plural'}} - - - - {{t 'resources.policy.description'}} - - - - {{#if (can 'create model' this.scope collection='policies')}} - {{#if @model}} - + + + + + + {{t 'resources.policy.title_plural'}} + + + + {{t 'resources.policy.description'}} + + {{#if (can 'create model' this.scope collection='policies')}} + + + {{/if}} - {{/if}} - + + + {{#if @model}} - - - - - {{t 'resources.policy.titles.new'}} - - - - {{t 'resources.policy.description'}} - + + + + + + {{t 'resources.policy.titles.new'}} + + + + {{t 'resources.policy.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs b/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs index 4e7ef07d7..a49fcc31e 100644 --- a/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs +++ b/ui/admin/app/templates/scopes/scope/policies/policy/index.hbs @@ -4,19 +4,23 @@ }} - - - - - {{t 'resources.policy.title'}} - - - - {{t 'resources.policy.description'}} - - + + + + + + {{t 'resources.policy.title'}} + + + + {{t 'resources.policy.description'}} + + + + + diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs index f08a88430..14f39513a 100644 --- a/ui/admin/app/templates/scopes/scope/roles/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs @@ -5,33 +5,33 @@ - - - - - - {{t 'resources.role.title_plural'}} - - - {{#if @model.doRolesExist}} - - {{t 'resources.role.description'}} - - {{/if}} - - - - {{#if (can 'create model' this.scope collection='roles')}} + + + + + + {{t 'resources.role.title_plural'}} + + {{#if @model.doRolesExist}} - + + {{t 'resources.role.description'}} + {{/if}} - {{/if}} - + + {{#if (can 'create model' this.scope collection='roles')}} + {{#if @model.doRolesExist}} + + {{/if}} + {{/if}} + + + {{#if @model.doRolesExist}} diff --git a/ui/admin/app/templates/scopes/scope/roles/new.hbs b/ui/admin/app/templates/scopes/scope/roles/new.hbs index 100a778a0..12cced91c 100644 --- a/ui/admin/app/templates/scopes/scope/roles/new.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/new.hbs @@ -10,18 +10,20 @@ /> - - - - - {{t 'resources.role.titles.new'}} - - - - {{t 'resources.role.description'}} - + + + + + + {{t 'resources.role.titles.new'}} + + + + {{t 'resources.role.description'}} + + 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 6032974b7..3c5a2a86e 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 @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.role.principal.messages.add-principals.title'}} - - - - {{t 'resources.role.principal.messages.add-principals.description'}} - + + + + + + {{t 'resources.role.principal.messages.add-principals.title'}} + + + + {{t 'resources.role.principal.messages.add-principals.description'}} + + 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 73a5dcd1f..226a94bea 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/grants.hbs @@ -11,25 +11,27 @@ - - - - - - {{t 'resources.role.title'}} - - - - {{t 'resources.role.grant.description'}} - - + + + + + + {{t 'resources.role.title'}} + + + + {{t 'resources.role.grant.description'}} + + + + + + + + - - - - 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 67c2a9d10..b373f0037 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/index.hbs @@ -5,18 +5,18 @@ - - - - - + + + + + + + + + - - - - diff --git a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/index.hbs b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/index.hbs index de6ea44ec..110d23672 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/index.hbs @@ -5,18 +5,19 @@ - - - - - - {{t 'resources.role.scope.messages.manage-scopes.title'}} - - - - {{t 'resources.role.scope.messages.manage-scopes.description'}} - + + + + + + {{t 'resources.role.scope.messages.manage-scopes.title'}} + + + + {{t 'resources.role.scope.messages.manage-scopes.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.hbs b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.hbs index 284baca6b..91880b639 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.hbs @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.role.scope.messages.manage-custom-scopes.title'}} - - - - {{t 'resources.role.scope.messages.manage-custom-scopes.description'}} - + + + + + + {{t 'resources.role.scope.messages.manage-custom-scopes.title'}} + + + + {{t 'resources.role.scope.messages.manage-custom-scopes.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-org-projects.hbs b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-org-projects.hbs index 142395313..4d07d5ea0 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-org-projects.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/manage-scopes/manage-org-projects.hbs @@ -26,21 +26,22 @@ - - - - - - {{t - 'resources.role.scope.messages.manage-org-projects.title' - orgDisplayName=@model.orgScope.displayName - }} - - - - {{t 'resources.role.scope.messages.manage-org-projects.description'}} - + + + + + + {{t + 'resources.role.scope.messages.manage-org-projects.title' + orgDisplayName=@model.orgScope.displayName + }} + + + + {{t 'resources.role.scope.messages.manage-org-projects.description'}} + + 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 88d216b1b..2e2a3d2d6 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs @@ -11,28 +11,30 @@ - - - - - - {{t 'resources.role.title'}} - - - - {{t 'resources.role.principal.description'}} - - + + + + + + {{t 'resources.role.title'}} + + + + {{t 'resources.role.principal.description'}} + + + + + + + + - - - - diff --git a/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs b/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs index fcad9ef76..48a05249c 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/scopes.hbs @@ -11,34 +11,36 @@ - - - - - - {{t 'resources.role.title'}} - - - - {{#if @model.role.scope.isOrg}} - {{t 'resources.role.scope.description.org'}} - {{else if @model.role.scope.isProject}} - {{t 'resources.role.scope.description.project'}} - {{else}} - {{t 'resources.role.scope.description.global'}} - {{/if}} - - + + + + + + {{t 'resources.role.title'}} + + + + {{#if @model.role.scope.isOrg}} + {{t 'resources.role.scope.description.org'}} + {{else if @model.role.scope.isProject}} + {{t 'resources.role.scope.description.project'}} + {{else}} + {{t 'resources.role.scope.description.global'}} + {{/if}} + + + + + + + + - - - - diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs index c234fea68..44d5191fd 100644 --- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs @@ -5,51 +5,46 @@ - - - - - {{#if @model.currentScope.isGlobal}} - - {{t 'resources.org.title_plural'}} - - - {{#if @model.doScopesExist}} - - {{t 'resources.org.description'}} - + + + + + {{#if (or @model.currentScope.isGlobal @model.currentScope.isOrg)}} + {{#let + (if @model.currentScope.isGlobal 'org' 'project') + as |scopeType| + }} + + {{t (concat 'resources.' scopeType '.title_plural')}} + + + {{#if @model.doScopesExist}} + + {{t (concat 'resources.' scopeType '.description')}} + + {{/if}} + {{/let}} {{/if}} - {{else if @model.currentScope.isOrg}} - - {{t 'resources.project.title_plural'}} - - - {{#if @model.doScopesExist}} - - {{t 'resources.project.description'}} - + {{#if (can 'create model' @model.currentScope collection='scopes')}} + + {{#if @model.doScopesExist}} + + {{/if}} + {{/if}} - {{/if}} + - - {{#if (can 'create model' @model.currentScope collection='scopes')}} - {{#if @model.doScopesExist}} - - {{/if}} - {{/if}} - - {{#if @model.doScopesExist}} diff --git a/ui/admin/app/templates/scopes/scope/scopes/new.hbs b/ui/admin/app/templates/scopes/scope/scopes/new.hbs index 316d80bf8..03df40989 100644 --- a/ui/admin/app/templates/scopes/scope/scopes/new.hbs +++ b/ui/admin/app/templates/scopes/scope/scopes/new.hbs @@ -18,28 +18,37 @@ - - - - - {{#if @model.isOrg}} - - {{t 'resources.org.titles.new'}} - - - - {{t 'resources.org.description'}} - - {{else if @model.isProject}} - - {{t 'resources.project.titles.new'}} - - - - {{t 'resources.project.description'}} - - {{/if}} + + + + + {{#if @model.isOrg}} + + {{t 'resources.org.titles.new'}} + + + + {{t 'resources.org.description'}} + + {{else if @model.isProject}} + + {{t 'resources.project.titles.new'}} + + + + {{t 'resources.project.description'}} + + {{/if}} + {{#if (can 'create model' @model.currentScope collection='scopes')}} + + + + {{/if}} + diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs index 07458cbc6..65b50e786 100644 --- a/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs +++ b/ui/admin/app/templates/scopes/scope/session-recordings/index.hbs @@ -4,19 +4,20 @@ }} - - - - {{t - 'resources.session-recording.title_plural' - }} - - - - {{t 'resources.session-recording.description'}} - + + + + + + {{t 'resources.session-recording.title_plural'}} + + + + {{t 'resources.session-recording.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs index 419457e4e..69339e3d9 100644 --- a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs +++ b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.hbs @@ -14,22 +14,27 @@ /> - - - - - {{reverse-indexed-display-name - 'resources.session-recording.channel.title_index' - @model.channelRecording.connection_recording.channel_recordings - @model.channelRecording - }} - - + + + + + + {{reverse-indexed-display-name + 'resources.session-recording.channel.title_index' + @model.channelRecording.connection_recording.channel_recordings + @model.channelRecording + }} + + + + + + diff --git a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs index cbd00449c..333f2f650 100644 --- a/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs +++ b/ui/admin/app/templates/scopes/scope/session-recordings/session-recording/channels-by-connection/index.hbs @@ -4,38 +4,43 @@ }} - - - - {{t - 'resources.session-recording.session.title' - }} - + + + + + + {{t 'resources.session-recording.session.title'}} + + + {{#if + (can 'reapplyStoragePolicy session-recording' @model.sessionRecording) + }} + + - - {{#if - (can 'reapplyStoragePolicy session-recording' @model.sessionRecording) - }} - - - - {{t 'resources.policy.actions.update'}} - {{#if (can 'delete session-recording' @model.sessionRecording)}} - - - {{t 'resources.policy.actions.delete_recording'}} - + {{t 'resources.policy.actions.update'}} + {{#if (can 'delete session-recording' @model.sessionRecording)}} + + + {{t 'resources.policy.actions.delete_recording'}} + + {{/if}} + {{/if}} - - {{/if}} - + + + +
diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index 370a1514a..f6f2dd828 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -5,18 +5,19 @@ - - - - - - {{t 'resources.session.title_plural'}} - - - - {{t 'resources.session.description'}} - + + + + + + {{t 'resources.session.title_plural'}} + + + + {{t 'resources.session.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs b/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs index 1bd32aac3..cc2efc1ca 100644 --- a/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/storage-buckets/index.hbs @@ -4,30 +4,28 @@ }} - - - - - - {{t 'resources.storage-bucket.title_plural'}} - - - - {{t 'resources.storage-bucket.description'}} - - - - - {{#if (can 'create scope' this.scope collection='storage-buckets')}} - {{#if @model}} - + + + + + + {{t 'resources.storage-bucket.title_plural'}} + + + + {{t 'resources.storage-bucket.description'}} + + {{#if (can 'create scope' this.scope collection='storage-buckets')}} + + + {{/if}} - {{/if}} - + + {{#if @model}} diff --git a/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs b/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs index fd61569cf..1fab91865 100644 --- a/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs +++ b/ui/admin/app/templates/scopes/scope/storage-buckets/new.hbs @@ -10,15 +10,17 @@ /> - - - - - {{t 'resources.storage-bucket.titles.new'}} - - + + + + + + {{t 'resources.storage-bucket.titles.new'}} + + + diff --git a/ui/admin/app/templates/scopes/scope/storage-buckets/storage-bucket/index.hbs b/ui/admin/app/templates/scopes/scope/storage-buckets/storage-bucket/index.hbs index 29de471a1..9be7326ae 100644 --- a/ui/admin/app/templates/scopes/scope/storage-buckets/storage-bucket/index.hbs +++ b/ui/admin/app/templates/scopes/scope/storage-buckets/storage-bucket/index.hbs @@ -4,30 +4,33 @@ }} - - - - - {{t 'resources.storage-bucket.title'}} - - - + + + + + + {{t 'resources.storage-bucket.title'}} + + + + + + {{#if (can 'delete storage-bucket' @model)}} + + + + {{t 'actions.delete'}} + + + {{/if}} + - {{#if (can 'delete storage-bucket' @model)}} - - - - {{t 'actions.delete'}} - - - {{/if}} - diff --git a/ui/admin/app/templates/scopes/scope/targets/index.hbs b/ui/admin/app/templates/scopes/scope/targets/index.hbs index ebccce137..f72f2dabc 100644 --- a/ui/admin/app/templates/scopes/scope/targets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/index.hbs @@ -4,33 +4,35 @@ }} - - - - - {{t 'resources.target.title_plural'}} - - - {{#if @model.doTargetsExist}} - - {{t 'resources.target.description'}} - - {{/if}} + + + + + + {{t 'resources.target.title_plural'}} + + + {{#if @model.doTargetsExist}} + + {{t 'resources.target.description'}} + + {{/if}} + {{#if (can 'create model' this.scope collection='targets')}} + + {{#if @model.doTargetsExist}} + + {{/if}} + + {{/if}} + - - {{#if (can 'create model' this.scope collection='targets')}} - {{#if @model.doTargetsExist}} - - {{/if}} - {{/if}} - {{#if @model.doTargetsExist}} diff --git a/ui/admin/app/templates/scopes/scope/targets/new.hbs b/ui/admin/app/templates/scopes/scope/targets/new.hbs index 3c202fdfd..60f3d044b 100644 --- a/ui/admin/app/templates/scopes/scope/targets/new.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/new.hbs @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.target.titles.new'}} - - - - {{t 'resources.target.description'}} - + + + + + + {{t 'resources.target.titles.new'}} + + + + {{t 'resources.target.description'}} + + - - - - - - {{t 'resources.target.brokered-credential-source.messages.add.title'}} - - - {{t - 'resources.target.brokered-credential-source.messages.add.description' - }} - + + + + + + {{t 'resources.target.brokered-credential-source.messages.add.title'}} + + + {{t + 'resources.target.brokered-credential-source.messages.add.description' + }} + + diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs index 7dc2181d7..ef8576009 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sources.hbs @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.target.host-source.messages.add.title'}} - - - - {{t 'resources.target.host-source.messages.add.description'}} - + + + + + + {{t 'resources.target.host-source.messages.add.title'}} + + + + {{t 'resources.target.host-source.messages.add.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-injected-application-credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-injected-application-credential-sources.hbs index 9b961664b..0ffef61ff 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-injected-application-credential-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-injected-application-credential-sources.hbs @@ -14,21 +14,23 @@ /> - - - - - {{t - 'resources.target.injected-application-credential-source.messages.add.title' - }} - - - {{t - 'resources.target.injected-application-credential-source.messages.add.description' - }} - + + + + + + {{t + 'resources.target.injected-application-credential-source.messages.add.title' + }} + + + {{t + 'resources.target.injected-application-credential-source.messages.add.description' + }} + + diff --git a/ui/admin/app/templates/scopes/scope/targets/target/brokered-credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/brokered-credential-sources.hbs index 10ee07a4a..043910c07 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/brokered-credential-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/brokered-credential-sources.hbs @@ -11,25 +11,25 @@ - - - - - + + + + + + + + + - - - - {{#if @model.brokeredCredentialSources}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/create-alias.hbs b/ui/admin/app/templates/scopes/scope/targets/target/create-alias.hbs index 533811c55..278ea22ed 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/create-alias.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/create-alias.hbs @@ -10,19 +10,20 @@ /> - - - - - {{t 'resources.alias.titles.new'}} - - - - {{t 'resources.alias.description'}} - - + + + + + + {{t 'resources.alias.titles.new'}} + + + + {{t 'resources.alias.description'}} + + - - - - - {{t 'resources.target.workers.edit-egress-worker-filter.title'}} - - - - {{t 'resources.target.workers.edit-egress-worker-filter.description'}} - + + + + + + {{t 'resources.target.workers.edit-egress-worker-filter.title'}} + + + + {{t 'resources.target.workers.edit-egress-worker-filter.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs b/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs index 1d174bf91..ab9065868 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/edit-ingress-worker-filter.hbs @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.target.workers.edit-ingress-worker-filter.title'}} - - - - {{t 'resources.target.workers.edit-ingress-worker-filter.description'}} - + + + + + + {{t 'resources.target.workers.edit-ingress-worker-filter.title'}} + + + + {{t 'resources.target.workers.edit-ingress-worker-filter.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.hbs b/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.hbs index 235ddf6e2..d96b46ef9 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.hbs @@ -10,15 +10,17 @@ /> - - - - - {{t 'resources.storage-bucket.titles.new'}} - - + + + + + + {{t 'resources.storage-bucket.titles.new'}} + + + diff --git a/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/index.hbs b/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/index.hbs index 817eefa44..57dc1d03c 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/index.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/enable-session-recording/index.hbs @@ -4,16 +4,17 @@ }} - - - - {{t - 'resources.target.enable-session-recording.messages.add.title' - }} - - + + + + + + {{t 'resources.target.enable-session-recording.messages.add.title'}} + + + diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs index 686b0db3d..64615ddad 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs @@ -11,25 +11,25 @@ - - - - - + + + + + + + + + - - - - {{#if @model.hostSets}} 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 4b59015d0..f3ca75a79 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/index.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/index.hbs @@ -4,25 +4,26 @@ }} - - - - + + + + + + + + + - - - - @@ -35,7 +36,7 @@ {{#if @model.aliases}}
- + {{t 'resources.alias.title_plural'}} @@ -93,7 +94,7 @@ {{else}} {{#if (can 'create model' this.globalScope collection='aliases')}}
- + {{t 'resources.alias.title_plural'}} @@ -111,7 +112,7 @@ {{/if}}
{{#if (and @model.isSSH (feature-flag 'ssh-session-recording'))}} - + {{t 'resources.target.form.sidebar.label'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs index 61552eb61..359108ec5 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/injected-application-credential-sources.hbs @@ -15,25 +15,25 @@ - - - - - + + + + + + + + + - - - - {{#if @model.injectedApplicationCredentialSources}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/manage-alias.hbs b/ui/admin/app/templates/scopes/scope/targets/target/manage-alias.hbs index c853cd0d4..aaf51ddd0 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/manage-alias.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/manage-alias.hbs @@ -9,18 +9,56 @@ /> - - - - - {{t 'resources.alias.title'}} - - - - {{t 'resources.alias.description'}} - - + + + + + + {{t 'resources.alias.title'}} + + + + {{t 'resources.alias.description'}} + + + + + {{#let + (hash + canUpdate=(can 'update model' @model) + canDelete=(can 'delete model' @model) + ) + as |perms| + }} + {{#if (or perms.canUpdate perms.canDelete)}} + + + + {{#if (and perms.canUpdate @model.destination_id)}} + + {{t 'actions.clear'}} + + {{/if}} + {{#if perms.canDelete}} + + {{t 'actions.delete'}} + + {{/if}} + + + {{/if}} + {{/let}} + @@ -29,39 +67,6 @@ - {{#let - (hash - canUpdate=(can 'update model' @model) - canDelete=(can 'delete model' @model) - ) - as |perms| - }} - - {{#if (or perms.canUpdate perms.canDelete)}} - - - - {{#if (and perms.canUpdate @model.destination_id)}} - - {{t 'actions.clear'}} - - {{/if}} - {{#if perms.canDelete}} - - {{t 'actions.delete'}} - - {{/if}} - - {{/if}} - - {{/let}} - - - - - + + + + + + + + + - - - - {{t 'resources.target.workers.description'}} diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs index 5dc247b81..c50b4ef76 100644 --- a/ui/admin/app/templates/scopes/scope/users/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/index.hbs @@ -5,32 +5,32 @@ - - - - - - {{t 'resources.user.title_plural'}} - - - {{#if @model.doUsersExist}} - - {{t 'resources.user.description'}} - - {{/if}} - - - - {{#if (can 'create model' this.scope collection='users')}} + + + + + + {{t 'resources.user.title_plural'}} + + {{#if @model.doUsersExist}} - + + {{t 'resources.user.description'}} + {{/if}} - {{/if}} - + {{#if (can 'create model' this.scope collection='users')}} + + {{#if @model.doUsersExist}} + + {{/if}} + + {{/if}} + + {{#if @model.doUsersExist}} diff --git a/ui/admin/app/templates/scopes/scope/users/new.hbs b/ui/admin/app/templates/scopes/scope/users/new.hbs index 88ec1bd09..251f4f0fa 100644 --- a/ui/admin/app/templates/scopes/scope/users/new.hbs +++ b/ui/admin/app/templates/scopes/scope/users/new.hbs @@ -11,18 +11,19 @@ - - - - - - {{t 'resources.user.titles.new'}} - - - - {{t 'resources.user.description'}} - + + + + + + {{t 'resources.user.titles.new'}} + + + + {{t 'resources.user.description'}} + + diff --git a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs index e79799446..e8ad49e7e 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs @@ -11,25 +11,25 @@ - - - - - + + + + + + + + + - - - - {{#if @model.accounts}} 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 445fdd299..11dc867e6 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 @@ -11,17 +11,18 @@ - - - - - {{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'}} + + 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 f32faf42a..a029808ca 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/index.hbs @@ -5,22 +5,22 @@ - - - - - + + + + + + + + + - - - - - - - - - - {{t 'titles.workers'}} - - - - - - {{#if (can 'create worker led worker' this.scope collection='workers')}} - {{#if @model}} - + + + + + + {{t 'titles.workers'}} + + + {{#if (can 'create worker led worker' this.scope collection='workers')}} + + {{#if @model}} + + {{/if}} + {{/if}} - {{/if}} - + + {{#if @model}} diff --git a/ui/admin/app/templates/scopes/scope/workers/new.hbs b/ui/admin/app/templates/scopes/scope/workers/new.hbs index 7dcf4844d..fd1eb6635 100644 --- a/ui/admin/app/templates/scopes/scope/workers/new.hbs +++ b/ui/admin/app/templates/scopes/scope/workers/new.hbs @@ -11,15 +11,16 @@ - - - - - - {{t 'resources.worker.titles.new'}} - - + + + + + + {{t 'resources.worker.titles.new'}} + + + - - - - - - {{t 'resources.worker.tags.create.title'}} - - - {{t 'resources.worker.tags.create.description'}} - - {{t 'resources.worker.tags.create.link'}} - + + + + + + {{t 'resources.worker.tags.create.title'}} + + + + {{t 'resources.worker.tags.create.description'}} + + {{t 'resources.worker.tags.create.link'}} + + + diff --git a/ui/admin/app/templates/scopes/scope/workers/worker/index.hbs b/ui/admin/app/templates/scopes/scope/workers/worker/index.hbs index 34679a7c9..32f02d2c8 100644 --- a/ui/admin/app/templates/scopes/scope/workers/worker/index.hbs +++ b/ui/admin/app/templates/scopes/scope/workers/worker/index.hbs @@ -5,25 +5,25 @@ - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - {{#if @model.allTags}} item !== 'update'); await visit(urls.hostSet); - assert.notOk(find('.rose-layout-page-actions .hds-button-secondary')); + assert.notOk(find('.hds-page-header__actions .hds-button-secondary')); }); test('can cancel changes to existing host-set', async function (assert) { diff --git a/ui/admin/tests/acceptance/targets/selectors.js b/ui/admin/tests/acceptance/targets/selectors.js index 12d3a8fe6..594b93aa0 100644 --- a/ui/admin/tests/acceptance/targets/selectors.js +++ b/ui/admin/tests/acceptance/targets/selectors.js @@ -18,7 +18,7 @@ export const FIELD_NAME_ERROR = '[data-test-error-message-name]'; export const FIELD_DEFAULT_PORT_ERROR = '[data-test-error-message-default-port]'; -export const NEW_TARGET_BTN = '[data-test-new-target-button'; +export const NEW_TARGET_BTN = '[data-test-new-target-button]'; export const MANAGE_DROPDOWN = '[data-test-manage-targets-dropdown] button'; export const MANAGE_DROPDOWN_DELETE = '[data-test-manage-targets-dropdown] ul li:last-child button'; diff --git a/ui/admin/tests/integration/components/workers/worker/header/index-test.js b/ui/admin/tests/integration/components/workers/worker/header/index-test.js index 6ad4d3140..1239f6024 100644 --- a/ui/admin/tests/integration/components/workers/worker/header/index-test.js +++ b/ui/admin/tests/integration/components/workers/worker/header/index-test.js @@ -19,8 +19,10 @@ module( this.set('model', { id: 'w_123' }); await render(hbs` - - `); + + + + `); assert.dom(this.element).includesText('w_123'); }); diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index 145499276..42ef864c2 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -235,12 +235,6 @@ } } -.session-details-info { - display: flex; - align-items: center; - gap: 1rem; -} - .target-details-header { display: flex; align-items: center; diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs index 3c9c52ce8..95ed98953 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/sessions.hbs @@ -5,13 +5,15 @@ - - {{t 'resources.session.title_plural'}} - - - - {{t 'resources.session.description'}} - + + + {{t 'resources.session.title_plural'}} + + + + {{t 'resources.session.description'}} + + diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/session.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/session.hbs index 03b5edf98..19e27bd83 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/sessions/session.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/session.hbs @@ -7,30 +7,32 @@ - - - - {{@model.displayName}} - - + + + + + {{@model.displayName}} + + + + + {{#if (can 'cancel session' @model)}} + + + + {{/if}} + - - {{#if (can 'cancel session' @model)}} - - {{/if}} - - - diff --git a/ui/desktop/app/templates/scopes/scope/projects/settings.hbs b/ui/desktop/app/templates/scopes/scope/projects/settings.hbs index 179db0227..4a8efd2d1 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/settings.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/settings.hbs @@ -5,9 +5,11 @@ - - {{t 'titles.settings'}} - + + + {{t 'titles.settings'}} + + {{outlet}} diff --git a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs index 0ac60fdf0..0e0b30b1a 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets.hbs @@ -7,13 +7,15 @@ - - {{t 'resources.target.title_plural'}} - - - - {{t 'resources.target.description'}} - + + + {{t 'resources.target.title_plural'}} + + + + {{t 'resources.target.description'}} + + 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 8afa998c4..779821f8f 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/targets/target.hbs @@ -8,32 +8,29 @@ - - - {{@model.target.displayName}} - + + + + {{@model.target.displayName}} + + {{#if (can 'connect target' @model.target)}} + + + + {{/if}} + - - {{#if (can 'connect target' @model.target)}} - - {{/if}} - -