fix users not showing - they arent base64 encoded

ISISComputingGroup · Oct 2, 2024 · 389bc19 · 389bc19
1 parent 2029080
commit 389bc19
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/app/components/InstrumentData.tsx b/app/components/InstrumentData.tsx
@@ -215,10 +215,18 @@ export default function InstrumentData({
         updatedPVbytes != null
       ) {
         // this is a top bar column zero value
-        const row = updatedPVName.endsWith("TITLE") ? 0 : 1; // if title, column 1
-        // Both of these are base64 encoded. PVWS gives a null byte back if there is no value, so replace with null.
-        const value =
-          atob(updatedPVbytes) != "\x00" ? atob(updatedPVbytes) : null;
+        const isTitle = updatedPVName.endsWith("TITLE")
+
+        let value;
+        if (isTitle) {
+          // The title is base64 encoded. PVWS gives a null byte back if there is no value, so replace with null.
+          value = atob(updatedPVbytes) != "\x00" ? atob(updatedPVbytes) : null;
+        } else {
+          value = updatedPV.text
+        }
+
+        const row = isTitle ? 0 : 1; // if title, column 1
+
         currentInstrument.topBarPVs.set(updatedPVName, [
           row,
           0,