Skip to content

Fixed an issue where the current cluster is used when navigating to the auth configuration portion of the app #15535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Fixed an issue where the current cluster is used when navigating to the auth configuration portion of the app #15535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a27f74
Fixed an issue where the current cluster is used when navigating to t…
codyrancher Sep 29, 2025
5453b5c
Fixes a warning that's show on tables when a tab isn't present
codyrancher Sep 29, 2025
8a4401f
Updating the Users PO to use the local cluster
codyrancher Sep 29, 2025
b7f536e
Switched to blank cluster
codyrancher Sep 30, 2025
4696c34
Resolving some e2e issues
codyrancher Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cypress/e2e/tests/navigation/side-nav/product-side-nav-highlighting.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('Side navigation: Highlighting ', { tags: ['@navigation', '@adminUser']
const productNavPo = new ProductNavPo();

usersPo.goTo();
usersPo.waitForPage();
usersPo.waitForMastheadTitle('Users');
productNavPo.activeNavItem().should('equal', 'Users');

usersPo.userRetentionLink().click();
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/tests/pages/users-and-auth/azuread.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import HomePagePo from '@/cypress/e2e/po/pages/home.po';
import AzureadPo from '@/cypress/e2e/po/edit/auth/azuread.po';
import { AuthProvider, AuthProviderPo } from '@/cypress/e2e/po/pages/users-and-auth/authProvider.po';

const authProviderPo = new AuthProviderPo('local');
const azureadPo = new AzureadPo('local');
const authProviderPo = new AuthProviderPo('_');
const azureadPo = new AzureadPo('_');

const tenantId = '564b6f53-ebf4-43c3-8077-44c56a44990a';
const applicationId = '18cca356-170e-4bd9-a4a4-2e349855f96b';
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/tests/pages/users-and-auth/cognito.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import HomePagePo from '@/cypress/e2e/po/pages/home.po';
import AmazonCognitoPo from '@/cypress/e2e/po/edit/auth/cognito.po';
import { AuthProvider, AuthProviderPo } from '@/cypress/e2e/po/pages/users-and-auth/authProvider.po';

const authProviderPo = new AuthProviderPo('local');
const cognitoPo = new AmazonCognitoPo('local');
const authProviderPo = new AuthProviderPo('_');
const cognitoPo = new AmazonCognitoPo('_');

const clientId = 'test-client-id';
const clientSecret = 'test-client-secret';
Expand Down
2 changes: 1 addition & 1 deletion shell/components/form/ResourceTabs/composable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const useTabCountWatcher = () => {

export const useTabCountUpdater = () => {
const tabKey = randomStr();
const updateCount = inject<UpdateCountFn>(UPDATE_COUNT_PROVIDER_KEY);
const updateCount = inject<UpdateCountFn | undefined>(UPDATE_COUNT_PROVIDER_KEY, undefined);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't fix the noted issue but it does resolve a warning I was seeing in the console when a table was rendered outside of a tab.

image


const updateTabCount = (count: number | undefined) => {
updateCount?.(tabKey, count);
Expand Down
9 changes: 8 additions & 1 deletion shell/config/product/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
RBAC_BUILTIN, RBAC_DEFAULT, STATE, NAME as HEADER_NAME, AGE, SIMPLE_NAME
} from '@shell/config/table-headers';
import { MULTI_CLUSTER } from '@shell/store/features';
import { BLANK_CLUSTER } from '@shell/store/store-types';

export const NAME = 'auth';

Expand Down Expand Up @@ -34,6 +35,12 @@ export function init(store) {
removable: false,
showClusterSwitcher: false,
category: 'configuration',
to: {
name: 'c-cluster-product-resource',
params: {
product: NAME, resource: MANAGEMENT.USER, cluster: BLANK_CLUSTER
}
}
});

virtualType({
Expand All @@ -56,7 +63,7 @@ export function init(store) {
route: {
name: 'c-cluster-product-resource',
params: {
cluster: 'local',
cluster: BLANK_CLUSTER,
product: NAME,
resource: MANAGEMENT.USER,
}
Expand Down
Loading