Checking merge of Dev hasn't cause issues

.github/workflows/tests.yml

@@ -157,9 +157,11 @@ jobs:
           echo '*:*:*:postgres:postgrespassword' > ~/.pgpass
           chmod 600 ~/.pgpass
       - name: 'Install YARN dependencies'
+        # If the code isn't built (public dir) then the tests will fail
         run: |
           sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb
           yarn
+          yarn build --no-watch
       - name: 'Start the application'
         env:
           DANCER_CONFDIR: 'webdriver'

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();

cypress/support/builders/layout/LayoutBuilder.ts

@@ -222,7 +222,7 @@ class CurvalLayoutBuilder extends LayoutBuilderBase implements ICurvalLayoutBuil
         cy.get("label")
             .contains(this.field)
             .click();
-        cy.get("button.btn-xs[data-delete='rule']")
+        cy.get("button.btn-sm[data-delete='rule']")
             .eq(1)
             .click();
         //Someone owes me a drink!

cypress/support/commands.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-namespace */
 /// <reference types="cypress" />
 
 import { IBuildable } from "./builders/layout/interfaces";

jest.config.js

@@ -97,6 +97,7 @@ const config = {
     "^components/(.*)$": "<rootDir>/src/frontend/components/$1",
     "^set-field-values$": "<rootDir>/src/frontend/js/lib/set-field-values",
     "^guid$": "<rootDir>/src/frontend/js/lib/guid",
+    "^testing/(.*)$": "<rootDir>/src/frontend/testing/$1",
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
@@ -141,7 +142,7 @@ const config = {
   // runner: "jest-runner",
 
   // The paths to modules that run some code to configure or set up the testing environment before each test
-  // setupFiles: [],
+  setupFiles: ['./src/frontend/testing/setup.ts'],
 
   // A list of paths to modules that run some code to configure or set up the testing framework before each test
   // setupFilesAfterEnv: [],

lib/GADS.pm

@@ -412,7 +412,7 @@ get '/' => require_login sub {
         dashboards_json                     => schema->resultset('Dashboard')->dashboards_json(%params),
         page                                => 'index',
         'content_block_main_custom_classes' => 'pt-0',
-        'content_block_custom_classes'      => 'pl-0'
+        'content_block_custom_classes'      => 'ps-0'
     };
 
     if (my $download = param('download'))
@@ -2127,7 +2127,7 @@ prefix '/:layout_name' => sub {
             dashboards_json => schema->resultset('Dashboard')->dashboards_json(%params),
             page            => 'table_index',
             header_type     => "table_tabs",
-            content_block_custom_classes => "pl-0",
+            content_block_custom_classes => "ps-0",
             content_block_main_custom_classes => "pt-0",
             header_back_url => "${base_url}table",
             layout_obj      => $layout,