Skip to content

fix(Header): wait for capabilities before show content #3145

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
wants to merge 2 commits into
base: main
Choose a base branch
from
+32 −12
Open

fix(Header): wait for capabilities before show content #3145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aec811
fix(Header): wait for capabilities before show content
Raubzeug Nov 28, 2025
2f88411
fix: ai review
Raubzeug Nov 28, 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
12 changes: 3 additions & 9 deletions src/containers/App/Content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import routes, {getClusterPath} from '../../routes';
import type {RootState} from '../../store';
import {authenticationApi} from '../../store/reducers/authentication/authentication';
import {
useCapabilitiesQuery,
useAllCapabilitiesStatus,
useClusterWithoutAuthInUI,
useMetaCapabilitiesLoaded,
useMetaCapabilitiesQuery,
Expand Down Expand Up @@ -235,11 +235,7 @@ function GetNodesList() {
}

function GetCapabilities({children}: {children: React.ReactNode}) {
const {data, error} = useCapabilitiesQuery();

useMetaCapabilitiesQuery();
// It is always true if there is no meta, since request finishes with an error
const metaCapabilitiesLoaded = useMetaCapabilitiesLoaded();
const {error, loading} = useAllCapabilitiesStatus();

//do nothing, authentication is in progress upon redirect
if (isRedirectToAuth(error)) {
Expand All @@ -250,10 +246,8 @@ function GetCapabilities({children}: {children: React.ReactNode}) {
return <AccessDenied />;
}

const capabilitiesLoaded = Boolean(data || error);

return (
<LoaderWrapper loading={!capabilitiesLoaded || !metaCapabilitiesLoaded} size="l">
<LoaderWrapper loading={loading} size="l">
{children}
</LoaderWrapper>
);
Expand Down
15 changes: 12 additions & 3 deletions src/containers/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {checkIsClustersPage, checkIsTenantPage, getClusterPath} from '../../rout
import {environment} from '../../store';
import {
useAddClusterFeatureAvailable,
useAllCapabilitiesStatus,
useDatabasesAvailable,
useDeleteDatabaseFeatureAvailable,
useEditDatabaseFeatureAvailable,
Expand Down Expand Up @@ -50,6 +51,7 @@ import './Header.scss';
const b = cn('header');

function Header() {
const {loading} = useAllCapabilitiesStatus();
const {page, pageBreadcrumbsOptions} = useTypedSelector((state) => state.header);
const singleClusterMode = useTypedSelector((state) => state.singleClusterMode);
const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
Expand Down Expand Up @@ -242,9 +244,12 @@ function Header() {
return null;
};

const renderHeader = () => {
const renderContent = () => {
if (loading) {
return null;
}
return (
<header className={b()}>
<React.Fragment>
<Breadcrumbs className={b('breadcrumbs')}>
{breadcrumbItems.map((item, index) => {
const {icon, text, link} = item;
Expand All @@ -268,9 +273,13 @@ function Header() {
</Breadcrumbs>

{renderRightControls()}
</header>
</React.Fragment>
);
};

const renderHeader = () => {
return <header className={b()}>{renderContent()}</header>;
};
return renderHeader();
}

Expand Down
17 changes: 17 additions & 0 deletions src/store/reducers/capabilities/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import React from 'react';

import type {Capability, MetaCapability, SecuritySetting} from '../../../types/api/capabilities';
import {uiFactory} from '../../../uiFactory/uiFactory';
import {useTypedSelector} from '../../../utils/hooks';
Expand Down Expand Up @@ -30,6 +32,21 @@ export function useCapabilitiesLoaded() {
return Boolean(data || error);
}

export function useAllCapabilitiesStatus() {
const {data, error} = useCapabilitiesQuery();

useMetaCapabilitiesQuery();
// It is always true if there is no meta, since request finishes with an error
const metaCapabilitiesLoaded = useMetaCapabilitiesLoaded();

const capabilitiesLoaded = Boolean(data || error);
Copy link
Member

@artemmufazalov artemmufazalov Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is hook useCapabilitiesLoaded for capabilities. So you can use:

useCapabilitiesQuery()
useMetaCapabilitiesQuery()

const capabilitiesLoaded = useCapabilitiesLoaded()
const metaCapabilitiesLoaded = useMetaCapabilitiesLoaded()

It doesn't change much, but it hide loading logic within one hook


return React.useMemo(
() => ({error, loading: !capabilitiesLoaded || !metaCapabilitiesLoaded}),
[error, capabilitiesLoaded, metaCapabilitiesLoaded],
);
}

const useGetFeatureVersion = (feature: Capability) => {
const database = useDatabaseFromQuery();

Expand Down
Loading