fix(cluster-health): storage items multiply (#3206)

packages/integrations/src/proxmox/proxmox-integration.ts

@@ -69,6 +69,7 @@ const mapResource = (resource: Proxmox.clusterResourcesResources): Resource | nu
 
 const mapComputeResource = (resource: Proxmox.clusterResourcesResources): Omit<ComputeResourceBase<string>, "type"> => {
   return {
+    id: resource.id,
     cpu: {
       utilization: resource.cpu ?? 0,
       cores: resource.maxcpu ?? 0,
@@ -114,6 +115,7 @@ const mapVmResource = (resource: Proxmox.clusterResourcesResources): LxcResource
 
 const mapStorageResource = (resource: Proxmox.clusterResourcesResources): StorageResource => {
   return {
+    id: resource.id,
     type: "storage",
     name: resource.storage ?? "",
     node: resource.node ?? "",

packages/integrations/src/proxmox/proxmox-types.ts

@@ -7,6 +7,7 @@ interface ResourceBase<TType extends string> {
 }
 
 export interface ComputeResourceBase<TType extends string> extends ResourceBase<TType> {
+  id: string;
   cpu: {
     utilization: number; // previously cpu (0-1)
     cores: number; // previously cpuCores
@@ -40,6 +41,7 @@ export interface QemuResource extends ComputeResourceBase<"qemu"> {
 }
 
 export interface StorageResource extends ResourceBase<"storage"> {
+  id: string;
   storagePlugin: string;
   used: number; // previously disk
   total: number; // previously maxDisk

packages/widgets/src/health-monitoring/cluster/resource-table.tsx

@@ -38,9 +38,15 @@ export const ResourceTable = ({ type, data, isTiny }: ResourceTableProps) => {
         </TableTr>
       </TableThead>
       <TableTbody>
-        {data.map((item) => {
+        {data
+          .sort((itemA, itemB) => {
+            const nodeResult = itemA.node.localeCompare(itemB.node);
+            if (nodeResult !== 0) return nodeResult;
+            return itemA.name.localeCompare(itemB.name);
+          })
+          .map((item) => {
             return (
-            <ResourcePopover key={item.name} item={item}>
+              <ResourcePopover key={item.id} item={item}>
                 <Popover.Target>
                   <TableTr fz={isTiny ? "8px" : "xs"}>
                     <td>