Skip to content

Commit 01b8424

Browse files
authored
fix(Cluster): show loader if capabilities not loaded (#1785)
1 parent 01a2ce6 commit 01b8424

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/containers/App/Content.tsx

+10-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import type {SlotComponent} from '../../components/slots/types';
1212
import routes from '../../routes';
1313
import type {RootState} from '../../store';
1414
import {authenticationApi} from '../../store/reducers/authentication/authentication';
15-
import {useCapabilitiesQuery} from '../../store/reducers/capabilities/hooks';
15+
import {useCapabilitiesLoaded, useCapabilitiesQuery} from '../../store/reducers/capabilities/hooks';
1616
import {nodesListApi} from '../../store/reducers/nodesList';
1717
import {cn} from '../../utils/cn';
1818
import {lazyComponent} from '../../utils/lazyComponent';
@@ -178,8 +178,7 @@ function DataWrapper({children}: {children: React.ReactNode}) {
178178
return (
179179
<GetUser>
180180
<GetNodesList />
181-
<GetCapabilities />
182-
{children}
181+
<GetCapabilities>{children}</GetCapabilities>
183182
</GetUser>
184183
);
185184
}
@@ -199,9 +198,15 @@ function GetNodesList() {
199198
return null;
200199
}
201200

202-
function GetCapabilities() {
201+
function GetCapabilities({children}: {children: React.ReactNode}) {
203202
useCapabilitiesQuery();
204-
return null;
203+
const capabilitiesLoaded = useCapabilitiesLoaded();
204+
205+
return (
206+
<LoaderWrapper loading={!capabilitiesLoaded} size="l">
207+
{children}
208+
</LoaderWrapper>
209+
);
205210
}
206211

207212
interface ContentWrapperProps {

0 commit comments

Comments
 (0)