fix: fix wrong pdisk id order (#2170)

Author: artemmufazalov

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>

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}),
                 },
             ],
         }),

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,

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}`;
     }

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);