From ae07d119e5ebb417e0eb28148b6c2be8f220bcdf Mon Sep 17 00:00:00 2001 From: Anton Standrik Date: Mon, 23 Sep 2024 16:22:38 +0300 Subject: [PATCH 1/9] feat: how vdisks of selected group in a special color --- public/index.html | 2 +- .../DiskStateProgressBar/DiskStateProgressBar.scss | 4 ++++ src/components/VDisk/VDisk.tsx | 3 +++ src/containers/AppWithClusters/useClusterData.ts | 8 ++++++-- src/containers/Storage/PDisk/PDisk.tsx | 12 ++++++++---- src/containers/Storage/PaginatedStorage.tsx | 10 ++++++++-- src/containers/Storage/Storage.tsx | 5 ++++- src/containers/Storage/StorageNodes/StorageNodes.tsx | 4 ++-- .../Storage/StorageNodes/columns/columns.tsx | 3 ++- src/types/additionalProps.ts | 1 + src/utils/additionalProps.ts | 12 +++++++++--- 11 files changed, 48 insertions(+), 16 deletions(-) diff --git a/public/index.html b/public/index.html index ba627094c8..dacbd926d7 100644 --- a/public/index.html +++ b/public/index.html @@ -23,7 +23,7 @@ window.systemSettings = {}; window.userSettings = {}; window.web_version = !'%REACT_APP_BACKEND%'; - window.custom_backend = '%NODE_ENV%' === 'development' && '%REACT_APP_BACKEND%'; + window.custom_backend = 'http://ydb-vla-dev02-000.search.yandex.net:8765'; window.meta_backend = '%REACT_APP_META_BACKEND%' diff --git a/src/components/DiskStateProgressBar/DiskStateProgressBar.scss b/src/components/DiskStateProgressBar/DiskStateProgressBar.scss index cdb2a2074e..47a69d1d2d 100644 --- a/src/components/DiskStateProgressBar/DiskStateProgressBar.scss +++ b/src/components/DiskStateProgressBar/DiskStateProgressBar.scss @@ -35,6 +35,10 @@ background-color: unset; } + &#{&}_compact#{&}_faded { + opacity: 0.5; + } + &_empty { color: var(--g-color-text-hint); border-style: dashed; diff --git a/src/components/VDisk/VDisk.tsx b/src/components/VDisk/VDisk.tsx index fce2d399ce..2a4256dc60 100644 --- a/src/components/VDisk/VDisk.tsx +++ b/src/components/VDisk/VDisk.tsx @@ -21,6 +21,7 @@ export interface VDiskProps { data?: PreparedVDisk; nodes?: NodesMap; compact?: boolean; + faded?: boolean; showPopup?: boolean; onShowPopup?: VoidFunction; onHidePopup?: VoidFunction; @@ -31,6 +32,7 @@ export const VDisk = ({ data = {}, nodes, compact, + faded, showPopup, onShowPopup, onHidePopup, @@ -87,6 +89,7 @@ export const VDisk = ({ diskAllocatedPercent={data.AllocatedPercent} severity={data.Severity} compact={compact} + faded={faded} className={progressBarClassName} /> diff --git a/src/containers/AppWithClusters/useClusterData.ts b/src/containers/AppWithClusters/useClusterData.ts index 2f4434b519..a493201209 100644 --- a/src/containers/AppWithClusters/useClusterData.ts +++ b/src/containers/AppWithClusters/useClusterData.ts @@ -28,10 +28,14 @@ export function useClusterData() { }; } -export function useAdditionalNodeProps({balancer}: {balancer?: string}) { +export function useAdditionalNodeProps({balancer, groupId}: {balancer?: string; groupId?: string}) { const [useClusterBalancerAsBackend] = useSetting(USE_CLUSTER_BALANCER_AS_BACKEND_KEY); - const additionalNodesProps = getAdditionalNodesProps(balancer, useClusterBalancerAsBackend); + const additionalNodesProps = getAdditionalNodesProps({ + balancer, + groupId, + useClusterBalancerAsBackend, + }); return {additionalNodesProps, useClusterBalancerAsBackend}; } diff --git a/src/containers/Storage/PDisk/PDisk.tsx b/src/containers/Storage/PDisk/PDisk.tsx index eb02b2fde5..6bf6db4d20 100644 --- a/src/containers/Storage/PDisk/PDisk.tsx +++ b/src/containers/Storage/PDisk/PDisk.tsx @@ -6,11 +6,10 @@ import {PDiskPopup} from '../../../components/PDiskPopup/PDiskPopup'; import {VDiskWithDonorsStack} from '../../../components/VDisk/VDiskWithDonorsStack'; import routes, {createHref, getPDiskPagePath} from '../../../routes'; import {useDiskPagesAvailable} from '../../../store/reducers/capabilities/hooks'; -import type {TVDiskStateInfo} from '../../../types/api/vdisk'; import {valueIsDefined} from '../../../utils'; import {cn} from '../../../utils/cn'; import {stringifyVdiskId} from '../../../utils/dataFormatters/dataFormatters'; -import type {PreparedPDisk} from '../../../utils/disks/types'; +import type {PreparedPDisk, PreparedVDisk} from '../../../utils/disks/types'; import {STRUCTURE} from '../../Node/NodePages'; import './PDisk.scss'; @@ -19,12 +18,13 @@ const b = cn('pdisk-storage'); interface PDiskProps { data?: PreparedPDisk; - vDisks?: TVDiskStateInfo[]; + vDisks?: PreparedVDisk[]; showPopup?: boolean; onShowPopup?: VoidFunction; onHidePopup?: VoidFunction; className?: string; progressBarClassName?: string; + groupId?: string; } export const PDisk = ({ @@ -35,6 +35,7 @@ export const PDisk = ({ onHidePopup, className, progressBarClassName, + groupId, }: PDiskProps) => { const [isPopupVisible, setIsPopupVisible] = React.useState(false); @@ -75,8 +76,11 @@ export const PDisk = ({ > ); diff --git a/src/containers/Storage/PaginatedStorage.tsx b/src/containers/Storage/PaginatedStorage.tsx index bc8863da15..dd3ef17d40 100644 --- a/src/containers/Storage/PaginatedStorage.tsx +++ b/src/containers/Storage/PaginatedStorage.tsx @@ -19,12 +19,18 @@ import {useStorageNodesSelectedColumns} from './StorageNodes/columns/hooks'; interface PaginatedStorageProps { database?: string; nodeId?: string; + groupId: string; parentContainer?: Element | null; } -export const PaginatedStorage = ({database, nodeId, parentContainer}: PaginatedStorageProps) => { +export const PaginatedStorage = ({ + database, + nodeId, + groupId, + parentContainer, +}: PaginatedStorageProps) => { const {balancer} = useClusterBaseInfo(); - const additionalNodesProps = useAdditionalNodeProps({balancer}); + const additionalNodesProps = useAdditionalNodeProps({balancer, groupId}); const [queryParams, setQueryParams] = useQueryParams({ type: StringParam, diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx index bb90f6366f..5de8c5be1d 100644 --- a/src/containers/Storage/Storage.tsx +++ b/src/containers/Storage/Storage.tsx @@ -67,7 +67,10 @@ interface StorageProps { export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => { const {balancer} = useClusterBaseInfo(); - const additionalNodesProps = useAdditionalNodeProps({balancer}); + const additionalNodesProps = useAdditionalNodeProps({ + balancer, + groupId: valueIsDefined(groupId) ? groupId.toString() : undefined, + }); const capabilitiesLoaded = useCapabilitiesLoaded(); const groupsHandlerAvailable = useStorageGroupsHandlerAvailable(); diff --git a/src/containers/Storage/StorageNodes/StorageNodes.tsx b/src/containers/Storage/StorageNodes/StorageNodes.tsx index 14e13395fa..e70670848e 100644 --- a/src/containers/Storage/StorageNodes/StorageNodes.tsx +++ b/src/containers/Storage/StorageNodes/StorageNodes.tsx @@ -18,8 +18,8 @@ interface StorageNodesProps { tableSettings: Settings; visibleEntities: VisibleEntities; nodesUptimeFilter: NodesUptimeFilterValues; - onShowAll?: VoidFunction; sort?: SortOrder; + onShowAll?: VoidFunction; handleSort?: HandleSort; } @@ -28,9 +28,9 @@ export function StorageNodes({ columns, tableSettings, visibleEntities, - onShowAll, nodesUptimeFilter, sort, + onShowAll, handleSort, }: StorageNodesProps) { if ( diff --git a/src/containers/Storage/StorageNodes/columns/columns.tsx b/src/containers/Storage/StorageNodes/columns/columns.tsx index 8d998e6c3c..7b63b55830 100644 --- a/src/containers/Storage/StorageNodes/columns/columns.tsx +++ b/src/containers/Storage/StorageNodes/columns/columns.tsx @@ -19,6 +19,7 @@ const getStorageNodesColumns = ( database?: string, ) => { const getNodeRef = additionalNodesProps?.getNodeRef; + const groupId = additionalNodesProps?.groupId; const columns: StorageNodesColumn[] = [ { @@ -81,7 +82,7 @@ const getStorageNodesColumns = ( return (
- +
); })} diff --git a/src/types/additionalProps.ts b/src/types/additionalProps.ts index 3ef358b5e9..c9733774fd 100644 --- a/src/types/additionalProps.ts +++ b/src/types/additionalProps.ts @@ -28,5 +28,6 @@ export type NodeAddress = Pick string | null; export interface AdditionalNodesProps extends Record { + groupId?: string; getNodeRef?: GetNodeRefFunc; } diff --git a/src/utils/additionalProps.ts b/src/utils/additionalProps.ts index 7ff5c8d21a..5255080705 100644 --- a/src/utils/additionalProps.ts +++ b/src/utils/additionalProps.ts @@ -3,11 +3,17 @@ import type {AdditionalNodesProps, NodeAddress} from '../types/additionalProps'; import {getBackendFromRawNodeData} from './prepareBackend'; -export const getAdditionalNodesProps = ( +export const getAdditionalNodesProps = ({ balancer = backend, - useClusterBalancerAsBackend?: boolean, -): AdditionalNodesProps => { + useClusterBalancerAsBackend, + groupId, +}: { + balancer?: string; + useClusterBalancerAsBackend?: boolean; + groupId?: string; +}): AdditionalNodesProps => { return { + groupId, getNodeRef: (node: NodeAddress = {}) => getBackendFromRawNodeData(node, balancer ?? '', useClusterBalancerAsBackend), }; From e4a74b162e88e8975d7cec70dd0f4f9b23a36e18 Mon Sep 17 00:00:00 2001 From: Anton Standrik Date: Tue, 24 Sep 2024 13:55:12 +0300 Subject: [PATCH 2/9] fix: merge fixes --- .../DiskStateProgressBar.scss | 2 +- .../DiskStateProgressBar/DiskStateProgressBar.tsx | 4 +++- src/components/VDisk/VDisk.tsx | 3 +++ src/containers/Storage/PDisk/PDisk.tsx | 8 +++----- src/containers/Storage/PaginatedStorage.tsx | 3 ++- src/containers/Storage/Storage.tsx | 1 + .../Storage/StorageNodes/columns/columns.tsx | 15 ++++++++++++--- .../Storage/StorageNodes/columns/hooks.ts | 5 +++-- .../Storage/StorageNodes/columns/types.ts | 1 + src/types/additionalProps.ts | 1 - 10 files changed, 29 insertions(+), 14 deletions(-) diff --git a/src/components/DiskStateProgressBar/DiskStateProgressBar.scss b/src/components/DiskStateProgressBar/DiskStateProgressBar.scss index 47a69d1d2d..bb3ae13ab4 100644 --- a/src/components/DiskStateProgressBar/DiskStateProgressBar.scss +++ b/src/components/DiskStateProgressBar/DiskStateProgressBar.scss @@ -35,7 +35,7 @@ background-color: unset; } - &#{&}_compact#{&}_faded { + &_inactive { opacity: 0.5; } diff --git a/src/components/DiskStateProgressBar/DiskStateProgressBar.tsx b/src/components/DiskStateProgressBar/DiskStateProgressBar.tsx index d7c47283db..9ffccb66b2 100644 --- a/src/components/DiskStateProgressBar/DiskStateProgressBar.tsx +++ b/src/components/DiskStateProgressBar/DiskStateProgressBar.tsx @@ -14,6 +14,7 @@ interface DiskStateProgressBarProps { severity?: number; compact?: boolean; faded?: boolean; + inactive?: boolean; empty?: boolean; content?: React.ReactNode; className?: string; @@ -24,13 +25,14 @@ export function DiskStateProgressBar({ severity, compact, faded, + inactive, empty, content, className, }: DiskStateProgressBarProps) { const [inverted] = useSetting(INVERTED_DISKS_KEY); - const mods: Record = {inverted, compact, faded, empty}; + const mods: Record = {inverted, compact, faded, empty, inactive}; const color = severity !== undefined && getSeverityColor(severity); if (color) { diff --git a/src/components/VDisk/VDisk.tsx b/src/components/VDisk/VDisk.tsx index 2a4256dc60..02912a2853 100644 --- a/src/components/VDisk/VDisk.tsx +++ b/src/components/VDisk/VDisk.tsx @@ -21,6 +21,7 @@ export interface VDiskProps { data?: PreparedVDisk; nodes?: NodesMap; compact?: boolean; + inactive?: boolean; faded?: boolean; showPopup?: boolean; onShowPopup?: VoidFunction; @@ -32,6 +33,7 @@ export const VDisk = ({ data = {}, nodes, compact, + inactive, faded, showPopup, onShowPopup, @@ -90,6 +92,7 @@ export const VDisk = ({ severity={data.Severity} compact={compact} faded={faded} + inactive={inactive} className={progressBarClassName} /> diff --git a/src/containers/Storage/PDisk/PDisk.tsx b/src/containers/Storage/PDisk/PDisk.tsx index 6bf6db4d20..1d34d7e15c 100644 --- a/src/containers/Storage/PDisk/PDisk.tsx +++ b/src/containers/Storage/PDisk/PDisk.tsx @@ -19,23 +19,23 @@ const b = cn('pdisk-storage'); interface PDiskProps { data?: PreparedPDisk; vDisks?: PreparedVDisk[]; + inactiveVdisks?: PreparedVDisk[]; showPopup?: boolean; onShowPopup?: VoidFunction; onHidePopup?: VoidFunction; className?: string; progressBarClassName?: string; - groupId?: string; } export const PDisk = ({ data = {}, vDisks, + inactiveVdisks, showPopup, onShowPopup, onHidePopup, className, progressBarClassName, - groupId, }: PDiskProps) => { const [isPopupVisible, setIsPopupVisible] = React.useState(false); @@ -76,9 +76,7 @@ export const PDisk = ({ > diff --git a/src/containers/Storage/PaginatedStorage.tsx b/src/containers/Storage/PaginatedStorage.tsx index dd3ef17d40..9ec75dd1cf 100644 --- a/src/containers/Storage/PaginatedStorage.tsx +++ b/src/containers/Storage/PaginatedStorage.tsx @@ -19,7 +19,7 @@ import {useStorageNodesSelectedColumns} from './StorageNodes/columns/hooks'; interface PaginatedStorageProps { database?: string; nodeId?: string; - groupId: string; + groupId?: string; parentContainer?: Element | null; } @@ -54,6 +54,7 @@ export const PaginatedStorage = ({ additionalNodesProps, visibleEntities, database, + groupId, }); const { diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx index 5de8c5be1d..c354bc4016 100644 --- a/src/containers/Storage/Storage.tsx +++ b/src/containers/Storage/Storage.tsx @@ -112,6 +112,7 @@ export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => { additionalNodesProps, visibleEntities, database, + groupId: valueIsDefined(groupId) ? groupId.toString() : undefined, }); const { diff --git a/src/containers/Storage/StorageNodes/columns/columns.tsx b/src/containers/Storage/StorageNodes/columns/columns.tsx index 7b63b55830..49ae2e9fa1 100644 --- a/src/containers/Storage/StorageNodes/columns/columns.tsx +++ b/src/containers/Storage/StorageNodes/columns/columns.tsx @@ -17,9 +17,9 @@ const b = cn('ydb-storage-nodes-columns'); const getStorageNodesColumns = ( additionalNodesProps: AdditionalNodesProps | undefined, database?: string, + groupId?: string, ) => { const getNodeRef = additionalNodesProps?.getNodeRef; - const groupId = additionalNodesProps?.groupId; const columns: StorageNodesColumn[] = [ { @@ -80,9 +80,17 @@ const getStorageNodesColumns = ( (vdisk) => vdisk.PDiskId === pDisk.PDiskId, ); + const inactiveVdisks = vDisks?.filter( + (vdisk) => groupId && vdisk.VDiskId?.GroupID !== Number(groupId), + ); + return (
- +
); })} @@ -102,8 +110,9 @@ const getStorageNodesColumns = ( export const getPreparedStorageNodesColumns = ({ additionalNodesProps, database, + groupId, }: GetStorageNodesColumnsParams) => { - const rawColumns = getStorageNodesColumns(additionalNodesProps, database); + const rawColumns = getStorageNodesColumns(additionalNodesProps, database, groupId); const sortableColumns = rawColumns.map((column) => ({ ...column, diff --git a/src/containers/Storage/StorageNodes/columns/hooks.ts b/src/containers/Storage/StorageNodes/columns/hooks.ts index 419f4d94df..0e09430461 100644 --- a/src/containers/Storage/StorageNodes/columns/hooks.ts +++ b/src/containers/Storage/StorageNodes/columns/hooks.ts @@ -17,10 +17,11 @@ export function useStorageNodesSelectedColumns({ visibleEntities, database, additionalNodesProps, + groupId, }: GetStorageNodesColumnsParams) { const columns = React.useMemo(() => { - return getPreparedStorageNodesColumns({database, additionalNodesProps}); - }, [database, additionalNodesProps]); + return getPreparedStorageNodesColumns({database, additionalNodesProps, groupId}); + }, [database, additionalNodesProps, groupId]); const requiredColumns = React.useMemo(() => { if (visibleEntities === VISIBLE_ENTITIES.missing) { diff --git a/src/containers/Storage/StorageNodes/columns/types.ts b/src/containers/Storage/StorageNodes/columns/types.ts index 25dc6408a6..5db463c2c3 100644 --- a/src/containers/Storage/StorageNodes/columns/types.ts +++ b/src/containers/Storage/StorageNodes/columns/types.ts @@ -11,4 +11,5 @@ export interface GetStorageNodesColumnsParams { additionalNodesProps: AdditionalNodesProps | undefined; visibleEntities?: VisibleEntities; database?: string; + groupId?: string; } diff --git a/src/types/additionalProps.ts b/src/types/additionalProps.ts index c9733774fd..3ef358b5e9 100644 --- a/src/types/additionalProps.ts +++ b/src/types/additionalProps.ts @@ -28,6 +28,5 @@ export type NodeAddress = Pick string | null; export interface AdditionalNodesProps extends Record { - groupId?: string; getNodeRef?: GetNodeRefFunc; } From 4b547e2e53ba974804b0f0862f61826803ce16d3 Mon Sep 17 00:00:00 2001 From: Anton Standrik Date: Tue, 24 Sep 2024 13:58:04 +0300 Subject: [PATCH 3/9] fix: url --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index dacbd926d7..ba627094c8 100644 --- a/public/index.html +++ b/public/index.html @@ -23,7 +23,7 @@ window.systemSettings = {}; window.userSettings = {}; window.web_version = !'%REACT_APP_BACKEND%'; - window.custom_backend = 'http://ydb-vla-dev02-000.search.yandex.net:8765'; + window.custom_backend = '%NODE_ENV%' === 'development' && '%REACT_APP_BACKEND%'; window.meta_backend = '%REACT_APP_META_BACKEND%' From e4debc2f804b6c69bf328dcd76e14b391365548f Mon Sep 17 00:00:00 2001 From: Anton Standrik Date: Tue, 24 Sep 2024 13:59:26 +0300 Subject: [PATCH 4/9] fix: rm faded --- src/components/VDisk/VDisk.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/VDisk/VDisk.tsx b/src/components/VDisk/VDisk.tsx index 02912a2853..25ca543966 100644 --- a/src/components/VDisk/VDisk.tsx +++ b/src/components/VDisk/VDisk.tsx @@ -22,7 +22,6 @@ export interface VDiskProps { nodes?: NodesMap; compact?: boolean; inactive?: boolean; - faded?: boolean; showPopup?: boolean; onShowPopup?: VoidFunction; onHidePopup?: VoidFunction; @@ -34,7 +33,6 @@ export const VDisk = ({ nodes, compact, inactive, - faded, showPopup, onShowPopup, onHidePopup, @@ -91,7 +89,6 @@ export const VDisk = ({ diskAllocatedPercent={data.AllocatedPercent} severity={data.Severity} compact={compact} - faded={faded} inactive={inactive} className={progressBarClassName} /> From cfef65b2261988f34c47e2a9a6d2cb50d0064c12 Mon Sep 17 00:00:00 2001 From: Anton Standrik Date: Tue, 24 Sep 2024 14:00:59 +0300 Subject: [PATCH 5/9] fix: rm unused --- src/containers/AppWithClusters/useClusterData.ts | 3 +-- src/containers/Storage/Storage.tsx | 5 +---- src/utils/additionalProps.ts | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/containers/AppWithClusters/useClusterData.ts b/src/containers/AppWithClusters/useClusterData.ts index a493201209..06df79bb01 100644 --- a/src/containers/AppWithClusters/useClusterData.ts +++ b/src/containers/AppWithClusters/useClusterData.ts @@ -28,12 +28,11 @@ export function useClusterData() { }; } -export function useAdditionalNodeProps({balancer, groupId}: {balancer?: string; groupId?: string}) { +export function useAdditionalNodeProps({balancer}: {balancer?: string}) { const [useClusterBalancerAsBackend] = useSetting(USE_CLUSTER_BALANCER_AS_BACKEND_KEY); const additionalNodesProps = getAdditionalNodesProps({ balancer, - groupId, useClusterBalancerAsBackend, }); diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx index c354bc4016..fea37336a0 100644 --- a/src/containers/Storage/Storage.tsx +++ b/src/containers/Storage/Storage.tsx @@ -67,10 +67,7 @@ interface StorageProps { export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => { const {balancer} = useClusterBaseInfo(); - const additionalNodesProps = useAdditionalNodeProps({ - balancer, - groupId: valueIsDefined(groupId) ? groupId.toString() : undefined, - }); + const additionalNodesProps = useAdditionalNodeProps({balancer}); const capabilitiesLoaded = useCapabilitiesLoaded(); const groupsHandlerAvailable = useStorageGroupsHandlerAvailable(); diff --git a/src/utils/additionalProps.ts b/src/utils/additionalProps.ts index 5255080705..33010ad204 100644 --- a/src/utils/additionalProps.ts +++ b/src/utils/additionalProps.ts @@ -6,14 +6,11 @@ import {getBackendFromRawNodeData} from './prepareBackend'; export const getAdditionalNodesProps = ({ balancer = backend, useClusterBalancerAsBackend, - groupId, }: { balancer?: string; useClusterBalancerAsBackend?: boolean; - groupId?: string; }): AdditionalNodesProps => { return { - groupId, getNodeRef: (node: NodeAddress = {}) => getBackendFromRawNodeData(node, balancer ?? '', useClusterBalancerAsBackend), }; From de88cd03faf9f7f31d70b9fe8002834caa5ee1fc Mon Sep 17 00:00:00 2001 From: Anton Standrik Date: Tue, 24 Sep 2024 14:02:00 +0300 Subject: [PATCH 6/9] fix: rename --- src/containers/AppWithClusters/useClusterData.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/containers/AppWithClusters/useClusterData.ts b/src/containers/AppWithClusters/useClusterData.ts index 06df79bb01..3b0f4621b5 100644 --- a/src/containers/AppWithClusters/useClusterData.ts +++ b/src/containers/AppWithClusters/useClusterData.ts @@ -31,10 +31,7 @@ export function useClusterData() { export function useAdditionalNodeProps({balancer}: {balancer?: string}) { const [useClusterBalancerAsBackend] = useSetting(USE_CLUSTER_BALANCER_AS_BACKEND_KEY); - const additionalNodesProps = getAdditionalNodesProps({ - balancer, - useClusterBalancerAsBackend, - }); + const additionalNodesProps = getAdditionalNodesProps({balancer, useClusterBalancerAsBackend}); return {additionalNodesProps, useClusterBalancerAsBackend}; } From 2bdc1517a972dfd1831dfe7e5e01aa85df06b748 Mon Sep 17 00:00:00 2001 From: Anton Standrik Date: Tue, 24 Sep 2024 14:03:20 +0300 Subject: [PATCH 7/9] fix: rm unused --- src/containers/AppWithClusters/useClusterData.ts | 2 +- src/utils/additionalProps.ts | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/containers/AppWithClusters/useClusterData.ts b/src/containers/AppWithClusters/useClusterData.ts index 3b0f4621b5..2f4434b519 100644 --- a/src/containers/AppWithClusters/useClusterData.ts +++ b/src/containers/AppWithClusters/useClusterData.ts @@ -31,7 +31,7 @@ export function useClusterData() { export function useAdditionalNodeProps({balancer}: {balancer?: string}) { const [useClusterBalancerAsBackend] = useSetting(USE_CLUSTER_BALANCER_AS_BACKEND_KEY); - const additionalNodesProps = getAdditionalNodesProps({balancer, useClusterBalancerAsBackend}); + const additionalNodesProps = getAdditionalNodesProps(balancer, useClusterBalancerAsBackend); return {additionalNodesProps, useClusterBalancerAsBackend}; } diff --git a/src/utils/additionalProps.ts b/src/utils/additionalProps.ts index 33010ad204..7ff5c8d21a 100644 --- a/src/utils/additionalProps.ts +++ b/src/utils/additionalProps.ts @@ -3,13 +3,10 @@ import type {AdditionalNodesProps, NodeAddress} from '../types/additionalProps'; import {getBackendFromRawNodeData} from './prepareBackend'; -export const getAdditionalNodesProps = ({ +export const getAdditionalNodesProps = ( balancer = backend, - useClusterBalancerAsBackend, -}: { - balancer?: string; - useClusterBalancerAsBackend?: boolean; -}): AdditionalNodesProps => { + useClusterBalancerAsBackend?: boolean, +): AdditionalNodesProps => { return { getNodeRef: (node: NodeAddress = {}) => getBackendFromRawNodeData(node, balancer ?? '', useClusterBalancerAsBackend), From e88da885451cc7d3d29e57184c43778659059cb6 Mon Sep 17 00:00:00 2001 From: Anton Standrik Date: Tue, 24 Sep 2024 14:04:48 +0300 Subject: [PATCH 8/9] fix: rm unused --- src/containers/Storage/PaginatedStorage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/Storage/PaginatedStorage.tsx b/src/containers/Storage/PaginatedStorage.tsx index 9ec75dd1cf..159148724a 100644 --- a/src/containers/Storage/PaginatedStorage.tsx +++ b/src/containers/Storage/PaginatedStorage.tsx @@ -30,7 +30,7 @@ export const PaginatedStorage = ({ parentContainer, }: PaginatedStorageProps) => { const {balancer} = useClusterBaseInfo(); - const additionalNodesProps = useAdditionalNodeProps({balancer, groupId}); + const additionalNodesProps = useAdditionalNodeProps({balancer}); const [queryParams, setQueryParams] = useQueryParams({ type: StringParam, From 3e8b7e12390cd6245ef9b153be59742e36c504bf Mon Sep 17 00:00:00 2001 From: Anton Standrik Date: Tue, 24 Sep 2024 18:39:07 +0300 Subject: [PATCH 9/9] fix: review nanofix --- src/containers/Storage/Storage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/Storage/Storage.tsx b/src/containers/Storage/Storage.tsx index fea37336a0..2642949d65 100644 --- a/src/containers/Storage/Storage.tsx +++ b/src/containers/Storage/Storage.tsx @@ -109,7 +109,7 @@ export const Storage = ({database, nodeId, groupId, pDiskId}: StorageProps) => { additionalNodesProps, visibleEntities, database, - groupId: valueIsDefined(groupId) ? groupId.toString() : undefined, + groupId: groupId?.toString(), }); const {