Skip to content

fix: tune databases handler call #3221

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

Merged
Raubzeug merged 1 commit into from
Dec 15, 2025
Merged

fix: tune databases handler call #3221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/ConnectToDB/ConnectToDBDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions src/components/TenantNameWrapper/TenantNameWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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}
Expand All @@ -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},
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {checkIsClustersPage, checkIsTenantPage, getClusterPath} from '../../rout
import {environment} from '../../store';
import {
useAddClusterFeatureAvailable,
useDatabasesAvailable,
useDeleteDatabaseFeatureAvailable,
useEditDatabaseFeatureAvailable,
useMetaCapabilitiesLoaded,
Expand All @@ -36,6 +35,7 @@ import {
useClusterNameFromQuery,
useDatabaseFromQuery,
} from '../../utils/hooks/useDatabaseFromQuery';
import {useDatabasesV2} from '../../utils/hooks/useDatabasesV2';
import {
useIsUserAllowedToMakeChanges,
useIsViewerUser,
Expand All @@ -57,7 +57,7 @@ function Header() {
const isUserAllowedToMakeChanges = useIsUserAllowedToMakeChanges();
const isViewerUser = useIsViewerUser();

const isMetaDatabasesAvailable = useDatabasesAvailable();
const isMetaDatabasesAvailable = useDatabasesV2();

const {title: clusterTitle, monitoring} = useClusterBaseInfo();

Expand Down
4 changes: 2 additions & 2 deletions src/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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';
Expand Down Expand Up @@ -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},
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Tenants/Tenants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand Down Expand Up @@ -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},
Expand Down
3 changes: 2 additions & 1 deletion src/services/api/meta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/store/reducers/tenant/tenant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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(
{
Expand Down
9 changes: 9 additions & 0 deletions src/utils/hooks/useDatabasesV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Comment on lines +3 to +8
Copy link

Copilot AI Dec 15, 2025

Choose a reason for hiding this comment

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

The return value of this hook should be memoized using useMemo to prevent unnecessary re-renders. The hook currently returns a newly computed boolean value on every render, even when the dependencies haven't changed. This is particularly important since this hook is used in multiple components that may render frequently (Tenants, Header, TenantOverview, etc.).

The computation involves property access and logical operations that should be memoized according to the project's React performance guidelines.

Suggested change
export function useDatabasesV2() {
const {settings} = useClusterBaseInfo();
const isMetaDatabasesAvailable = useDatabasesAvailable();
return settings?.use_meta_proxy !== false && isMetaDatabasesAvailable;
import {useMemo} from 'react';
export function useDatabasesV2() {
const {settings} = useClusterBaseInfo();
const isMetaDatabasesAvailable = useDatabasesAvailable();
return useMemo(
() => settings?.use_meta_proxy !== false && isMetaDatabasesAvailable,
[settings?.use_meta_proxy, isMetaDatabasesAvailable],
);

Copilot uses AI. Check for mistakes.
}
Loading