fix: review

Author: Raubzeug

src/containers/Cluster/Cluster.tsx

@@ -13,7 +13,10 @@ import {InternalLink} from '../../components/InternalLink';
 import {NetworkTable} from '../../components/NetworkTable/NetworkTable';
 import {useShouldShowClusterNetworkTable} from '../../components/NetworkTable/hooks';
 import routes, {getLocationObjectFromHref} from '../../routes';
-import {useClusterDashboardAvailable} from '../../store/reducers/capabilities/hooks';
+import {
+    useClusterDashboardAvailable,
+    useConfigAvailable,
+} from '../../store/reducers/capabilities/hooks';
 import {
     INITIAL_DEFAULT_CLUSTER_TAB,
     clusterApi,
@@ -72,6 +75,7 @@ export function Cluster({
     const shouldShowNetworkTable = useShouldShowClusterNetworkTable();
     const shouldShowEventsTab = useShouldShowEventsTab();
     const isViewerUser = useIsViewerUser();
+    const isConfigsAvailable = useConfigAvailable();
 
     const [autoRefreshInterval] = useAutoRefreshInterval();
 
@@ -276,7 +280,7 @@ export function Cluster({
                                 {uiFactory.renderEvents?.({scrollContainerRef: container})}
                             </Route>
                         )}
-                        {isViewerUser && (
+                        {isViewerUser && isConfigsAvailable && (
                             <Route
                                 path={
                                     getLocationObjectFromHref(

src/containers/Configs/Configs.tsx

@@ -4,7 +4,7 @@ import {SegmentedRadioGroup} from '@gravity-ui/uikit';
 
 import {TableWithControlsLayout} from '../../components/TableWithControlsLayout/TableWithControlsLayout';
 import {
-    useConfigAvailable,
+    useBaseConfigAvailable,
     useFeatureFlagsAvailable,
 } from '../../store/reducers/capabilities/hooks';
 import {cn} from '../../utils/cn';
@@ -30,7 +30,7 @@ export function Configs({database, className, scrollContainerRef}: ConfigsProps)
     const {configType} = useConfigQueryParams();
 
     const isFeaturesAvailable = useFeatureFlagsAvailable();
-    const isConfigsAvailable = useConfigAvailable();
+    const isConfigsAvailable = useBaseConfigAvailable();
 
     const options = React.useMemo(() => {
         const options: ConfigType[] = [];

src/containers/Configs/useConfigsQueryParams.ts

@@ -3,7 +3,7 @@ import React from 'react';
 import {StringParam, createEnumParam, useQueryParams, withDefault} from 'use-query-params';
 
 import {
-    useConfigAvailable,
+    useBaseConfigAvailable,
     useFeatureFlagsAvailable,
 } from '../../store/reducers/capabilities/hooks';
 
@@ -24,7 +24,7 @@ export const ConfigTypeValueParam = withDefault<ConfigType | undefined | null, '
 
 export function useConfigQueryParams() {
     const isFeaturesAvailable = useFeatureFlagsAvailable();
-    const isConfigsAvailable = useConfigAvailable();
+    const isConfigsAvailable = useBaseConfigAvailable();
     const [{configType, search}, setQueryParams] = useQueryParams({
         configType: ConfigTypeValueParam,
         search: StringParam,

src/containers/Node/Node.tsx

@@ -15,6 +15,7 @@ import {PageMetaWithAutorefresh} from '../../components/PageMeta/PageMeta';
 import routes from '../../routes';
 import {
     useCapabilitiesLoaded,
+    useConfigAvailable,
     useDiskPagesAvailable,
 } from '../../store/reducers/capabilities/hooks';
 import {setHeaderBreadcrumbs} from '../../store/reducers/header/header';
@@ -43,6 +44,9 @@ const STORAGE_ROLE = 'Storage';
 export function Node() {
     const container = React.useRef<HTMLDivElement>(null);
     const isViewerUser = useIsViewerUser();
+    const hasConfigs = useConfigAvailable();
+
+    const configsAvailable = isViewerUser && hasConfigs;
 
     const dispatch = useTypedDispatch();
 
@@ -78,7 +82,7 @@ export function Node() {
         if (!isStorageNode) {
             skippedTabs.push('storage');
         }
-        if (!isViewerUser) {
+        if (!configsAvailable) {
             skippedTabs.push('configs');
         }
         if (isDiskPagesAvailable) {
@@ -93,7 +97,7 @@ export function Node() {
             actualNodeTabs.find(({id}) => id === activeTabId) ?? actualNodeTabs[0];
 
         return {activeTab: actualActiveTab, nodeTabs: actualNodeTabs};
-    }, [isStorageNode, isDiskPagesAvailable, activeTabId, threadsQuantity, isViewerUser]);
+    }, [isStorageNode, isDiskPagesAvailable, activeTabId, threadsQuantity, configsAvailable]);
 
     const database = tenantNameFromQuery?.toString();
 

src/containers/Tenant/Diagnostics/Diagnostics.tsx

@@ -8,7 +8,6 @@ import {DrawerContextProvider} from '../../../components/Drawer/DrawerContext';
 import {InternalLink} from '../../../components/InternalLink';
 import {
     useConfigAvailable,
-    useFeatureFlagsAvailable,
     useTopicDataAvailable,
 } from '../../../store/reducers/capabilities/hooks';
 import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../store/reducers/tenant/constants';
@@ -64,16 +63,14 @@ function Diagnostics(props: DiagnosticsProps) {
         isDatabaseEntityType(type) ? database : '',
     );
 
-    const hasFeatureFlags = useFeatureFlagsAvailable();
     const hasConfigs = useConfigAvailable();
-    const configsAvailable = hasFeatureFlags || hasConfigs;
     const hasTopicData = useTopicDataAvailable();
     const isViewerUser = useIsViewerUser();
     const pages = getPagesByType(type, subType, {
         hasTopicData,
         isTopLevel: path === database,
         hasBackups: typeof uiFactory.renderBackups === 'function' && Boolean(controlPlane),
-        hasConfigs: isViewerUser && configsAvailable,
+        hasConfigs: isViewerUser && hasConfigs,
         hasAccess: uiFactory.hasAccess,
         databaseType,
     });

src/store/reducers/capabilities/hooks.ts

@@ -87,9 +87,16 @@ export const useClusterDashboardAvailable = () => {
 export const useStreamingAvailable = () => {
     return useGetFeatureVersion('/viewer/query') >= 8;
 };
-export const useConfigAvailable = () => {
+export const useBaseConfigAvailable = () => {
     return useGetFeatureVersion('/viewer/config') >= 1;
 };
+
+export const useConfigAvailable = () => {
+    const isBaseConfigsAvailable = useBaseConfigAvailable();
+    const isFeaturesAvailable = useFeatureFlagsAvailable();
+    return isBaseConfigsAvailable || isFeaturesAvailable;
+};
+
 export const useEditAccessAvailable = () => {
     return useGetFeatureVersion('/viewer/acl') >= 2 && !uiFactory.hideGrantAccess;
 };