Merge branch 'add_own_wall_display' of https://github.com/ISISComputingGroup/WebDashboard into add_own_wall_display

Author: rerpha

app/components/CheckToggle.tsx

@@ -23,7 +23,7 @@ export default function CheckToggle({
           className="sr-only peer"
         />
         <div className="relative w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600"></div>
-        <span className={"ms-3 text-sm font-medium" + textColour}>{text}</span>
+        <span className={"ms-3 text-sm font-medium " + textColour}>{text}</span>
       </label>
     </div>
   );

app/components/InstrumentData.tsx

@@ -30,7 +30,7 @@ let lastUpdate: string = "";
 
 export function InstrumentData({ instrumentName }: { instrumentName: string }) {
   const [showHiddenBlocks, setShowHiddenBlocks] = useState(false);
-  const CONFIG_DETAILS = "CS:BLOCKSERVER:GET_CURR_CONFIG_DETAILS";
+  const CONFIG_DETAILS = "CS:BLOCKSERVER:WD_CONF_DETAILS";
   const [instlist, setInstlist] = useState<instList | null>(null);
   const [currentInstrument, setCurrentInstrument] = useState<Instrument | null>(
     null,

app/components/InstrumentsDisplay.tsx

@@ -54,11 +54,14 @@ export default function InstrumentsDisplay({
       targetStation: "Target Station 1",
       instruments: [
         { name: "ALF" },
+        { name: "ARGUS" },
+        { name: "CHRONUS" },
         { name: "CRISP" },
         { name: "EMMA-A" },
         { name: "EMU" },
         { name: "ENGINX" },
         { name: "GEM" },
+        { name: "HIFI" },
         {
           name: "HIFI-CRYOMAG",
         },
@@ -102,8 +105,6 @@ export default function InstrumentsDisplay({
     {
       targetStation: "Miscellaneous",
       instruments: [
-        { name: "ARGUS" },
-        { name: "CHRONUS" },
         {
           name: "CRYOLAB_R80",
         },
@@ -113,7 +114,6 @@ export default function InstrumentsDisplay({
         {
           name: "ENGINX_SETUP",
         },
-        { name: "HIFI" },
         {
           name: "HRPD_SETUP",
         },

package-lock.json

@@ -16,7 +16,7 @@
   "dependencies": {
     "@types/pako": "^2.0.3",
     "cross-env": "^7.0.3",
-    "next": "^14.2.5",
+    "next": "^14.2.15",
     "pako": "^2.1.0",
     "react": "^18",
     "react-dom": "^18",