fix: tune databases handler call (#3221)

Author: Raubzeug

src/components/ConnectToDB/ConnectToDBDialog.tsx

@@ -4,11 +4,11 @@ import NiceModal from '@ebay/nice-modal-react';
 import {Dialog, Tab, TabList, TabProvider} from '@gravity-ui/uikit';
 import {skipToken} from '@reduxjs/toolkit/query';
 
-import {useDatabasesAvailable} from '../../store/reducers/capabilities/hooks';
 import {tenantApi} from '../../store/reducers/tenant/tenant';
 import {cn} from '../../utils/cn';
 import {useTypedSelector} from '../../utils/hooks';
 import {useClusterNameFromQuery} from '../../utils/hooks/useDatabaseFromQuery';
+import {useDatabasesV2} from '../../utils/hooks/useDatabasesV2';
 import {LinkWithIcon} from '../LinkWithIcon/LinkWithIcon';
 import {LoaderWrapper} from '../LoaderWrapper/LoaderWrapper';
 import {YDBSyntaxHighlighterLazy} from '../SyntaxHighlighter/lazy';
@@ -49,7 +49,7 @@ function ConnectToDBDialog({
     const clusterName = useClusterNameFromQuery();
     const singleClusterMode = useTypedSelector((state) => state.singleClusterMode);
 
-    const isMetaDatabasesAvailable = useDatabasesAvailable();
+    const isMetaDatabasesAvailable = useDatabasesV2();
 
     // If there is endpoint from props, we don't need to request tenant data
     // Also we should not request tenant data if we are in single cluster mode

src/components/TenantNameWrapper/TenantNameWrapper.tsx

@@ -37,6 +37,7 @@ const getTenantBackend = (
 
 export function TenantNameWrapper({tenant, additionalTenantsProps}: TenantNameWrapperProps) {
     const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
+    const {settings} = useClusterBaseInfo();
 
     const backend = getTenantBackend(tenant, additionalTenantsProps);
     const isExternalLink = Boolean(backend);
@@ -60,7 +61,7 @@ export function TenantNameWrapper({tenant, additionalTenantsProps}: TenantNameWr
                 </DefinitionList.Item>
             </DefinitionList>
         ) : null;
-
+    const useDatabaseId = uiFactory.useDatabaseId && settings?.use_meta_proxy !== false;
     return (
         <EntityStatus
             externalLink={isExternalLink}
@@ -71,7 +72,7 @@ export function TenantNameWrapper({tenant, additionalTenantsProps}: TenantNameWr
             hasClipboardButton
             path={getTenantPath(
                 {
-                    database: uiFactory.useDatabaseId ? tenant.Id : tenant.Name,
+                    database: useDatabaseId ? tenant.Id : tenant.Name,
                     backend,
                 },
                 {withBasename: isExternalLink},

src/containers/Header/Header.tsx

@@ -19,7 +19,6 @@ import {checkIsClustersPage, checkIsTenantPage, getClusterPath} from '../../rout
 import {environment} from '../../store';
 import {
     useAddClusterFeatureAvailable,
-    useDatabasesAvailable,
     useDeleteDatabaseFeatureAvailable,
     useEditDatabaseFeatureAvailable,
     useMetaCapabilitiesLoaded,
@@ -36,6 +35,7 @@ import {
     useClusterNameFromQuery,
     useDatabaseFromQuery,
 } from '../../utils/hooks/useDatabaseFromQuery';
+import {useDatabasesV2} from '../../utils/hooks/useDatabasesV2';
 import {
     useIsUserAllowedToMakeChanges,
     useIsViewerUser,
@@ -57,7 +57,7 @@ function Header() {
     const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
     const isViewerUser = useIsViewerUser();
 
-    const isMetaDatabasesAvailable = useDatabasesAvailable();
+    const isMetaDatabasesAvailable = useDatabasesV2();
 
     const {title: clusterTitle, monitoring} = useClusterBaseInfo();
 

src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx

@@ -4,7 +4,6 @@ import {Button, Flex, HelpMark, Icon, Label} from '@gravity-ui/uikit';
 import {EntityStatus} from '../../../../components/EntityStatus/EntityStatus';
 import {LoaderWrapper} from '../../../../components/LoaderWrapper/LoaderWrapper';
 import {QueriesActivityBar} from '../../../../components/QueriesActivityBar/QueriesActivityBar';
-import {useDatabasesAvailable} from '../../../../store/reducers/capabilities/hooks';
 import {useClusterBaseInfo} from '../../../../store/reducers/cluster/cluster';
 import {overviewApi} from '../../../../store/reducers/overview/overview';
 import {
@@ -19,6 +18,7 @@ import {getInfoTabLinks} from '../../../../utils/additionalProps';
 import {TENANT_DEFAULT_TITLE} from '../../../../utils/constants';
 import {useAutoRefreshInterval, useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
 import {useClusterNameFromQuery} from '../../../../utils/hooks/useDatabaseFromQuery';
+import {useDatabasesV2} from '../../../../utils/hooks/useDatabasesV2';
 import {canShowTenantMonitoringTab} from '../../../../utils/monitoringVisibility';
 import {useTenantPage} from '../../TenantNavigation/useTenantNavigation';
 import {mapDatabaseTypeToDBName} from '../../utils/schema';
@@ -52,7 +52,7 @@ export function TenantOverview({
 
     const {handleTenantPageChange} = useTenantPage();
 
-    const isMetaDatabasesAvailable = useDatabasesAvailable();
+    const isMetaDatabasesAvailable = useDatabasesV2();
 
     const {currentData: tenant, isFetching} = tenantApi.useGetTenantInfoQuery(
         {database, clusterName, isMetaDatabasesAvailable},

src/containers/Tenants/Tenants.tsx

@@ -17,7 +17,6 @@ import {TableWithControlsLayout} from '../../components/TableWithControlsLayout/
 import {TenantNameWrapper} from '../../components/TenantNameWrapper/TenantNameWrapper';
 import {
     useCreateDatabaseFeatureAvailable,
-    useDatabasesAvailable,
     useDeleteDatabaseFeatureAvailable,
     useEditDatabaseFeatureAvailable,
 } from '../../store/reducers/capabilities/hooks';
@@ -42,6 +41,7 @@ import {
 } from '../../utils/dataFormatters/dataFormatters';
 import {useAutoRefreshInterval, useSetting} from '../../utils/hooks';
 import {useClusterNameFromQuery} from '../../utils/hooks/useDatabaseFromQuery';
+import {useDatabasesV2} from '../../utils/hooks/useDatabasesV2';
 import {isNumeric} from '../../utils/utils';
 
 import i18n from './i18n';
@@ -77,7 +77,7 @@ interface TenantsProps {
 
 export const Tenants = ({additionalTenantsProps, scrollContainerRef}: TenantsProps) => {
     const clusterName = useClusterNameFromQuery();
-    const isMetaDatabasesAvailable = useDatabasesAvailable();
+    const isMetaDatabasesAvailable = useDatabasesV2();
     const [autoRefreshInterval] = useAutoRefreshInterval();
     const {currentData, isFetching, error} = tenantsApi.useGetTenantsInfoQuery(
         {clusterName, isMetaDatabasesAvailable},

src/services/api/meta.ts

@@ -43,7 +43,8 @@ export class MetaAPI extends BaseMetaAPI {
         {signal}: AxiosOptions = {},
     ) {
         return this.get<MetaTenants>(
-            this.getPath('/meta/cp_databases', clusterName),
+            // cp_databases never should be proxying to cluster
+            this.getPath('/meta/cp_databases'),
             {
                 cluster_name: clusterName,
                 database_name: database,

src/store/reducers/tenant/tenant.ts

@@ -3,8 +3,8 @@ import type {PayloadAction} from '@reduxjs/toolkit';
 
 import type {TTenantInfo} from '../../../types/api/tenant';
 import {useClusterNameFromQuery} from '../../../utils/hooks/useDatabaseFromQuery';
+import {useDatabasesV2} from '../../../utils/hooks/useDatabasesV2';
 import {api} from '../api';
-import {useDatabasesAvailable} from '../capabilities/hooks';
 import {prepareTenants} from '../tenants/utils';
 
 import {TENANT_DIAGNOSTICS_TABS_IDS, TENANT_METRICS_TABS_IDS} from './constants';
@@ -101,7 +101,7 @@ export const tenantApi = api.injectEndpoints({
 
 export function useTenantBaseInfo(database: string) {
     const clusterNameFromQuery = useClusterNameFromQuery();
-    const isMetaDatabasesAvailable = useDatabasesAvailable();
+    const isMetaDatabasesAvailable = useDatabasesV2();
 
     const {currentData, isLoading, isError} = tenantApi.useGetTenantInfoQuery(
         {

src/utils/hooks/useDatabasesV2.ts

@@ -0,0 +1,9 @@
+import {useDatabasesAvailable} from '../../store/reducers/capabilities/hooks';
+import {useClusterBaseInfo} from '../../store/reducers/cluster/cluster';
+
+export function useDatabasesV2() {
+    const {settings} = useClusterBaseInfo();
+    const isMetaDatabasesAvailable = useDatabasesAvailable();
+
+    return settings?.use_meta_proxy !== false && isMetaDatabasesAvailable;
+}