Skip to content

[release-4.20] OCPBUGS-63616: Preserve path on perspective switch #15650

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
merged 3 commits into from
Nov 9, 2025
+11 −27
Merged

[release-4.20] OCPBUGS-63616: Preserve path on perspective switch #15650

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8912238
Use full location pathname when activating plugin route perspective
KevinFCormier Sep 26, 2025
3966ee7
Simplify duplicate code
KevinFCormier Sep 26, 2025
0e28ec1
Also preserve fragment and query string, if any
KevinFCormier Sep 26, 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
38 changes: 11 additions & 27 deletions frontend/packages/console-app/src/hooks/usePluginRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Route } from 'react-router-dom-v5-compat';
import { createPath, Route, useLocation } from 'react-router-dom-v5-compat';
import {
useActivePerspective,
RoutePage as DynamicRoutePageExtension,
Expand Down Expand Up @@ -50,18 +50,18 @@ const InactiveRoutePage: React.FCC<InactiveRoutePageProps> = ({
};

const RoutePage: React.FCC<RoutePageProps> = ({
path,
extension,
activePerspective,
setActivePerspective,
}) => {
const active = isRoutePageExtensionActive(extension, activePerspective);
const location = useLocation();
return active ? (
<LazyRoutePage extension={extension} />
) : (
<InactiveRoutePage
extension={extension}
path={path}
path={createPath(location)}
setActivePerspective={setActivePerspective}
/>
);
Expand All @@ -73,38 +73,23 @@ export const usePluginRoutes: UsePluginRoutes = () => {
const [activePerspective, setActivePerspective] = useActivePerspective();
const getRoutesForExtension = React.useCallback(
(extension: LoadedRoutePageExtension): React.ReactElement[] => {
if (Array.isArray(extension.properties.path)) {
return extension.properties.path.map((path) => (
<Route
{...extension.properties}
path={`${path}${extension.properties.exact ? '' : '/*'}`}
key={path}
element={
<RoutePage
extension={extension}
path={path}
activePerspective={activePerspective}
setActivePerspective={setActivePerspective}
/>
}
/>
));
}
return [
const paths = Array.isArray(extension.properties.path)
? extension.properties.path
: [extension.properties.path];
return paths.map((path) => (
<Route
{...extension.properties}
path={`${extension.properties.path}${extension.properties.exact ? '' : '/*'}`}
key={extension.properties.path}
path={`${path}${extension.properties.exact ? '' : '/*'}`}
key={path}
element={
<RoutePage
extension={extension}
path={extension.properties.path}
activePerspective={activePerspective}
setActivePerspective={setActivePerspective}
/>
}
/>,
];
/>
));
},
[activePerspective, setActivePerspective],
);
Expand Down Expand Up @@ -149,7 +134,6 @@ type InactiveRoutePageProps = {
};

type RoutePageProps = {
path: string;
extension: LoadedRoutePageExtension;
activePerspective: string;
setActivePerspective: SetActivePerspective;
Expand Down