show block SPs if they exist

Author: rerpha

app/components/Block.test.tsx

@@ -115,3 +115,48 @@ it("renders block without run control without tick or cross", () => {
       .innerHTML,
   ).toBe("");
 });
+
+it("renders block with SP and shows SP value", () => {
+  const expectedValue = 123;
+  const expectedSpValue = 124;
+  const aBlock: IfcBlock = {
+    pvaddress: "SOME:PV",
+    visible: true,
+    human_readable_name: "MyBlock",
+    runcontrol_inrange: false,
+    runcontrol_enabled: false,
+    sp_value: expectedSpValue,
+    value: expectedValue,
+  };
+  const { container } = render(
+    <Block pv={aBlock} instName={""} showHiddenBlocks={false} />,
+    {
+      container: tableBody,
+    },
+  );
+  expect(
+    container.querySelector(`#${aBlock.human_readable_name}_VALUE`)!.innerHTML,
+  ).toContain(`${expectedValue} (SP: ${expectedSpValue})`);
+});
+
+it("renders block without SP and hides SP value", () => {
+  const expectedValue = 123;
+  const expectedSpValue = 124;
+  const aBlock: IfcBlock = {
+    pvaddress: "SOME:PV",
+    visible: true,
+    human_readable_name: "MyBlock",
+    runcontrol_inrange: false,
+    runcontrol_enabled: false,
+    value: expectedValue,
+  };
+  const { container } = render(
+    <Block pv={aBlock} instName={""} showHiddenBlocks={false} />,
+    {
+      container: tableBody,
+    },
+  );
+  expect(
+    container.querySelector(`#${aBlock.human_readable_name}_VALUE`)!.innerHTML,
+  ).toContain(`${expectedValue} `);
+});

app/components/Block.tsx

@@ -58,7 +58,8 @@ export default function Block({
 
       <td className="py-1 px-4 ">
         <span id={pv.human_readable_name + "_VALUE"}>
-          {pv.value} {pv.units != null && pv.units}{" "}
+          {pv.value} {pv.units != null && pv.units}
+          {pv.sp_value && "(SP: " + pv.sp_value + ")"}{" "}
           <a
             href="https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Blocks#alarms"
             className="text-red-600"

app/components/InstrumentPage.test.ts

@@ -3,6 +3,7 @@ import {
   getGroupsWithBlocksFromConfigOutput,
   RC_ENABLE,
   RC_INRANGE,
+  SP,
   subscribeToBlockPVs,
 } from "@/app/components/InstrumentPage";
 
@@ -13,7 +14,7 @@ test("subscribeToBlockPVs subscribes to all run control PVs", () => {
   expect(mockSendJsonMessage.mock.calls.length).toBe(1);
   const expectedCall: IfcPVWSRequest = {
     type: "subscribe",
-    pvs: [aBlock, aBlock + RC_ENABLE, aBlock + RC_INRANGE],
+    pvs: [aBlock, aBlock + RC_ENABLE, aBlock + RC_INRANGE, aBlock + SP],
   };
   expect(JSON.stringify(mockSendJsonMessage.mock.calls[0][0])).toBe(
     JSON.stringify(expectedCall),

app/components/InstrumentPage.tsx

@@ -30,6 +30,8 @@ export const RC_ENABLE = ":RC:ENABLE";
 
 export const RC_INRANGE = ":RC:INRANGE";
 
+export const SP = ":SP";
+
 export const CSSB = "CS:SB:";
 
 export function subscribeToBlockPVs(
@@ -41,7 +43,12 @@ export function subscribeToBlockPVs(
    */
   sendJsonMessage({
     type: "subscribe",
-    pvs: [block_address, block_address + RC_ENABLE, block_address + RC_INRANGE],
+    pvs: [
+      block_address,
+      block_address + RC_ENABLE,
+      block_address + RC_INRANGE,
+      block_address + SP,
+    ],
   });
 }
 
@@ -239,6 +246,9 @@ function InstrumentData({ instrumentName }: { instrumentName: string }) {
             } else if (updatedPVName == block_full_pv_name + RC_ENABLE) {
               block.runcontrol_enabled = updatedPV.value == 1;
               return;
+            } else if (updatedPVName == block_full_pv_name + SP) {
+              block.sp_value = pvVal;
+              return;
             }
           }
         }

app/types.ts

@@ -27,6 +27,7 @@ export interface IfcBlock extends IfcPV {
   suspend_on_invalid?: boolean;
   low_rc?: number;
   high_rc?: number;
+  sp_value?: number | string;
 }
 
 export interface IfcGroup {