External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-10 15:32:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Revert "better filter and match the tabs that should be rendered dynamic (#38199)" (#39986)

Browse Source 
This reverts commit 7bfceee8fb9faa01abefbea4e4a35839893f5a83.

this creates more issues than it fixes

fixes: #39971

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
Erik Jan de Wit 2025-06-05 13:44:39 +02:00 committed by GitHub
parent 259a1695f7
commit 087813de62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
js/apps/admin-ui/src/components/routable-tabs/RoutableTabs.tsx
View File

@ -12,11 +12,10 @@ import {
ReactElement,
isValidElement,
} from "react";
import { useTranslation } from "react-i18next";
import {
Path,
generatePath,
matchRoutes,
matchPath,
useHref,
useLocation,
useParams,
@ -24,8 +23,8 @@ import {
import { useServerInfo } from "../../context/server-info/ServerInfoProvider";
import { PageHandler } from "../../page/PageHandler";
import { TAB_PROVIDER } from "../../page/constants";
import { routes } from "../../routes";
import useIsFeatureEnabled, { Feature } from "../../utils/useIsFeatureEnabled";
import { useTranslation } from "react-i18next";
// TODO: Remove the custom 'children' props and type once the following issue has been resolved:
// https://github.com/patternfly/patternfly-react/issues/6766
@ -53,42 +52,27 @@ export const RoutableTabs = ({
const isFeatureEnabled = useIsFeatureEnabled();
const { t } = useTranslation();
const matchedTabs = tabs
.filter((tab) => matchPath({ path: tab.metadata.path }, pathname))
.map((t) => ({
...t,
pathname: generatePath(t.metadata.path, {
...params,
...t.metadata.params,
}),
}));
// Extract all keys from matchedTabs
const matchedTabsKeys = matchedTabs.map((t) => t.pathname);
// Extract event keys from children
const eventKeys = Children.toArray(children)
.filter((child): child is ChildElement => isValidElement(child))
.map((child) => child.props.eventKey.toString());
const keyLength = eventKeys[0]?.split("/").length;
const matchedPaths = (matchRoutes(routes, pathname) || []).map(
(match) => match.route.path,
);
// To render a dynamic tab we need to be on the right route, but also have the right number of path segments.
// Otherwise we might render this tab on a sub tab, which is not what we want.
const matchedTabs = tabs
.filter((tab) => {
const tabPath = tab.metadata.path;
return (
matchedPaths.includes(tabPath) &&
tabPath.split("/").length === keyLength
);
})
.map((tab) => {
const tabPath = tab.metadata.path;
const generateTabPath = generatePath(tabPath, {
...params,
...tab.metadata.params,
});
eventKeys.push(generateTabPath);
return {
...tab,
pathname: generateTabPath,
};
});
const allKeys = [...eventKeys, ...matchedTabsKeys];
// Determine if there is an exact match.
const exactMatch = eventKeys.find(
const exactMatch = allKeys.find(
(eventKey) => eventKey === decodeURI(pathname),
);