Merge branch 'develop' into update-node-CI

ral-facilities · Nov 3, 2023 · bcb7c1d · bcb7c1d
2 parents 71833ce + 96fd1ee
commit bcb7c1d
Show file tree

Hide file tree

Showing 26 changed files with 148 additions and 140 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/...est-npm-2.88.11-863a69ed3c-e4b3f62e0c.zip → ...est-npm-2.88.12-9c79415088-2c6fbf7f31.zip b/...est-npm-2.88.11-863a69ed3c-e4b3f62e0c.zip → ...est-npm-2.88.12-9c79415088-2c6fbf7f31.zip
diff --git a/.yarn/cache/@types-node-npm-14.18.43-f0e28be370-3ef43eda26.zip b/.yarn/cache/@types-node-npm-14.18.43-f0e28be370-3ef43eda26.zip
diff --git a/.yarn/cache/@types-node-npm-16.18.60-d8a53d4818-aa0c81c3f2.zip b/.yarn/cache/@types-node-npm-16.18.60-d8a53d4818-aa0c81c3f2.zip
diff --git a/.yarn/cache/commander-npm-5.1.0-7e939e7832-0b7fec1712.zip b/.yarn/cache/commander-npm-5.1.0-7e939e7832-0b7fec1712.zip
diff --git a/.yarn/cache/commander-npm-6.2.1-d5b635f237-d7090410c0.zip b/.yarn/cache/commander-npm-6.2.1-d5b635f237-d7090410c0.zip
diff --git a/.yarn/cache/cypress-npm-12.17.3-602acfb08c-1da3922cac.zip b/.yarn/cache/cypress-npm-12.17.3-602acfb08c-1da3922cac.zip
diff --git a/.yarn/cache/cypress-npm-9.7.0-f933f637cc-45df7c85bc.zip b/.yarn/cache/cypress-npm-9.7.0-f933f637cc-45df7c85bc.zip
diff --git a/...tter2-npm-6.4.9-ba37798a18-be59577c1e.zip → ...tter2-npm-6.4.7-ad2467adaa-1b36a77e13.zip b/...tter2-npm-6.4.9-ba37798a18-be59577c1e.zip → ...tter2-npm-6.4.7-ad2467adaa-1b36a77e13.zip
diff --git a/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip b/.yarn/cache/semver-npm-7.5.4-c4ad957fcd-12d8ad952f.zip
diff --git a/.yarn/cache/tough-cookie-npm-2.5.0-79a2fe43fe-16a8cd0902.zip b/.yarn/cache/tough-cookie-npm-2.5.0-79a2fe43fe-16a8cd0902.zip
diff --git a/.yarn/cache/tough-cookie-npm-4.1.3-08285e2518-c9226afff3.zip b/.yarn/cache/tough-cookie-npm-4.1.3-08285e2518-c9226afff3.zip
diff --git a/cypress.config.js b/cypress.config.js
@@ -0,0 +1,18 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { defineConfig } = require('cypress');
+
+module.exports = defineConfig({
+  chromeWebSecurity: false,
+  video: false,
+  retries: {
+    runMode: 3,
+    openMode: 0,
+  },
+  e2e: {
+    setupNodeEvents(on) {
+      // https://github.com/bahmutov/cypress-failed-log
+      require('cypress-failed-log/on')(on);
+    },
+    baseUrl: 'http://127.0.0.1:3000',
+  },
+});
diff --git a/cypress.json b/cypress.json
diff --git a/cypress/integration/table/app.spec.ts → cypress/e2e/table/app.cy.ts b/cypress/integration/table/app.spec.ts → cypress/e2e/table/app.cy.ts
diff --git a/cypress/integration/table/channels.spec.ts → cypress/e2e/table/channels.spec.ts b/cypress/integration/table/channels.spec.ts → cypress/e2e/table/channels.spec.ts
diff --git a/cypress/integration/table/filtering.spec.ts → cypress/e2e/table/filtering.cy.ts b/cypress/integration/table/filtering.spec.ts → cypress/e2e/table/filtering.cy.ts
diff --git a/cypress/integration/table/search.spec.ts → cypress/e2e/table/search.cy.ts b/cypress/integration/table/search.spec.ts → cypress/e2e/table/search.cy.ts
diff --git a/cypress/integration/table/sessions.spec.ts → cypress/e2e/table/sessions.spec.ts b/cypress/integration/table/sessions.spec.ts → cypress/e2e/table/sessions.spec.ts
diff --git a/cypress/integration/table/table.spec.ts → cypress/e2e/table/table.cy.ts b/cypress/integration/table/table.spec.ts → cypress/e2e/table/table.cy.ts
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -47,27 +47,25 @@ Cypress.Commands.add('dragAndDrop', (subject, target) => {
         .first()
         .then((subject) => {
           const coordsDrag = subject[0].getBoundingClientRect();
-          cy.wrap(subject)
-            .trigger('mousedown', {
-              button: BUTTON_INDEX,
-              clientX: coordsDrag.x,
-              clientY: coordsDrag.y,
-              force: true,
-            })
-            .trigger('mousemove', {
-              button: BUTTON_INDEX,
-              clientX: coordsDrag.x + SLOPPY_CLICK_THRESHOLD,
-              clientY: coordsDrag.y,
-              force: true,
-            });
-          cy.get('body')
-            .trigger('mousemove', {
-              button: BUTTON_INDEX,
-              clientX: coordsDrop.x + SLOPPY_CLICK_THRESHOLD,
-              clientY: coordsDrop.y + SLOPPY_CLICK_THRESHOLD,
-              force: true,
-            })
-            .trigger('mouseup');
+          cy.wrap(subject).trigger('mousedown', {
+            button: BUTTON_INDEX,
+            clientX: coordsDrag.x,
+            clientY: coordsDrag.y,
+            force: true,
+          });
+          cy.wrap(subject).trigger('mousemove', {
+            button: BUTTON_INDEX,
+            clientX: coordsDrag.x + SLOPPY_CLICK_THRESHOLD,
+            clientY: coordsDrag.y,
+            force: true,
+          });
+          cy.get('body').trigger('mousemove', {
+            button: BUTTON_INDEX,
+            clientX: coordsDrop.x + SLOPPY_CLICK_THRESHOLD,
+            clientY: coordsDrop.y + SLOPPY_CLICK_THRESHOLD,
+            force: true,
+          });
+          cy.get('body').trigger('mouseup');
         });
     });
 });

diff --git a/cypress/support/index.js → cypress/support/e2e.js b/cypress/support/index.js → cypress/support/e2e.js
@@ -14,7 +14,7 @@
 // ***********************************************************
 
 // Import commands.js using ES2015 syntax:
-import './commands'
+import './commands';
 
 import './util';
 

diff --git a/package.json b/package.json
@@ -119,7 +119,7 @@
     "chart.js": "4.3.0",
     "chartjs-plugin-zoom": "2.0.0",
     "cross-env": "7.0.3",
-    "cypress": "9.7.0",
+    "cypress": "12.17.3",
     "cypress-failed-log": "2.10.0",
     "eslint": "8.44.0",
     "eslint-config-prettier": "8.8.0",

diff --git a/src/index.tsx b/src/index.tsx
@@ -46,7 +46,7 @@ function domElementGetter(): HTMLElement {
 const reactLifecycles = singleSpaReact({
   React,
   ReactDOMClient,
-  rootComponent: () => document.getElementById(pluginName) ? <App /> : null,
+  rootComponent: () => (document.getElementById(pluginName) ? <App /> : null),
   domElementGetter,
   errorBoundary: (error) => {
     log.error(`${pluginName} failed with error: ${error}`);