fix(api): remove appendix from raid label when it is not a dupe

for #514
MauriceNino · Jan 6, 2023 · 23bbc05 · 23bbc05
1 parent 173848b
commit 23bbc05
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/apps/api/__TESTS__/dynamic-info.test.ts b/apps/api/__TESTS__/dynamic-info.test.ts
@@ -26,6 +26,7 @@ describe('Dynamic Info', () => {
   beforeEach(() => {
     CONFIG.running_in_docker = true;
   });
+
   describe('Storage', () => {
     it('Test Case 1', () => {
       const output = new DynamicStorageMapper(

diff --git a/apps/api/__TESTS__/static-info.test.ts b/apps/api/__TESTS__/static-info.test.ts
@@ -22,11 +22,11 @@ import {
 const toStorageInp = (inp: TestCase) =>
   [inp.disks, inp.blocks, inp.sizes] as const;
 
-beforeEach(() => {
-  CONFIG.running_in_docker = true;
-});
-
 describe('Static Info', () => {
+  beforeEach(() => {
+    CONFIG.running_in_docker = true;
+  });
+
   describe('Storage', () => {
     it('Test Case 1', () => {
       const output = mapToStorageLayout(...toStorageInp(TEST_CASE_1));

diff --git a/apps/api/__TESTS__/test-cases.ts b/apps/api/__TESTS__/test-cases.ts
@@ -5137,14 +5137,14 @@ export const TEST_CASE_14 = {
     {
       brand: 'Samsung',
       device: 'nvme0n1',
-      raidGroup: 'archlinux-latest-64-minimal:0',
+      raidGroup: 'archlinux-latest-64-minimal',
       size: 512110190592,
       type: 'NVMe',
     },
     {
       brand: 'Samsung',
       device: 'nvme1n1',
-      raidGroup: 'archlinux-latest-64-minimal:0',
+      raidGroup: 'archlinux-latest-64-minimal',
       size: 512110190592,
       type: 'NVMe',
     },

diff --git a/apps/api/src/data/storage/static.ts b/apps/api/src/data/storage/static.ts
@@ -44,18 +44,23 @@ const getVirtualMountsLayout = (sizes: Size[]) =>
 
 const getRaidLabel = (deviceName: string, allRaidBlocks: Block[]) => {
   const raidBlocks = allRaidBlocks.filter(m => m.name.startsWith(deviceName));
+  const uuids = raidBlocks.map(rb => rb.uuid);
 
   if (raidBlocks.length > 0) {
     const isSplit = raidBlocks[0].label.includes(':');
 
     if (isSplit) {
       const splitLabel = raidBlocks[0].label.split(':')[0];
-      const hasUniqueName = !allRaidBlocks.some(member => {
-        const startSame = member.label.split(':')[0] === splitLabel;
-        const isSame = member.label === raidBlocks[0].label;
-
-        return startSame && !isSame;
-      });
+      const hasUniqueName = !allRaidBlocks
+        .filter(
+          rb => !rb.name.startsWith(deviceName) && !uuids.includes(rb.uuid)
+        )
+        .some(rb => {
+          const startSame = rb.label.split(':')[0] === splitLabel;
+          const isSame = rb.label === raidBlocks[0].label;
+
+          return startSame && !isSame;
+        });
 
       return hasUniqueName ? splitLabel : raidBlocks[0].label;
     } else {