diff --git a/ui/desktop/app/templates/cluster-url.hbs b/ui/desktop/app/templates/cluster-url.hbs
index 0b3272784..23febe6ec 100644
--- a/ui/desktop/app/templates/cluster-url.hbs
+++ b/ui/desktop/app/templates/cluster-url.hbs
@@ -3,41 +3,39 @@
SPDX-License-Identifier: BUSL-1.1
}}
-
-
+
-
+ {{t 'form.cluster-url.label'}}
+ {{t 'form.cluster-url.description'}}
+
- {{! template-lint-disable no-autofocus-attribute }}
-
- {{t 'form.cluster-url.label'}}
- {{t 'form.cluster-url.description'}}
-
-
-
- <:actions>
-
-
-
-
-
-
\ No newline at end of file
+
+ <:actions>
+
+
+
+
+
\ No newline at end of file
diff --git a/ui/desktop/app/templates/error.hbs b/ui/desktop/app/templates/error.hbs
index 19bca86bf..78a0299a3 100644
--- a/ui/desktop/app/templates/error.hbs
+++ b/ui/desktop/app/templates/error.hbs
@@ -5,18 +5,14 @@
{{page-title (t 'errors.generic.title')}}
-
+
+
+
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/ui/desktop/app/templates/scopes/scope.hbs b/ui/desktop/app/templates/scopes/scope.hbs
index db0423137..2a6441f81 100644
--- a/ui/desktop/app/templates/scopes/scope.hbs
+++ b/ui/desktop/app/templates/scopes/scope.hbs
@@ -3,31 +3,4 @@
SPDX-License-Identifier: BUSL-1.1
}}
-{{outlet}}
-
-{{#if this.session.isAuthenticated}}
-
-
-
-{{/if}}
\ No newline at end of file
+{{outlet}}
\ 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 a952b057a..e554dbd29 100644
--- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
@@ -5,76 +5,72 @@
{{page-title (t 'actions.authenticate')}}
-
- {{#if this.isOIDCRoute}}
- {{outlet}}
- {{else}}
-
+{{#if this.isOIDCRoute}}
+ {{outlet}}
+{{else}}
+
-
-
-
- {{t 'titles.global'}}
+
+
+
+ {{t 'titles.global'}}
+
+ {{#each this.sortedScopes as |scope|}}
+
+ {{scope.displayName}}
- {{#each this.sortedScopes as |scope|}}
-
- {{scope.displayName}}
-
- {{/each}}
-
+ {{/each}}
+
-
- {{#each @model.authMethods as |authMethod|}}
-
- {{#if authMethod.name}}
- {{authMethod.name}}
- {{else}}
- {{t (concat 'resources.auth-method.types.' authMethod.type)}}
- {{/if}}
-
- {{/each}}
-
+
+ {{#each @model.authMethods as |authMethod|}}
+
+ {{#if authMethod.name}}
+ {{authMethod.name}}
+ {{else}}
+ {{t (concat 'resources.auth-method.types.' authMethod.type)}}
+ {{/if}}
+
+ {{/each}}
+
- {{#if @model.authMethods}}
- {{outlet}}
- {{else}}
-
-
-
-
-
-
- {{/if}}
-
- {{t 'cluster-url.connected-to'}}:
-
- {{this.clusterUrl}}
-
-
-
- {{t 'actions.change-cluster-url'}}
-
-
-
- {{/if}}
-
\ No newline at end of file
+ {{#if @model.authMethods}}
+ {{outlet}}
+ {{else}}
+
+
+
+
+
+
+ {{/if}}
+
+ {{t 'cluster-url.connected-to'}}:
+
+ {{this.clusterUrl}}
+
+
+
+ {{t 'actions.change-cluster-url'}}
+
+
+
+{{/if}}
\ 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 fa2d34e6f..2f96db40b 100644
--- a/ui/desktop/app/templates/scopes/scope/projects.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects.hbs
@@ -3,28 +3,26 @@
SPDX-License-Identifier: BUSL-1.1
}}
-
-
-
-
-
- {{t 'resources.target.title_plural'}}
-
+
+
+
+
+
-
-
- {{t 'resources.session.title_plural'}}
-
-
-
- {{t 'titles.settings'}}
-
-
-
-
-
-
- {{outlet}}
-
-
-
\ No newline at end of file
+{{outlet}}
\ No newline at end of file
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index 64eed3d81..d6925bd9c 100644
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -46,6 +46,7 @@
"@xterm/addon-canvas": "^0.7.0",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
+ "ember-a11y-refocus": "^5.0.0",
"ember-inflector": "^6.0.0",
"ember-named-blocks-polyfill": "^0.2.5",
"lodash": "^4.17.23",
diff --git a/ui/desktop/tests/acceptance/application-test.js b/ui/desktop/tests/acceptance/application-test.js
index 4cb6971b4..ead61cede 100644
--- a/ui/desktop/tests/acceptance/application-test.js
+++ b/ui/desktop/tests/acceptance/application-test.js
@@ -67,7 +67,7 @@ module('Acceptance | Application', function (hooks) {
stubs.ipcService.withArgs('hasMacOSChrome').returns(true);
await visit(urls.clusterUrl);
assert.ok(
- find('.rose-header.header-cushion'),
+ find('.app-header.header-cushion'),
'Adds header padding around native window actions',
);
});
@@ -77,7 +77,7 @@ module('Acceptance | Application', function (hooks) {
stubs.ipcService.withArgs('hasMacOSChrome').returns(false);
await visit(urls.clusterUrl);
assert.notOk(
- find('.rose-header.header-cushion'),
+ find('.app-header.header-cushion'),
'Does not add header padding around native window actions',
);
});
diff --git a/ui/desktop/tests/acceptance/authentication-test.js b/ui/desktop/tests/acceptance/authentication-test.js
index 4d2fa2d7c..a1ffd0c49 100644
--- a/ui/desktop/tests/acceptance/authentication-test.js
+++ b/ui/desktop/tests/acceptance/authentication-test.js
@@ -69,8 +69,7 @@ module('Acceptance | authentication', function (hooks) {
const MODAL_CLOSE_SESSIONS = '[data-test-close-sessions-modal]';
const MODAL_CONFIRM_BTN = '.hds-modal__footer .hds-button--color-primary';
const MODAL_CANCEL_BTN = '.hds-modal__footer .hds-button--color-secondary';
- const HEADER_DROPDOWN_BTN =
- '.rose-header-utilities .header-dropdown-button-override button';
+ const HEADER_DROPDOWN_BTN = '.app-header__utility-actions button';
const setDefaultClusterUrl = (test) => {
const windowOrigin = window.location.origin;
diff --git a/ui/desktop/tests/acceptance/projects/sessions/index-test.js b/ui/desktop/tests/acceptance/projects/sessions/index-test.js
index 13055db9b..122a07f9f 100644
--- a/ui/desktop/tests/acceptance/projects/sessions/index-test.js
+++ b/ui/desktop/tests/acceptance/projects/sessions/index-test.js
@@ -542,8 +542,10 @@ module('Acceptance | projects | sessions | index', function (hooks) {
.isVisible();
// change scope in app header
- await click('.rose-header-nav .hds-dropdown-toggle-button');
- await click('.rose-header-nav .hds-dropdown-list-item:nth-of-type(4) a');
+ await click('[data-test-header-scope-dropdown] button');
+ await click(
+ `[data-test-header-scope-dropdown] a[href="${urls.scopes.org2}"]`,
+ );
// navigate to back sessions
await click(`[href="${urls.sessions2}"]`);
diff --git a/ui/desktop/tests/acceptance/projects/targets/index-test.js b/ui/desktop/tests/acceptance/projects/targets/index-test.js
index fad86505d..1e5fbbdec 100644
--- a/ui/desktop/tests/acceptance/projects/targets/index-test.js
+++ b/ui/desktop/tests/acceptance/projects/targets/index-test.js
@@ -602,8 +602,10 @@ module('Acceptance | projects | targets | index', function (hooks) {
.dom(`[data-test-target-project-id="${instances.scopes.project2.id}"]`)
.exists();
- await click('.rose-header-nav .hds-dropdown-toggle-button');
- await click('.rose-header-nav .hds-dropdown-list-item:nth-of-type(3) a');
+ await click('[data-test-header-scope-dropdown] button');
+ await click(
+ `[data-test-header-scope-dropdown] a[href="${urls.scopes.org}"]`,
+ );
assert
.dom(`[data-test-target-project-id="${instances.scopes.project.id}"]`)
diff --git a/ui/desktop/tests/acceptance/scopes-test.js b/ui/desktop/tests/acceptance/scopes-test.js
index 2c92608b8..406cc008d 100644
--- a/ui/desktop/tests/acceptance/scopes-test.js
+++ b/ui/desktop/tests/acceptance/scopes-test.js
@@ -258,17 +258,23 @@ module('Acceptance | scopes', function (hooks) {
);
await visit(urls.targets);
- await click('.rose-header-nav .hds-dropdown-toggle-button');
-
- await click('.rose-header-nav .hds-dropdown-list-item:nth-of-type(3) a');
+ await click('[data-test-header-scope-dropdown] button');
+ await click(
+ `[data-test-header-scope-dropdown] a[href="${urls.scopes.org}"]`,
+ );
assert.strictEqual(currentURL(), urls.targets);
- await click('.rose-header-nav .hds-dropdown-list-item:nth-of-type(4) a');
+ await click(
+ `[data-test-header-scope-dropdown] a[href="${urls.scopes.org2}"]`,
+ );
assert.strictEqual(currentURL(), urls.org2Targets);
- await click('.rose-header-nav .hds-dropdown-list-item:nth-of-type(1) a');
+ await click('[data-test-header-scope-dropdown] button');
+ await click(
+ `[data-test-header-scope-dropdown] a[href="${urls.scopes.global}"]`,
+ );
assert.strictEqual(currentURL(), urls.globalTargets);
});