dev-bootstrap rebase from dev

.editorconfig

@@ -0,0 +1,28 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[*.{ts,js,jsx,tsx}]
+quote_type = double
+continuation_indent_size = 2
+curly_brace_next_line = false
+indent_brace_style = BSD
+spaces_around_operators = true
+spaces_around_brackets = true
+
+[*.{pl,pm,t,PL}]
+max_line_length = off
+continuation_indent_size = 4

.github/workflows/tests.yml

@@ -1,5 +1,5 @@
 name: 'GADS Tests'
-on: 
+on:
   push:
     branches:
       - master
@@ -115,6 +115,7 @@ jobs:
         browser:
           - name: 'chrome'
             os: 'ubuntu-22.04'
+            node_version: 24.x
 
     services:
       postgres:
@@ -185,7 +186,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [20.x, 22.x]
+        node-version: [22.x, 24.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

cypress.config.ts

@@ -6,5 +6,6 @@ export default defineConfig({
     setupNodeEvents(on, config) {
       // implement node event listeners here
     },
+    allowCypressEnv: false
   },
 });

cypress/e2e/functionality/02-homepage.cy.ts

@@ -3,9 +3,7 @@ import { goodPassword, goodUser } from "../../support/constants";
 describe('Dashboard Tests', () => {
   const bigLipsum = `Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque accumsan, sem et vulputate imperdiet, enim ipsum rhoncus massa, sit amet pellentesque lacus urna sit amet enim. In tristique mollis tincidunt. Sed eget ligula metus. Integer sodales placerat erat. Aliquam erat volutpat. Curabitur varius lacinia diam fringilla efficitur. Sed euismod purus vel turpis molestie, ac fringilla nisi vestibulum. Maecenas ullamcorper ornare dui sodales gravida. Donec maximus egestas eleifend. Etiam in ultrices ante. Duis quis volutpat turpis. Nulla dignissim ornare aliquet.
 Fusce interdum gravida est, sit amet vehicula nisi suscipit at. Pellentesque nec fermentum leo, in vehicula nulla. Nam dapibus ultricies tortor in maximus. Donec enim velit, molestie nec feugiat sed, posuere non ex. Nulla pellentesque gravida feugiat. Sed ornare purus vel libero semper aliquet. Nulla rutrum nunc sed vulputate gravida. Cras lobortis, lacus non tincidunt suscipit, leo quam vehicula libero, in vehicula diam justo ac est.
-Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque nunc libero eu augue. Cras ornare ut lectus in mattis. Quisque magna elit, efficitur nec dolor sed, semper dictum nunc. Cras ultricies, augue eget interdum aliquam, quam ex blandit sem, nec sollicitudin ex elit non mauris. Fusce dui justo, feugiat id lacus sit amet, pulvinar tristique felis. Etiam rhoncus ex ut congue aliquet. Sed at felis eget neque rhoncus malesuada. Aliquam commodo condimentum massa, sed volutpat nibh congue et. Maecenas blandit massa sed nisl pulvinar, vitae consectetur tortor placerat. Nulla laoreet diam ipsum, sit amet consectetur sem condimentum quis. Nullam et justo sem. Sed et sapien tempus, scelerisque nisl ac, pretium arcu.
-Donec quis finibus ante. Nulla et dui posuere, semper elit quis, maximus ipsum. Aliquam ante nulla, pellentesque sed neque sit amet, finibus cursus est. Aliquam sed sollicitudin orci. Nulla malesuada augue lectus, ac tincidunt orci fermentum ac. Nullam pulvinar diam felis, sed condimentum arcu ornare sit amet. Praesent eget lobortis purus. In hac habitasse platea dictumst. Ut lorem nisl, fringilla vitae quam lobortis, vehicula egestas magna. Sed convallis placerat ante quis convallis. Vivamus pharetra quam diam, ut ultricies neque mollis vitae. Morbi augue tellus, feugiat a interdum a, tincidunt vel ante.
-Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut porttitor risus, at pulvinar tortor. Integer eleifend volutpat efficitur. Maecenas massa odio, pharetra eu eleifend eu, volutpat sed dui. Donec efficitur sed risus sit amet imperdiet. Pellentesque nec arcu non nibh congue cursus et a sapien. Phasellus ullamcorper magna nec varius facilisis. Curabitur et tempus est. Nulla tincidunt porttitor mollis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean vitae pretium felis. Aliquam vehicula et nisl sit amet pharetra. Nulla ac sollicitudin velit. Cras egestas ac sem vitae sollicitudin. Nullam convallis risus id massa vestibulum imperdiet. Cras in enim sit amet ligula placerat eleifend.`
+Mauris tempus, mi nec sodales semper, metus neque blandit sem, non scelerisque nunc libero eu augue. Cras ornare ut lectus in mattis. Quisque magna elit, efficitur nec dolor sed, semper dictum nunc. Cras ultricies, augue eget interdum aliquam, quam ex blandit sem, nec sollicitudin ex elit non mauris. Fusce dui justo, feugiat id lacus sit amet, pulvinar tristique felis. Etiam rhoncus ex ut congue aliquet. Sed at felis eget neque rhoncus malesuada. Aliquam commodo condimentum massa, sed volutpat nibh congue et. Maecenas blandit massa sed nisl pulvinar, vitae consectetur tortor placerat. Nulla laoreet diam ipsum, sit amet consectetur sem condimentum quis. Nullam et justo sem. Sed et sapien tempus, scelerisque nisl ac, pretium arcu.`
 
   beforeEach(() => {
     cy.loginAndGoTo(goodUser, goodPassword, 'http://localhost:3000/?did=1');
@@ -21,61 +19,73 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut
   })
 
   it('Displays the home page correctly', () => {
-    cy.get("li.list__item").eq(0)
+    cy.get("a.nav-link").eq(0)
       .should("exist")
-      .contains("Home dashboard (shared)")
-      .should("have.class", "link--active");
-    cy.get("li.list__item").eq(1)
+      .should("have.class", "active")
+      .contains("Home dashboard (shared)");
+    cy.get("a.nav-link").eq(1)
       .should("exist")
-      .contains("Home dashboard (personal)")
-      .should("not.have.class", "link--active");
+      .should("not.have.class", "active")
+      .contains("Home dashboard (personal)");
   });
 
   it('Should navigate to the personal dashboard', () => {
-    cy.get("li.list__item").eq(1)
+    cy.get("a.nav-link").eq(1)
       .should("exist")
-      .should("not.have.class", "link--active")
+      .should("not.have.class", "active")
       .click();
+    cy.get("a.nav-link").eq(1)
+      .should("exist")
+      .should("have.class", "active")
+      .contains("Home dashboard (personal)");
   });
 
   it('Should navigate to the shared dashboard', () => {
-    cy.get("li.list__item").eq(0)
+    cy.get("a.nav-link").eq(1)
+      .click();
+    cy.get("a.nav-link").eq(0)
       .should("exist")
-      .should("not.have.class", "link--active")
+      .should("not.have.class", "active")
       .click();
+    cy.get("a.nav-link").eq(0)
+      .should("exist")
+      .should("have.class", "active")
+      .contains("Home dashboard (shared)");
   });
 
   context("Shared Dashboard", () => {
     it('Should cancel creation of a shared dashboard widget', () => {
+      cy.wait(1000);
       cy.get(".ld-footer-container")
         .find("button")
         .eq(1)
         .click();
       cy.get(".ld-footer-container")
-        .find(".dropdown__menu")
+        .find(".dropdown-menu.show")
         .find("a")
-        .eq(1)
+        .eq(0)
         .click();
       cy.get("[aria-label='Edit Modal']").find("button.btn-cancel").click();
       cy.get(".ld-widget").should("have.length", 0);
     });
 
     it("Should create a shared dashboard widget", () => {
+      cy.wait(1000);
       cy.get(".ld-footer-container")
         .find("button")
         .eq(1)
         .click();
       cy.get(".ld-footer-container")
-        .find(".dropdown__menu")
+        .find(".dropdown-menu.show")
         .find("a")
-        .eq(1)
+        .eq(0)
         .click();
       cy.get("[aria-label='Edit Modal']")
         .find("input[name='title']", { timeout: 10000 })
         .should("be.visible");
       cy.get("[aria-label='Edit Modal']")
         .find(".modal-footer__right")
-        .find("button.btn-default").click();
+        .find("button.btn-primary").click();
       cy.get(".ld-widget").should("have.length", 1);
       cy.get(".ld-widget").find("div").contains("This is a new notice widget - click edit to update the contents");
     });
@@ -90,7 +100,7 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut
         .type("With a new title");
       cy.get("[aria-label='Edit Modal']")
         .find(".modal-footer__right")
-        .find("button.btn-default").click();
+        .find("button.btn-primary").click();
       cy.get(".ld-widget").find("h4").contains("With a new title");
     });
 
@@ -105,7 +115,7 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut
         .type(bigLipsum);
       cy.get("[aria-label='Edit Modal']")
         .find(".modal-footer__right")
-        .find("button.btn-default").click();
+        .find("button.btn-primary").click();
     });
 
     it("Should delete a shared dashboard widget", () => {
@@ -120,43 +130,45 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut
 
   context("Personal Dashboard", () => {
     it('Should cancel creation of a personal dashboard widget', () => {
-      cy.get("a.link--primary").click();
+      cy.get("a.nav-link").eq(1).click();
+      cy.wait(1000);
       cy.get(".ld-footer-container")
         .find("button")
         .eq(1)
         .click();
       cy.get(".ld-footer-container")
-        .find(".dropdown__menu")
+        .find(".dropdown-menu.show")
         .find("a")
-        .eq(1)
+        .eq(0)
         .click();
       cy.get("[aria-label='Edit Modal']").find("button.btn-cancel").click();
       cy.get(".ld-widget").should("have.length", 1);
     });
 
     it("Should create a personal dashboard widget", () => {
-      cy.get("a.link--primary").click();
+      cy.get("a.nav-link").eq(1).click();
+      cy.wait(1000);
       cy.get(".ld-footer-container")
         .find("button")
         .eq(1)
         .click();
       cy.get(".ld-footer-container")
-        .find(".dropdown__menu")
+        .find(".dropdown-menu.show")
         .find("a")
-        .eq(1)
+        .eq(0)
         .click();
       cy.get("[aria-label='Edit Modal']")
         .find("input[name='title']", { timeout: 10000 })
         .should("be.visible");
       cy.get("[aria-label='Edit Modal']")
         .find(".modal-footer__right")
-        .find("button.btn-default").click();
+        .find("button.btn-primary").click();
       cy.get(".ld-widget").should("have.length", 2);
       cy.get(".ld-widget").eq(1).find("div").contains("This is a new notice widget - click edit to update the contents");
     });
 
     it("Should edit a personal dashboard widget", () => {
-      cy.get("a.link--primary").click();
+      cy.get("a.nav-link").eq(1).click();
       cy.get(".ld-widget").eq(1).find(".ld-edit-button").click();
       cy.get("[aria-label='Edit Modal']")
         .find("input[name='title']", { timeout: 10000 })
@@ -166,12 +178,12 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut
         .type("With a new title");
       cy.get("[aria-label='Edit Modal']")
         .find(".modal-footer__right")
-        .find("button.btn-default").click();
+        .find("button.btn-primary").click();
       cy.get(".ld-widget").eq(1).find("h4").contains("With a new title");
     });
 
     it("Should edit a personal dashboard widget with a lot of text", () => {
-      cy.get("a.link--primary").click();
+      cy.get("a.nav-link").eq(1).click();
       cy.get(".ld-widget").eq(1).find(".ld-edit-button").click();
       cy.get("[aria-label='Edit Modal']")
         .find("input[name='title']", { timeout: 10000 })
@@ -182,11 +194,11 @@ Ut diam tortor, hendrerit eget ipsum non, suscipit mattis elit. Pellentesque ut
         .type(bigLipsum);
       cy.get("[aria-label='Edit Modal']")
         .find(".modal-footer__right")
-        .find("button.btn-default").click();
+        .find("button.btn-primary").click();
     });
 
     it("Should delete a personal dashboard widget", () => {
-      cy.get("a.link--primary").click();
+      cy.get("a.nav-link").eq(1).click();
       cy.get(".ld-widget").eq(1).find(".ld-edit-button").click();
       cy.get("[aria-label='Edit Modal']")
         .find("input[name='title']", { timeout: 10000 })

cypress/e2e/functionality/03-settings.cy.ts

@@ -65,7 +65,7 @@ describe("settings tests", () => {
                 .find("tr")
                 .contains("No titles available");
             cy.mainHeader()
-                .find(".btn-default")
+                .find(".btn-primary")
                 .should("exist")
                 .click();
             cy.location("pathname").should("include", "/title_add");
@@ -93,7 +93,7 @@ describe("settings tests", () => {
                 .find("tr")
                 .contains("No titles available");
             cy.mainHeader()
-                .find(".btn-default")
+                .find(".btn-primary")
                 .should("exist")
                 .click();
             cy.location("pathname").should("include", "/title_add");
@@ -191,7 +191,7 @@ describe("settings tests", () => {
                 .find("tr")
                 .contains("No organisations available");
             cy.mainHeader()
-                .find(".btn-default")
+                .find(".btn-primary")
                 .should("exist")
                 .click();
             cy.location("pathname").should("include", "/organisation_add");
@@ -219,7 +219,7 @@ describe("settings tests", () => {
                 .find("tr")
                 .contains("No organisations available");
             cy.mainHeader()
-                .find(".btn-default")
+                .find(".btn-primary")
                 .should("exist")
                 .click();
             cy.location("pathname").should("include", "/organisation_add");

cypress/e2e/functionality/06-tables-and-wizard.cy.ts

@@ -8,7 +8,7 @@ describe('Another Test Suite', () => {
 
     //attempt save with incorrect (fails)
     it.skip('should fail to save new table with  invalid shortname ', () => {
-        cy.get('[data-target="#newTableModal"]').click();
+        cy.get('[data-bs-target="#newTableModal"]').click();
         cy.get('#shortName').type('This value wont $4v£');
         cy.get("#name").type("table to fail");
         cy.get('.btn-js-next').eq(0).click();
@@ -19,7 +19,7 @@ describe('Another Test Suite', () => {
     });
 
     it('should save a new table successfully', () => {
-        cy.get('[data-target="#newTableModal"]').click();
+        cy.get('[data-bs-target="#newTableModal"]').click();
         cy.get('#shortName').type('1-test_table');
         cy.get("#name").type("1-test-table");
         cy.get('.btn-js-next').eq(0).click();