working - target stations use filter

rerpha · rerpha · commit 8ca8401350fc · 2025-02-25T10:46:32.000Z
diff --git a/app/components/InstrumentsDisplay.test.ts b/app/components/InstrumentsDisplay.test.ts
@@ -1,22 +1,33 @@
 import { createInstrumentGroups } from "@/app/components/InstrumentsDisplay";
-import { targetStation } from "@/app/types";
+import { instList } from "@/app/types";
 
 test("createInstrumentGroups adds two instruments from different target stations to the same science group", () => {
   const instrument1Name = "INST1";
   const instrument2Name = "INST2";
   const commonScienceGroup = "MOLSPEC";
   const instrument1 = {
     name: instrument1Name,
-    scienceGroups: [commonScienceGroup],
+    groups: [commonScienceGroup],
+    targetStation: "TS0",
+    hostName: "",
+    pvPrefix: "",
+    isScheduled: true,
+    seci: false,
+    runStatePV: "",
+    runStateValue: "",
   };
   const instrument2 = {
     name: instrument2Name,
-    scienceGroups: [commonScienceGroup],
+    groups: [commonScienceGroup],
+    targetStation: "TS0",
+    hostName: "",
+    pvPrefix: "",
+    isScheduled: true,
+    seci: false,
+    runStatePV: "",
+    runStateValue: "",
   };
-  const targetStations: Array<targetStation> = [
-    { targetStation: "TS0", instruments: [instrument1] },
-    { targetStation: "TS3", instruments: [instrument2] },
-  ];
+  const targetStations: instList = [instrument1, instrument2];
   const result = createInstrumentGroups(targetStations);
 
   expect(result.get(commonScienceGroup)!.sort()).toStrictEqual(
@@ -29,13 +40,27 @@ test("createInstrumentGroups ignores instrument without any groups", () => {
   const commonScienceGroup = "MOLSPEC";
   const instrument1 = {
     name: instrument1Name,
-    scienceGroups: [commonScienceGroup],
+    groups: [commonScienceGroup],
+    targetStation: "TS0",
+    hostName: "",
+    pvPrefix: "",
+    isScheduled: true,
+    seci: false,
+    runStatePV: "",
+    runStateValue: "",
   };
-  const instrument2 = { name: "someinstrumentwithnogroups", scienceGroups: [] };
-  const targetStations: Array<targetStation> = [
-    { targetStation: "TS0", instruments: [instrument1] },
-    { targetStation: "TS3", instruments: [instrument2] },
-  ];
+  const instrument2 = {
+    name: "someinstrumentwithnogroups",
+    targetStation: "TS0",
+    hostName: "",
+    pvPrefix: "",
+    isScheduled: true,
+    seci: false,
+    runStatePV: "",
+    runStateValue: "",
+    groups: [],
+  };
+  const targetStations: instList = [instrument1, instrument2];
   const result = createInstrumentGroups(targetStations);
 
   expect(result.get(commonScienceGroup)!.sort()).toStrictEqual(
@@ -48,16 +73,27 @@ test("createInstrumentGroups ignores instrument which is a support machine", ()
   const commonScienceGroup = "MOLSPEC";
   const instrument1 = {
     name: instrument1Name,
-    scienceGroups: [commonScienceGroup],
+    groups: [commonScienceGroup],
+    targetStation: "TS0",
+    hostName: "",
+    pvPrefix: "",
+    isScheduled: true,
+    seci: false,
+    runStatePV: "",
+    runStateValue: "",
   };
   const instrument2 = {
     name: "someinstrumentwithnogroups",
-    scienceGroups: ["SUPPORT"],
+    groups: ["SUPPORT"],
+    targetStation: "TS3",
+    hostName: "",
+    pvPrefix: "",
+    isScheduled: true,
+    seci: false,
+    runStatePV: "",
+    runStateValue: "",
   };
-  const targetStations: Array<targetStation> = [
-    { targetStation: "TS0", instruments: [instrument1] },
-    { targetStation: "TS3", instruments: [instrument2] },
-  ];
+  const targetStations: instList = [instrument1, instrument2];
   const result = createInstrumentGroups(targetStations);
 
   expect(result.get(commonScienceGroup)!.sort()).toStrictEqual(
diff --git a/app/components/InstrumentsDisplay.tsx b/app/components/InstrumentsDisplay.tsx
@@ -4,17 +4,11 @@ import {
   IfcPVWSMessage,
   IfcPVWSRequest,
   instList,
-  instListEntryWithRunstatePVandValue,
   PVWSRequestType,
 } from "@/app/types";
 import useWebSocket from "react-use-websocket";
 import { instListPV, instListSubscription, socketURL } from "@/app/commonVars";
 import { instListFromBytes } from "@/app/components/dehex_and_decompress";
-import {
-  updateInstrumentRunstate,
-  updateInstrumentRunstatePV,
-  updateTargetStationBeamCurrent,
-} from "@/app/wall/utils";
 import TargetStation from "@/app/components/TargetStation";
 import ScienceGroup from "@/app/components/ScienceGroup";
 
@@ -23,11 +17,8 @@ const instrumentsExcludeList = ["SUPPORT"];
 
 export function createInstrumentGroups(
   instruments: instList,
-): Map<string, Array<instListEntryWithRunstatePVandValue>> {
-  let newInstrumentGroups: Map<
-    string,
-    Array<instListEntryWithRunstatePVandValue>
-  > = new Map();
+): Map<string, instList> {
+  let newInstrumentGroups: Map<string, instList> = new Map();
   for (const inst of instruments) {
     for (const group of inst.groups) {
       if (!instrumentsExcludeList.includes(group)) {
@@ -42,27 +33,6 @@ export function createInstrumentGroups(
   return newInstrumentGroups;
 }
 
-export function createTargetStations(
-  instruments: instList,
-): Map<string, Array<instListEntryWithRunstatePVandValue>> {
-  let newInstrumentGroups: Map<
-    string,
-    Array<instListEntryWithRunstatePVandValue>
-  > = new Map();
-  for (const inst of instruments) {
-    for (const group of inst.targetStation) {
-      if (!instrumentsExcludeList.includes(group)) {
-        if (!newInstrumentGroups.has(group)) {
-          // This is a new science group so create a new entry
-          newInstrumentGroups.set(group, []);
-        }
-        newInstrumentGroups.get(group)!.push(inst);
-      }
-    }
-  }
-  return newInstrumentGroups;
-}
-
 /* c8 ignore start */
 export default function InstrumentsDisplay({
   sortByGroups = false,
@@ -73,7 +43,7 @@ export default function InstrumentsDisplay({
 
   const ts1BeamCurrentPv = "AC:TS1:BEAM:CURR";
   const ts2BeamCurrentPv = "AC:TS2:BEAM:CURR";
-  const muonTargetCurrentPv = "AC:MUON:BEAM:CURR"; //TODO make this exist
+  const muonTargetCurrentPv = "AC:MUON:BEAM:CURR";
 
   const [instList, setInstList] = useState<instList>([]);
 
@@ -140,7 +110,7 @@ export default function InstrumentsDisplay({
         setMuonCurrent(updatedPVnum);
       }
     }
-  }, [lastJsonMessage, sendJsonMessage]);
+  }, [lastJsonMessage, sendJsonMessage, instList]);
 
   return (
     <div>
@@ -152,17 +122,38 @@ export default function InstrumentsDisplay({
               <ScienceGroup key={name} name={name} instruments={instruments} />
             );
           })}
-      {!sortByGroups &&
-        instList.map((targetStation) => {
-          return (
-            <TargetStation
-              key={targetStation.targetStation}
-              name={targetStation.targetStation}
-              instruments={targetStation.instruments}
-              beamCurrent={targetStation.beamCurrent}
-            />
-          );
-        })}
+      {!sortByGroups && (
+        <>
+          <TargetStation
+            name={"TS1"}
+            instruments={instList.filter(
+              (instrument) => instrument.targetStation == "TS1",
+            )}
+            beamCurrent={ts1Current}
+          />
+          <TargetStation
+            name={"MUON"}
+            instruments={instList.filter(
+              (instrument) => instrument.targetStation == "MUON",
+            )}
+            beamCurrent={muonCurrent}
+          />
+          <TargetStation
+            name={"TS2"}
+            instruments={instList.filter(
+              (instrument) => instrument.targetStation == "TS2",
+            )}
+            beamCurrent={ts2Current}
+          />
+          <TargetStation
+            name={"MISC"}
+            instruments={instList.filter(
+              (instrument) => instrument.targetStation == "MISC",
+            )}
+            beamCurrent={undefined}
+          />
+        </>
+      )}
     </div>
   );
 }
diff --git a/app/components/TargetStation.tsx b/app/components/TargetStation.tsx
@@ -1,9 +1,6 @@
 import InstrumentWallCard from "./InstrumentWallCard";
 
-import {
-  IfcInstrumentStatus,
-  instListEntryWithRunstatePVandValue,
-} from "@/app/types";
+import { instListEntryWithRunstatePVandValue } from "@/app/types";
 
 export default function TargetStation({
   name,
diff --git a/app/components/__snapshots__/InstrumentWallCard.test.tsx.snap b/app/components/__snapshots__/InstrumentWallCard.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`renders instrumentwallcard unchanged 1`] = `
   >
     <a
       class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
-      bg-[#90EE90] text-black"
+      bg-[#F08080] text-black"
       href="/instrument?name=Instrument"
       target="_blank"
     >
@@ -22,7 +22,7 @@ exports[`renders instrumentwallcard unchanged 1`] = `
         <span
           class="text-xs "
         >
-          RUNNING
+          UNKNOWN
         </span>
       </div>
     </a>
diff --git a/app/components/__snapshots__/ScienceGroup.test.tsx.snap b/app/components/__snapshots__/ScienceGroup.test.tsx.snap
@@ -18,7 +18,7 @@ exports[`renders sciencegroup unchanged 1`] = `
       >
         <a
           class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
-      bg-[#90EE90] text-black"
+      bg-[#F08080] text-black"
           href="/instrument?name=Instrument"
           target="_blank"
         >
@@ -33,7 +33,7 @@ exports[`renders sciencegroup unchanged 1`] = `
             <span
               class="text-xs "
             >
-              RUNNING
+              UNKNOWN
             </span>
           </div>
         </a>
@@ -43,7 +43,7 @@ exports[`renders sciencegroup unchanged 1`] = `
       >
         <a
           class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
-      bg-[#DAA520] text-black"
+      bg-[#F08080] text-black"
           href="/instrument?name=Instrument2"
           target="_blank"
         >
@@ -58,7 +58,7 @@ exports[`renders sciencegroup unchanged 1`] = `
             <span
               class="text-xs "
             >
-              WAITING
+              UNKNOWN
             </span>
           </div>
         </a>
diff --git a/app/components/__snapshots__/TargetStation.test.tsx.snap b/app/components/__snapshots__/TargetStation.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`renders targetstation unchanged 1`] = `
       >
         <a
           class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
-      bg-green-900 text-white"
+      bg-[#F08080] text-black"
           href="/instrument?name=Instrument"
           target="_blank"
         >
@@ -35,7 +35,7 @@ exports[`renders targetstation unchanged 1`] = `
             <span
               class="text-xs "
             >
-              RESUMING
+              UNKNOWN
             </span>
           </div>
         </a>
@@ -45,7 +45,7 @@ exports[`renders targetstation unchanged 1`] = `
       >
         <a
           class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200
-      bg-[#FFFF00] text-black"
+      bg-[#F08080] text-black"
           href="/instrument?name=Instrument2"
           target="_blank"
         >
@@ -60,7 +60,7 @@ exports[`renders targetstation unchanged 1`] = `
             <span
               class="text-xs "
             >
-              VETOING
+              UNKNOWN
             </span>
           </div>
         </a>
diff --git a/app/types.ts b/app/types.ts
@@ -75,17 +75,6 @@ export interface IfcPVWSRequest {
   pvs: Array<string>;
 }
 
-// export interface IfcInstrumentStatus {
-//   /**
-//    * Instrument status used for the wall display. Contains runstate PV and current runstate.
-//    */
-//   name: string; // Name of the instrument
-//   runstate?: string; // Runstate
-//   runstatePV?: string; // Runstate PV address
-//   scienceGroups?: Array<string>;
-// }
-
-// Column[Row[labelPV, valuePV]]
 export type DashboardArr = Array<Array<Array<IfcPV>>>;
 
 export interface ConfigOutput {
@@ -147,16 +136,10 @@ export interface ConfigOutputIocMacro {
   value: string;
 }
 
-// export interface targetStation {
-//   targetStation: string;
-//   beamCurrentPv?: string;
-//   beamCurrent?: number | null;
-//   instruments: Array<IfcInstrumentStatus>;
-// }
-
 export interface instListEntry {
-  /*
-  TODO
+  /**
+   * InstList entry ie. a single item in the instlist array created
+   * by https://github.com/ISISComputingGroup/EPICS-inst_servers/blob/master/scripts/set_instrument_list.py
    */
   name: string;
   hostName: string;
diff --git a/app/wall/utils.test.ts b/app/wall/utils.test.ts
diff --git a/app/wall/utils.ts b/app/wall/utils.ts

Original file line number	Diff line number	Diff line change
@@ -7,7 +7,7 @@ exports[`renders instrumentwallcard unchanged 1`] = `
`7`	`7`	`>`
`8`	`8`	`<a`
`9`	`9`	`class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200`
`10`		`- bg-[#90EE90] text-black"`
	`10`	`+ bg-[#F08080] text-black"`
`11`	`11`	`href="/instrument?name=Instrument"`
`12`	`12`	`target="_blank"`
`13`	`13`	`>`
@@ -22,7 +22,7 @@ exports[`renders instrumentwallcard unchanged 1`] = `
`22`	`22`	`<span`
`23`	`23`	`class="text-xs "`
`24`	`24`	`>`
`25`		`- RUNNING`
	`25`	`+ UNKNOWN`
`26`	`26`	`</span>`
`27`	`27`	`</div>`
`28`	`28`	`</a>`
Original file line number	Diff line number	Diff line change
@@ -18,7 +18,7 @@ exports[`renders sciencegroup unchanged 1`] = `
`18`	`18`	`>`
`19`	`19`	`<a`
`20`	`20`	`class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200`
`21`		`- bg-[#90EE90] text-black"`
	`21`	`+ bg-[#F08080] text-black"`
`22`	`22`	`href="/instrument?name=Instrument"`
`23`	`23`	`target="_blank"`
`24`	`24`	`>`
@@ -33,7 +33,7 @@ exports[`renders sciencegroup unchanged 1`] = `
`33`	`33`	`<span`
`34`	`34`	`class="text-xs "`
`35`	`35`	`>`
`36`		`- RUNNING`
	`36`	`+ UNKNOWN`
`37`	`37`	`</span>`
`38`	`38`	`</div>`
`39`	`39`	`</a>`
@@ -43,7 +43,7 @@ exports[`renders sciencegroup unchanged 1`] = `
`43`	`43`	`>`
`44`	`44`	`<a`
`45`	`45`	`class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200`
`46`		`- bg-[#DAA520] text-black"`
	`46`	`+ bg-[#F08080] text-black"`
`47`	`47`	`href="/instrument?name=Instrument2"`
`48`	`48`	`target="_blank"`
`49`	`49`	`>`
@@ -58,7 +58,7 @@ exports[`renders sciencegroup unchanged 1`] = `
`58`	`58`	`<span`
`59`	`59`	`class="text-xs "`
`60`	`60`	`>`
`61`		`- WAITING`
	`61`	`+ UNKNOWN`
`62`	`62`	`</span>`
`63`	`63`	`</div>`
`64`	`64`	`</a>`
Original file line number	Diff line number	Diff line change
@@ -20,7 +20,7 @@ exports[`renders targetstation unchanged 1`] = `
`20`	`20`	`>`
`21`	`21`	`<a`
`22`	`22`	`class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200`
`23`		`- bg-green-900 text-white"`
	`23`	`+ bg-[#F08080] text-black"`
`24`	`24`	`href="/instrument?name=Instrument"`
`25`	`25`	`target="_blank"`
`26`	`26`	`>`
@@ -35,7 +35,7 @@ exports[`renders targetstation unchanged 1`] = `
`35`	`35`	`<span`
`36`	`36`	`class="text-xs "`
`37`	`37`	`>`
`38`		`- RESUMING`
	`38`	`+ UNKNOWN`
`39`	`39`	`</span>`
`40`	`40`	`</div>`
`41`	`41`	`</a>`
@@ -45,7 +45,7 @@ exports[`renders targetstation unchanged 1`] = `
`45`	`45`	`>`
`46`	`46`	`<a`
`47`	`47`	`class="flex items-center justify-center text-center p-3 w-36 max-h-12 rounded-lg shadow-sm border-2 border-gray-700 dark:border-gray-200 hover:shadow-lg hover:border-black dark:hover:border-gray-700 transition-all duration-200`
`48`		`- bg-[#FFFF00] text-black"`
	`48`	`+ bg-[#F08080] text-black"`
`49`	`49`	`href="/instrument?name=Instrument2"`
`50`	`50`	`target="_blank"`
`51`	`51`	`>`
@@ -60,7 +60,7 @@ exports[`renders targetstation unchanged 1`] = `
`60`	`60`	`<span`
`61`	`61`	`class="text-xs "`
`62`	`62`	`>`
`63`		`- VETOING`
	`63`	`+ UNKNOWN`
`64`	`64`	`</span>`
`65`	`65`	`</div>`
`66`	`66`	`</a>`