Skip to content

OCPBUGS-85242: Add Suspense boundary to LazyRoutePage for plugin routes #16409

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

Open
logonoff wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −4
Open

OCPBUGS-85242: Add Suspense boundary to LazyRoutePage for plugin routes #16409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 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,11 +1,12 @@
import type { FC, ReactElement, ComponentType } from 'react';
import { useMemo, lazy, useEffect } from 'react';
import { useMemo, lazy, useEffect, Suspense } from 'react';
import type { RouteProps } from 'react-router';
import { createPath, Route, useLocation } from 'react-router';
import { RoutePage, isRoutePage } from '@console/dynamic-plugin-sdk/src/extensions/pages';
import { useActivePerspective } from '@console/dynamic-plugin-sdk/src/perspective';
import type { LoadedExtension } from '@console/dynamic-plugin-sdk/src/types';
import { useExtensions } from '@console/plugin-sdk/src/api/useExtensions';
import { LoadingBox } from '@console/shared/src/components/loading/LoadingBox';

const isRoutePageExtensionActive: IsRouteExtensionActive = (extension, activePerspective) =>
(extension.properties.perspective ?? activePerspective) === activePerspective;
Expand All @@ -14,7 +15,7 @@ const isRoutePageExtensionActive: IsRouteExtensionActive = (extension, activePer
const lazyComponentCache = new Map<string, React.LazyExoticComponent<ComponentType<any>>>();

const LazyRoutePage: FC<LazyRoutePageProps> = ({ extension }) => {
const { uid, properties } = extension;
const { pluginName, uid, properties } = extension;
const { component } = properties;
const LazyComponent = useMemo(() => {
if (!lazyComponentCache.has(uid)) {
Expand All @@ -29,7 +30,11 @@ const LazyRoutePage: FC<LazyRoutePageProps> = ({ extension }) => {
return lazyComponentCache.get(uid);
}, [uid, component]);

return <LazyComponent />;
return (
<Suspense fallback={<LoadingBox blame={`${pluginName}: ${extension.uid}`} />}>
<LazyComponent />
</Suspense>
);
};

const InactiveRoutePage: FC<InactiveRoutePageProps> = ({
Expand Down
2 changes: 1 addition & 1 deletion frontend/public/components/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ const AppRouter: FC = () => {
);

return (
<BrowserRouter basename={window.SERVER_FLAGS.basePath}>
<BrowserRouter unstable_useTransitions={false} basename={window.SERVER_FLAGS.basePath}>
<Routes>
{/*
Treat the authentication error page as a standalone route.
Expand Down