Skip to content
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.

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

feat: request clusters handler only on Versions tab #2008

Merged
merged 1 commit into from
Mar 17, 2025
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: 0 additions & 16 deletions src/containers/AppWithClusters/ExtendedCluster/ExtendedCluster.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ import {useClusterBaseInfo} from '../../../store/reducers/cluster/cluster';
import type {
AdditionalClusterProps,
AdditionalTenantsProps,
AdditionalVersionsProps,
NodeAddress,
} from '../../../types/additionalProps';
import type {MetaClusterVersion} from '../../../types/api/meta';
import type {ETenantType} from '../../../types/api/tenant';
import {getVersionColors, getVersionMap} from '../../../utils/clusterVersionColors';
import {cn} from '../../../utils/cn';
import {USE_CLUSTER_BALANCER_AS_BACKEND_KEY} from '../../../utils/constants';
import {useSetting} from '../../../utils/hooks';
Expand All @@ -18,7 +15,6 @@ import type {GetMonitoringClusterLink, GetMonitoringLink} from '../../../utils/m
import {getCleanBalancerValue, removeViewerPathname} from '../../../utils/parseBalancer';
import {getBackendFromNodeHost, getBackendFromRawNodeData} from '../../../utils/prepareBackend';
import type {Cluster} from '../../Cluster/Cluster';
import {useClusterVersions} from '../useClusterData';

import './ExtendedCluster.scss';

Expand Down Expand Up @@ -61,16 +57,6 @@ const getAdditionalClusterProps = (
return additionalClusterProps;
};

const getAdditionalVersionsProps = (
versions: MetaClusterVersion[] = [],
): AdditionalVersionsProps => {
return {
getVersionToColorMap: () => {
return getVersionColors(getVersionMap(versions));
},
};
};

