fix(api): fallback to disk block info when no native disk found

fixes #196
MauriceNino · Jul 10, 2022 · ca180c0 · ca180c0
1 parent 06d8b4f
commit ca180c0
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/apps/api/src/static-info.ts b/apps/api/src/static-info.ts
@@ -128,31 +128,33 @@ const loadStorageInfo = async (): Promise<void> => {
       const diskRaidMem = raidMembers.filter(member =>
         member.name.startsWith(device)
       );
-      const nativeDisk = disks.find(d => d.name === disk.model);
-
-      if (nativeDisk != null) {
-        if (diskRaidMem.length > 0) {
-          const label = diskRaidMem[0].label.includes(':')
-            ? diskRaidMem[0].label.split(':')[0]
-            : diskRaidMem[0].label;
-          return {
-            device: device,
-            brand: nativeDisk.vendor,
-            size: nativeDisk.size,
-            type: nativeDisk.type,
-            raidGroup: label,
-          };
-        } else {
-          return {
-            device: device,
-            brand: nativeDisk.vendor,
-            size: nativeDisk.size,
-            type: nativeDisk.type,
-          };
-        }
+      const nativeDisk = disks.find(
+        d => disk.model != '' && d.name === disk.model
+      ) ?? {
+        vendor: disk.name,
+        size: disk.size,
+        type: disk.physical,
+      };
+
+      if (diskRaidMem.length > 0) {
+        const label = diskRaidMem[0].label.includes(':')
+          ? diskRaidMem[0].label.split(':')[0]
+          : diskRaidMem[0].label;
+        return {
+          device: device,
+          brand: nativeDisk.vendor,
+          size: nativeDisk.size,
+          type: nativeDisk.type,
+          raidGroup: label,
+        };
+      } else {
+        return {
+          device: device,
+          brand: nativeDisk.vendor,
+          size: nativeDisk.size,
+          type: nativeDisk.type,
+        };
       }
-
-      return undefined;
     })
     .filter(d => d != null);