Merge remote-tracking branch 'origin/main' into batched

Author: Tom-Willemsen

.github/workflows/nextjs.yml

@@ -51,7 +51,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
           cache: ${{ steps.detect-package-manager.outputs.manager }}
       - name: Setup Pages
         uses: actions/configure-pages@v5

.github/workflows/node.js.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
+        node-version: [20.x, 22.x, 24.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

app/components/Block.test.tsx

@@ -171,7 +171,7 @@ it("renders block with timestamp and shows timestamp value", () => {
   expect(
     container.querySelector(`#${aBlock.human_readable_name}_TIMESTAMP`)!
       .innerHTML,
-  ).toContain(new Date(expectedTimeStamp * 1000).toLocaleString());
+  ).toContain("11 Nov 2024, 16:20:22");
 });
 
 it("renders block without SP and hides SP value", () => {

app/components/Block.tsx

@@ -5,6 +5,12 @@ import { useState } from "react";
 const grafana_stub =
   "https://shadow.nd.rl.ac.uk/grafana/d/wMlwwaHMk/block-history?viewPanel=2&orgId=1&var-block=";
 
+const date_format = new Intl.DateTimeFormat("en-GB", {
+  dateStyle: "medium",
+  timeStyle: "medium",
+  timeZone: "Europe/London",
+});
+
 export default function Block({
   pv,
   instName,
@@ -101,7 +107,7 @@ export default function Block({
               pv.updateSeconds > minimum_date_to_be_shown ? (
                 <span id={pv.human_readable_name + "_TIMESTAMP"}>
                   {/*Multiply by 1000 here as Date() expects milliseconds*/}
-                  {`Last update: ${new Date(pv.updateSeconds * 1000).toLocaleString()}`}
+                  {`Last update: ${date_format.format(pv.updateSeconds * 1000)}`}
                 </span>
               ) : null}
             </div>