Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions src/containers/App/Content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import routes from '../../routes';
import type {RootState} from '../../store';
import {authenticationApi} from '../../store/reducers/authentication/authentication';
import {
useCapabilitiesLoaded,
useCapabilitiesQuery,
useClusterWithoutAuthInUI,
useMetaCapabilitiesLoaded,
Expand All @@ -24,6 +23,7 @@ import {nodesListApi} from '../../store/reducers/nodesList';
import {cn} from '../../utils/cn';
import {useDatabaseFromQuery} from '../../utils/hooks/useDatabaseFromQuery';
import {lazyComponent} from '../../utils/lazyComponent';
import {isAccessError, isRedirectToAuth} from '../../utils/response';
import Authentication from '../Authentication/Authentication';
import {getClusterPath} from '../Cluster/utils';
import Header from '../Header/Header';
Expand Down Expand Up @@ -207,13 +207,23 @@ function GetNodesList() {
}

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

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

//do nothing, authentication is in progress upon redirect
if (isRedirectToAuth(error)) {
return null;
}

if (isAccessError(error)) {
return <AccessDenied />;
}

const capabilitiesLoaded = Boolean(data || error);

return (
<LoaderWrapper loading={!capabilitiesLoaded || !metaCapabilitiesLoaded} size="l">
{children}
Expand Down
2 changes: 1 addition & 1 deletion src/store/reducers/capabilities/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
export function useCapabilitiesQuery() {
const database = useDatabaseFromQuery();

capabilitiesApi.useGetClusterCapabilitiesQuery({database});
return capabilitiesApi.useGetClusterCapabilitiesQuery({database});
}

export function useCapabilitiesLoaded() {
Expand Down
Loading