Skip to content

fix(Cluster): show loader if capabilities not loaded #1785

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
Dec 25, 2024
Merged

fix(Cluster): show loader if capabilities not loaded #1785

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a5c907
fix(Cluster): show loader if capabilities not loaded
Raubzeug Dec 25, 2024
225f4c5
fix: typecheck
Raubzeug Dec 25, 2024
6d6ed98
fix: typecheck
Raubzeug Dec 25, 2024
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
15 changes: 10 additions & 5 deletions src/containers/App/Content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type {SlotComponent} from '../../components/slots/types';
import routes from '../../routes';
import type {RootState} from '../../store';
import {authenticationApi} from '../../store/reducers/authentication/authentication';
import {useCapabilitiesQuery} from '../../store/reducers/capabilities/hooks';
import {useCapabilitiesLoaded, useCapabilitiesQuery} from '../../store/reducers/capabilities/hooks';
import {nodesListApi} from '../../store/reducers/nodesList';
import {cn} from '../../utils/cn';
import {lazyComponent} from '../../utils/lazyComponent';
Expand Down Expand Up @@ -178,8 +178,7 @@ function DataWrapper({children}: {children: React.ReactNode}) {
return (
<GetUser>
<GetNodesList />
<GetCapabilities />
{children}
<GetCapabilities>{children}</GetCapabilities>
</GetUser>
);
}
Expand All @@ -199,9 +198,15 @@ function GetNodesList() {
return null;
}

function GetCapabilities() {
function GetCapabilities({children}: {children: React.ReactNode}) {
useCapabilitiesQuery();
return null;
const capabilitiesLoaded = useCapabilitiesLoaded();

return (
<LoaderWrapper loading={!capabilitiesLoaded} size="l">
{children}
</LoaderWrapper>
);
}

interface ContentWrapperProps {
Expand Down
Loading