Skip to content

EDM-2730: Redirect to valid page after switching organization #409

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

Merged
celdrake merged 2 commits into from
Dec 16, 2025
Merged

EDM-2730: Redirect to valid page after switching organization #409

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dcb016
EDM-2730: Redirect to valid page after switching organization
celdrake Dec 3, 2025
8a117f8
Use routes
celdrake Dec 10, 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
39 changes: 38 additions & 1 deletion libs/ui-components/src/components/common/PageNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { useOrganizationGuardContext } from './OrganizationGuard';
import OrganizationSelector from './OrganizationSelector';
import { RESOURCE, VERB } from '../../types/rbac';
import { usePermissionsContext } from './PermissionsContext';
import { useAppContext } from '../../hooks/useAppContext';

import './PageNavigation.css';

Expand Down Expand Up @@ -63,9 +64,44 @@ const OrganizationDropdown = ({ organizationName, onSwitchOrganization }: Organi
);
};

const listRoutes = [ROUTE.FLEETS, ROUTE.DEVICES, ROUTE.REPOSITORIES, ROUTE.ENROLLMENT_REQUESTS, ROUTE.AUTH_PROVIDERS];

const getRedirectPathAfterOrgSwitch = (pathname: string, appRoutes: Record<ROUTE, string>): string => {
const routeMapping: Array<{ detailRoutes: ROUTE[]; listRoute: ROUTE }> = [
{ detailRoutes: [ROUTE.FLEET_DETAILS, ROUTE.FLEET_EDIT], listRoute: ROUTE.FLEETS },
{ detailRoutes: [ROUTE.DEVICE_DETAILS, ROUTE.DEVICE_EDIT], listRoute: ROUTE.DEVICES },
{ detailRoutes: [ROUTE.REPO_DETAILS, ROUTE.REPO_EDIT], listRoute: ROUTE.REPOSITORIES },
{ detailRoutes: [ROUTE.ENROLLMENT_REQUEST_DETAILS], listRoute: ROUTE.ENROLLMENT_REQUESTS },
{ detailRoutes: [ROUTE.AUTH_PROVIDER_DETAILS, ROUTE.AUTH_PROVIDER_EDIT], listRoute: ROUTE.AUTH_PROVIDERS },
];

// Map detail/edit routes to their corresponding list routes
for (const { detailRoutes, listRoute } of routeMapping) {
for (const detailRoute of detailRoutes) {
const detailPath = appRoutes[detailRoute];
if (detailPath && pathname.startsWith(detailPath + '/')) {
return appRoutes[listRoute];
}
}
}

// If in a list page, we can stay on the same page
for (const listRoute of listRoutes) {
const listPath = appRoutes[listRoute];
if (listPath && pathname === listPath) {
return listPath;
}
}

// Default to root/overview
return appRoutes[ROUTE.ROOT];
};

const PageNavigation = ({ showSettings = true }: { showSettings?: boolean }) => {
const { t } = useTranslation();
const navigate = useNavigate();
const { router } = useAppContext();
const location = router.useLocation();
const { currentOrganization, availableOrganizations } = useOrganizationGuardContext();
const { checkPermissions } = usePermissionsContext();
const [isAdmin] = checkPermissions([{ kind: RESOURCE.AUTH_PROVIDER, verb: VERB.CREATE }]);
Expand Down Expand Up @@ -123,7 +159,8 @@ const PageNavigation = ({ showSettings = true }: { showSettings?: boolean }) =>
onClose={(isChanged) => {
setShowOrganizationModal(false);
if (isChanged) {
window.location.reload();
const targetPath = getRedirectPathAfterOrgSwitch(location.pathname, router.appRoutes);
window.location.href = targetPath;
}
}}
/>
Expand Down