const getAdditionalTenantsProps = (
clusterName: string | undefined,
monitoring: string | undefined,
Expand Down Expand Up @@ -126,7 +112,6 @@ export function ExtendedCluster({
getMonitoringLink,
getMonitoringClusterLink,
}: ExtendedClusterProps) {
const versions = useClusterVersions();
const additionalNodesProps = useAdditionalNodesProps();
const {name, balancer, monitoring} = useClusterBaseInfo();

Expand All @@ -141,7 +126,6 @@ export function ExtendedCluster({
balancer,
getMonitoringClusterLink,
)}
additionalVersionsProps={getAdditionalVersionsProps(versions)}
additionalTenantsProps={getAdditionalTenantsProps(
name,
monitoring,
Expand Down
17 changes: 0 additions & 17 deletions src/containers/AppWithClusters/useClusterData.ts

This file was deleted.

13 changes: 1 addition & 12 deletions src/containers/Cluster/Cluster.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@ import type {
AdditionalClusterProps,
AdditionalNodesProps,
AdditionalTenantsProps,
AdditionalVersionsProps,
} from '../../types/additionalProps';
import {cn} from '../../utils/cn';
import {useTypedDispatch, useTypedSelector} from '../../utils/hooks';
import {parseVersionsToVersionToColorMap} from '../../utils/versions';
import {Nodes} from '../Nodes/Nodes';
import {PaginatedStorage} from '../Storage/PaginatedStorage';
import {TabletsTable} from '../Tablets/TabletsTable';
Expand All @@ -46,14 +44,12 @@ interface ClusterProps {
additionalTenantsProps?: AdditionalTenantsProps;
additionalNodesProps?: AdditionalNodesProps;
additionalClusterProps?: AdditionalClusterProps;
additionalVersionsProps?: AdditionalVersionsProps;
}

export function Cluster({
additionalClusterProps,
additionalTenantsProps,
additionalNodesProps,
additionalVersionsProps,
}: ClusterProps) {
const container = React.useRef<HTMLDivElement>(null);
const isClusterDashboardAvailable = useClusterDashboardAvailable();
Expand Down Expand Up @@ -91,13 +87,6 @@ export function Cluster({
dispatch(setHeaderBreadcrumbs('cluster', {}));
}, [dispatch]);

const versionToColor = React.useMemo(() => {
if (additionalVersionsProps?.getVersionToColorMap) {
return additionalVersionsProps?.getVersionToColorMap();
}
return parseVersionsToVersionToColorMap(cluster?.Versions);
}, [additionalVersionsProps, cluster]);

const getClusterTitle = () => {
if (infoLoading) {
return <Skeleton className={b('title-skeleton')} />;
Expand Down Expand Up @@ -204,7 +193,7 @@ export function Cluster({
getLocationObjectFromHref(getClusterPath(clusterTabsIds.versions)).pathname
}
>
<Versions versionToColor={versionToColor} cluster={cluster} />
<Versions cluster={cluster} />
</Route>
<Route
render={() => (
Expand Down
8 changes: 4 additions & 4 deletions src/containers/Versions/Versions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {Checkbox, RadioButton} from '@gravity-ui/uikit';
import {Loader} from '../../components/Loader';
import {nodesApi} from '../../store/reducers/nodes/nodes';
import type {TClusterInfo} from '../../types/api/cluster';
import type {VersionToColorMap} from '../../types/versions';
import {cn} from '../../utils/cn';
import {useAutoRefreshInterval} from '../../utils/hooks';
import {VersionsBar} from '../Cluster/VersionsBar/VersionsBar';
Expand All @@ -14,19 +13,20 @@ import {GroupedNodesTree} from './GroupedNodesTree/GroupedNodesTree';
import {getGroupedStorageNodes, getGroupedTenantNodes, getOtherNodes} from './groupNodes';
import i18n from './i18n';
import {GroupByValue} from './types';
import {useGetVersionValues} from './utils';
import {useGetVersionValues, useVersionToColorMap} from './utils';

import './Versions.scss';

const b = cn('ydb-versions');

interface VersionsProps {
versionToColor?: VersionToColorMap;
cluster?: TClusterInfo;
}

export const Versions = ({versionToColor, cluster}: VersionsProps) => {
export const Versions = ({cluster}: VersionsProps) => {
const [autoRefreshInterval] = useAutoRefreshInterval();
const versionToColor = useVersionToColorMap();

const versionsValues = useGetVersionValues(cluster, versionToColor);
const {currentData, isLoading: isNodesLoading} = nodesApi.useGetNodesQuery(
{tablets: false, fieldsRequired: ['SystemState']},
Expand Down
40 changes: 39 additions & 1 deletion src/containers/Versions/utils.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import React from 'react';

import {skipToken} from '@reduxjs/toolkit/query';
import {StringParam, useQueryParam} from 'use-query-params';

import {clustersApi} from '../../store/reducers/clusters/clusters';
import {nodesApi} from '../../store/reducers/nodes/nodes';
import {isClusterInfoV2} from '../../types/api/cluster';
import type {TClusterInfo} from '../../types/api/cluster';
import type {VersionToColorMap} from '../../types/versions';
import {parseNodeGroupsToVersionsValues, parseNodesToVersionsValues} from '../../utils/versions';
import {getVersionColors, getVersionMap} from '../../utils/clusterVersionColors';
import {useTypedSelector} from '../../utils/hooks';
import {
parseNodeGroupsToVersionsValues,
parseNodesToVersionsValues,
parseVersionsToVersionToColorMap,
} from '../../utils/versions';

export const useGetVersionValues = (cluster?: TClusterInfo, versionToColor?: VersionToColorMap) => {
const {currentData} = nodesApi.useGetNodesQuery(
Expand Down Expand Up @@ -42,3 +50,33 @@ export const useGetVersionValues = (cluster?: TClusterInfo, versionToColor?: Ver

return versionsValues;
};

export function useVersionToColorMap(cluster?: TClusterInfo) {
const getVersionToColorMap = useGetClusterVersionToColorMap();

return React.useMemo(() => {
if (getVersionToColorMap) {
return getVersionToColorMap();
}
return parseVersionsToVersionToColorMap(cluster?.Versions);
}, [cluster?.Versions, getVersionToColorMap]);
}

/** For multi-cluster version - with using meta handlers */
function useGetClusterVersionToColorMap(): (() => VersionToColorMap) | undefined {
const [clusterName] = useQueryParam('clusterName', StringParam);
const singleClusterMode = useTypedSelector((state) => state.singleClusterMode);
const {data} = clustersApi.useGetClustersListQuery(undefined, {skip: singleClusterMode});

return React.useMemo(() => {
if (singleClusterMode) {
return undefined;
}

const clusters = data || [];
const info = clusters.find((cluster) => cluster.name === clusterName);
const versions = info?.versions || [];

return () => getVersionColors(getVersionMap(versions));
}, [singleClusterMode, data, clusterName]);
}
5 changes: 0 additions & 5 deletions src/types/additionalProps.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import type {TSystemStateInfo} from './api/nodes';
import type {ETenantType} from './api/tenant';
import type {InfoItem} from './components';
import type {VersionToColorMap} from './versions';

export interface AdditionalVersionsProps {
getVersionToColorMap?: () => VersionToColorMap;
}

export interface ClusterLink {
title: string;
Expand Down
Loading