From 77b125e4c1e3a10018ac007250bb5b0552d79ce6 Mon Sep 17 00:00:00 2001
From: mufazalov <mufazalov@yandex-team.ru>
Date: Thu, 17 Apr 2025 14:59:35 +0300
Subject: [PATCH] fix: fix wrong pdisk id order

---
 src/containers/PDiskPage/PDiskPage.tsx           | 4 ++--
 src/store/reducers/pdisk/pdisk.ts                | 2 +-
 src/store/reducers/storage/prepareGroupsDisks.ts | 3 ++-
 src/utils/disks/helpers.ts                       | 8 +++++++-
 src/utils/disks/prepareDisks.ts                  | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/containers/PDiskPage/PDiskPage.tsx b/src/containers/PDiskPage/PDiskPage.tsx
index d7efbbfd88..6a1fc91ee9 100644
--- a/src/containers/PDiskPage/PDiskPage.tsx
+++ b/src/containers/PDiskPage/PDiskPage.tsx
@@ -128,7 +128,7 @@ export function PDiskPage() {
     const handleAfterAction = () => {
         if (pDiskParamsDefined) {
             dispatch(
-                api.util.invalidateTags([{type: 'PDiskData', id: getPDiskId(nodeId, pDiskId)}]),
+                api.util.invalidateTags([{type: 'PDiskData', id: getPDiskId({nodeId, pDiskId})}]),
                 'StorageData',
             );
         }
@@ -168,7 +168,7 @@ export function PDiskPage() {
                 <EntityPageTitle
                     entityName={pDiskPageKeyset('pdisk')}
                     status={getSeverityColor(Severity)}
-                    id={getPDiskId(nodeId, pDiskId)}
+                    id={getPDiskId({nodeId, pDiskId})}
                 />
                 <DecommissionLabel decommission={DecommitStatus} />
             </div>
diff --git a/src/store/reducers/pdisk/pdisk.ts b/src/store/reducers/pdisk/pdisk.ts
index 47bb253e30..91781f0bad 100644
--- a/src/store/reducers/pdisk/pdisk.ts
+++ b/src/store/reducers/pdisk/pdisk.ts
@@ -57,7 +57,7 @@ export const pDiskApi = api.injectEndpoints({
                 'All',
                 {
                     type: 'PDiskData',
-                    id: getPDiskId(arg.nodeId, arg.pDiskId),
+                    id: getPDiskId({nodeId: arg.nodeId, pDiskId: arg.pDiskId}),
                 },
             ],
         }),
diff --git a/src/store/reducers/storage/prepareGroupsDisks.ts b/src/store/reducers/storage/prepareGroupsDisks.ts
index 4b92ce967c..4b7cd53c3f 100644
--- a/src/store/reducers/storage/prepareGroupsDisks.ts
+++ b/src/store/reducers/storage/prepareGroupsDisks.ts
@@ -57,7 +57,8 @@ export function prepareGroupsPDisk(data: TStoragePDisk & {NodeId?: number} = {})
     };
 
     const StringifiedId =
-        bscPDisk.PDiskId || getPDiskId(mergedPDiskData.NodeId, mergedPDiskData.PDiskId);
+        bscPDisk.PDiskId ||
+        getPDiskId({nodeId: mergedPDiskData.NodeId, pDiskId: mergedPDiskData.PDiskId});
 
     const {AllocatedPercent, AllocatedSize, AvailableSize, TotalSize} = preparePDiskSizeFields({
         AvailableSize: mergedPDiskData.AvailableSize,
diff --git a/src/utils/disks/helpers.ts b/src/utils/disks/helpers.ts
index 84c35aac1a..047a721d99 100644
--- a/src/utils/disks/helpers.ts
+++ b/src/utils/disks/helpers.ts
@@ -34,7 +34,13 @@ export function getColorSeverity(color?: EFlag) {
     return color ? DISK_COLOR_STATE_TO_NUMERIC_SEVERITY[color] : 0;
 }
 
-export function getPDiskId(nodeId?: string | number | null, pDiskId?: string | number | null) {
+export function getPDiskId({
+    nodeId,
+    pDiskId,
+}: {
+    nodeId?: string | number | null;
+    pDiskId?: string | number | null;
+}) {
     if (valueIsDefined(nodeId) && valueIsDefined(pDiskId)) {
         return `${nodeId}-${pDiskId}`;
     }
diff --git a/src/utils/disks/prepareDisks.ts b/src/utils/disks/prepareDisks.ts
index dbd6f486b6..fc8195abe2 100644
--- a/src/utils/disks/prepareDisks.ts
+++ b/src/utils/disks/prepareDisks.ts
@@ -87,7 +87,7 @@ export function prepareWhiteboardPDiskData(pdiskState: TPDiskStateInfo = {}): Pr
         ...restPDiskFields
     } = pdiskState;
 
-    const StringifiedId = getPDiskId(PDiskId, NodeId);
+    const StringifiedId = getPDiskId({nodeId: NodeId, pDiskId: PDiskId});
 
     const Type = getPDiskType(Category);