put into instrument class

Author: rerpha

app/components/Instrument.test.ts

@@ -10,7 +10,6 @@ import {
   getExtraPVsForBlock,
   toPrecision,
   yesToBoolean,
-  getAllBlockPVs,
   Instrument,
 } from "@/app/components/Instrument";
 import {
@@ -239,7 +238,7 @@ test("getAllBlockPVs returns flat list of blocks, their RC and SPRBV pvs", () =>
     },
   ];
 
-  const res = getAllBlockPVs(inst);
+  const res = inst.getAllBlockPVs();
 
   expect(res.length).toBe(2 * 4); // 2 blocks, which means 4 PVs to subscribe to
 

app/components/Instrument.ts

@@ -186,6 +186,16 @@ export class Instrument {
       },
     ];
   }
+
+  getAllBlockPVs(): Array<string> {
+    return this.groups
+      .map((g: IfcGroup) => g.blocks)
+      .flat(1) // flatten to a big array of blocks
+      .map((b: IfcBlock) =>
+        getExtraPVsForBlock(this.prefix + CSSB + b.human_readable_name),
+      )
+      .flat(1); //flatten block, rc, sp_rbv pvs for every block to a 1d array
+  }
 }
 
 export function findPVInDashboard(
@@ -282,15 +292,3 @@ export function findPVInGroups(
         updatedPVName == prefix + CSSB + block.human_readable_name,
     );
 }
-
-export function getAllBlockPVs(currentInstrument: Instrument): Array<string> {
-  return currentInstrument.groups
-    .map((g: IfcGroup) => g.blocks)
-    .flat(1) // flatten to a big array of blocks
-    .map((b: IfcBlock) =>
-      getExtraPVsForBlock(
-        currentInstrument.prefix + CSSB + b.human_readable_name,
-      ),
-    )
-    .flat(1); //flatten block, rc, sp_rbv pvs for every block to a 1d array
-}

app/components/InstrumentData.tsx

@@ -9,7 +9,6 @@ import {
 import {
   findPVInDashboard,
   findPVInGroups,
-  getAllBlockPVs,
   getGroupsWithBlocksFromConfigOutput,
   Instrument,
   RC_ENABLE,
@@ -110,7 +109,7 @@ export function InstrumentData({ instrumentName }: { instrumentName: string }) {
 
         sendJsonMessage({
           type: PVWSRequestType.subscribe,
-          pvs: getAllBlockPVs(currentInstrument),
+          pvs: currentInstrument.getAllBlockPVs(),
         });
       } else {
         const pvVal = getPvValue(updatedPV);