From 576fef9f8a68585448b3339e88867a77034b3b0d Mon Sep 17 00:00:00 2001 From: Zhihe Li Date: Mon, 8 Jun 2026 17:08:23 -0400 Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Update=20scope=20dropdow?= =?UTF-8?q?n=20in=20login=20to=20show=20current=20scope=20(#3308)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 🎸 Update scope dropdown in login to show current scope * test: 💍 Update e2e tests --- addons/core/translations/actions/en-us.yaml | 1 - e2e-tests/admin/tests/auth-method-ldap.spec.js | 4 ++-- .../admin/tests/auth-method-oidc-vault.spec.js | 4 ++-- .../admin/tests/auth-method-password.spec.js | 8 ++++---- e2e-tests/admin/tests/change-password.spec.js | 8 ++++---- .../templates/scopes/scope/authenticate.hbs | 14 ++++++++------ .../templates/scopes/scope/authenticate.hbs | 18 ++++++++++++------ 7 files changed, 32 insertions(+), 25 deletions(-) diff --git a/addons/core/translations/actions/en-us.yaml b/addons/core/translations/actions/en-us.yaml index f78578375..fc733f9bc 100644 --- a/addons/core/translations/actions/en-us.yaml +++ b/addons/core/translations/actions/en-us.yaml @@ -30,7 +30,6 @@ copy-error-detail-to-clipboard: Copy error detail to clipboard authenticate: Sign In deauthenticate: Sign Out choose-org: Choose Scope -choose-different-org: Choose a different scope add-host-set: Create Host Set add-host: Create Host add-principals: Add Principals diff --git a/e2e-tests/admin/tests/auth-method-ldap.spec.js b/e2e-tests/admin/tests/auth-method-ldap.spec.js index 4af501e45..85c9b0be1 100644 --- a/e2e-tests/admin/tests/auth-method-ldap.spec.js +++ b/e2e-tests/admin/tests/auth-method-ldap.spec.js @@ -174,8 +174,8 @@ test( // Log in using ldap account await loginPage.logout(adminLoginName); - await page.getByText('Choose a different scope').click(); - await page.getByRole('link', { name: orgName }).click(); + await page.getByRole('button', { name: /global/i }).click(); + await page.getByRole('option', { name: orgName }).click(); await page.getByRole('link', { name: ldapAuthMethodName }).click(); await loginPage.login(ldapUserName, ldapUserPassword); await expect( diff --git a/e2e-tests/admin/tests/auth-method-oidc-vault.spec.js b/e2e-tests/admin/tests/auth-method-oidc-vault.spec.js index b257dcfcf..a24309c94 100644 --- a/e2e-tests/admin/tests/auth-method-oidc-vault.spec.js +++ b/e2e-tests/admin/tests/auth-method-oidc-vault.spec.js @@ -129,8 +129,8 @@ test( // Log in using oidc account await loginPage.logout(adminLoginName); - await page.getByText('Choose a different scope').click(); - await page.getByRole('link', { name: orgName }).click(); + await page.getByRole('button', { name: /global/i }).click(); + await page.getByRole('option', { name: orgName }).click(); await page.getByRole('link', { name: oidcAuthMethodName }).click(); const pagePromise = context.waitForEvent('page'); await page.getByRole('button', { name: 'Sign In' }).click(); diff --git a/e2e-tests/admin/tests/auth-method-password.spec.js b/e2e-tests/admin/tests/auth-method-password.spec.js index 31a15814d..7ee053f41 100644 --- a/e2e-tests/admin/tests/auth-method-password.spec.js +++ b/e2e-tests/admin/tests/auth-method-password.spec.js @@ -58,8 +58,8 @@ test( // Log in using new account await loginPage.logout(adminLoginName); - await page.getByText('Choose a different scope').click(); - await page.getByRole('link', { name: orgName }).click(); + await page.getByRole('button', { name: /global/i }).click(); + await page.getByRole('option', { name: orgName }).click(); await page.getByRole('link', { name: authMethodName }).click(); await loginPage.login(username, password); @@ -97,8 +97,8 @@ test( // Log in using new password await loginPage.logout(adminLoginName); - await page.getByText('Choose a different scope').click(); - await page.getByRole('link', { name: orgName }).click(); + await page.getByRole('button', { name: /global/i }).click(); + await page.getByRole('option', { name: orgName }).click(); await page.getByRole('link', { name: authMethodName }).click(); await loginPage.login(username, newPassword); await expect( diff --git a/e2e-tests/admin/tests/change-password.spec.js b/e2e-tests/admin/tests/change-password.spec.js index 8c3829cc0..0593ed0cf 100644 --- a/e2e-tests/admin/tests/change-password.spec.js +++ b/e2e-tests/admin/tests/change-password.spec.js @@ -52,8 +52,8 @@ test( // Log in using new account await page.reload(); - await page.getByText('Choose a different scope').click(); - await page.getByRole('link', { name: org.name }).click(); + await page.getByRole('button', { name: /global/i }).click(); + await page.getByRole('option', { name: org.name }).click(); await page.getByRole('link', { name: authMethod.name }).click(); const loginPage = new LoginPage(page); await loginPage.login(username, password); @@ -79,8 +79,8 @@ test( // Confirm user cannot log in with old password await loginPage.logout(username); - await page.getByText('Choose a different scope').click(); - await page.getByRole('link', { name: org.name }).click(); + await page.getByRole('button', { name: /global/i }).click(); + await page.getByRole('option', { name: org.name }).click(); await page.getByRole('link', { name: authMethod.name }).click(); await page.getByLabel('Login Name').fill(username); await page.getByLabel('Password', { exact: true }).fill(password); diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs index 2f8f2ca28..67aee5c37 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs @@ -28,23 +28,25 @@ - {{t 'titles.global'}} - + {{#each this.sortedScopes as |scope|}} - {{scope.displayName}} - + {{/each}} diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs index e554dbd29..52917cca0 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs @@ -18,17 +18,23 @@ - + {{t 'titles.global'}} - + {{#each this.sortedScopes as |scope|}} - + {{scope.displayName}} - + {{/each}}