From b5c598b620ea52d86d40b3e1b938f8c41265b8fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Oct 2026 08:09:55 +0000 Subject: [PATCH 1/2] Bump date-and-time from 3.6.0 to 4.7.0 Bumps [date-and-time](https://github.com/knowledgecode/date-and-time) from 3.6.0 to 4.7.0. - [Release notes](https://github.com/knowledgecode/date-and-time/releases) - [Commits](https://github.com/knowledgecode/date-and-time/compare/v3.6.0...v4.7.0) --- updated-dependencies: - dependency-name: date-and-time dependency-version: 4.7.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 13 ++++++++----- package.json | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9cd14287e9..79133321dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,7 +43,7 @@ "@stylistic/eslint-plugin": "5.10.0", "@types/d3": "7.4.3", "chai": "4.5.0", - "date-and-time": "3.6.0", + "date-and-time": "4.7.0", "eslint": "9.37.0", "eslint-plugin-jsdoc": "65.3.0", "globals": "17.12.0", @@ -3469,11 +3469,14 @@ } }, "node_modules/date-and-time": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-3.6.0.tgz", - "integrity": "sha512-V99gLaMqNQxPCObBumb31Bfy3OByXnpqUM0yHPi/aBQE61g42A2rGk6Z2CDnpLrWsOFLQwOgl4Vgshw6D44ebw==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/date-and-time/-/date-and-time-4.7.0.tgz", + "integrity": "sha512-vlcYhTCJob7D1oaLkMsDwIiwpg3qc4rd1E/2EqXvcW5vYGoNTF2gsH/jDysvmtq/eDxGMAleHdzt2HwoZGnx5Q==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/debug": { "version": "2.6.9", diff --git a/package.json b/package.json index 409d7cf99b..5744d38f02 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "@stylistic/eslint-plugin": "5.10.0", "@types/d3": "7.4.3", "chai": "4.5.0", - "date-and-time": "3.6.0", + "date-and-time": "4.7.0", "eslint": "9.37.0", "eslint-plugin-jsdoc": "65.3.0", "globals": "17.12.0", From 50519b3882da80ac69a48ac3fe14499f2cdab939 Mon Sep 17 00:00:00 2001 From: George Raduta Date: Tue, 27 Oct 2026 09:13:55 +0100 Subject: [PATCH 2/2] Use 24-hour HH token when parsing dates in tests for date-and-time v4 --- test/public/defaults.js | 4 ++-- test/public/qcFlagTypes/overview.test.js | 4 ++-- test/public/qcFlags/forDataPassOverview.test.js | 4 ++-- test/public/qcFlags/forSimulationPassOverview.test.js | 4 ++-- test/public/qcFlags/gaqOverview.test.js | 2 +- test/public/qcFlags/synchronousOverview.test.js | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/public/defaults.js b/test/public/defaults.js index 9593cdcbec..542c5c8fd6 100644 --- a/test/public/defaults.js +++ b/test/public/defaults.js @@ -952,10 +952,10 @@ module.exports.expectLink = async (element, selector, { href, innerText }) => { /** * Validate date string against given format * @param {string} date date (time) string - * @param {string} [format = 'DD/MM/YYYY hh:mm:ss'] format to validate against + * @param {string} [format = 'DD/MM/YYYY HH:mm:ss'] format to validate against * @return {boolean} true if format is correct, false otherwise */ -module.exports.validateDate = (date, format = 'DD/MM/YYYY hh:mm:ss') => !isNaN(dateAndTime.parse(date, format)); +module.exports.validateDate = (date, format = 'DD/MM/YYYY HH:mm:ss') => !isNaN(dateAndTime.parse(date, format)); /** * Return the selector for all the inputs composing a period inputs diff --git a/test/public/qcFlagTypes/overview.test.js b/test/public/qcFlagTypes/overview.test.js index 0bff97f343..fd1796e532 100644 --- a/test/public/qcFlagTypes/overview.test.js +++ b/test/public/qcFlagTypes/overview.test.js @@ -63,8 +63,8 @@ module.exports = () => { name: (name) => name !== '-', method: (method) => method !== '-', bad: (isBad) => isBad === 'Yes' || isBad === 'No', - createdAt: (date) => !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, hh:mm:ss')), - updatedAt: (date) => date === '-' | !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, hh:mm:ss')), + createdAt: (date) => !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, HH:mm:ss')), + updatedAt: (date) => date === '-' | !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, HH:mm:ss')), createdBy: (userName) => userName !== '-', }; diff --git a/test/public/qcFlags/forDataPassOverview.test.js b/test/public/qcFlags/forDataPassOverview.test.js index 7922022ee2..3e28a325a5 100644 --- a/test/public/qcFlags/forDataPassOverview.test.js +++ b/test/public/qcFlags/forDataPassOverview.test.js @@ -95,8 +95,8 @@ module.exports = () => { } }); // eslint-disable-next-line jsdoc/require-param - const validateDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY hh:mm:ss')); - const validateQcFlagDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, hh:mm:ss.SSS')); + const validateDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY HH:mm:ss')); + const validateQcFlagDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, HH:mm:ss.SSS')); const tableDataValidators = { flagType: (flagType) => flagType && flagType !== '-', createdBy: (userName) => userName && userName !== '-', diff --git a/test/public/qcFlags/forSimulationPassOverview.test.js b/test/public/qcFlags/forSimulationPassOverview.test.js index fa12c660f2..f1078175ec 100644 --- a/test/public/qcFlags/forSimulationPassOverview.test.js +++ b/test/public/qcFlags/forSimulationPassOverview.test.js @@ -96,8 +96,8 @@ module.exports = () => { } }); // eslint-disable-next-line jsdoc/require-param - const validateDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY hh:mm:ss')); - const validateQcFlagDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, hh:mm:ss.SSS')); + const validateDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY HH:mm:ss')); + const validateQcFlagDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, HH:mm:ss.SSS')); const tableDataValidators = { flagType: (flagType) => flagType && flagType !== '-', createdBy: (userName) => userName && userName !== '-', diff --git a/test/public/qcFlags/gaqOverview.test.js b/test/public/qcFlags/gaqOverview.test.js index 98070fd69c..f749950826 100644 --- a/test/public/qcFlags/gaqOverview.test.js +++ b/test/public/qcFlags/gaqOverview.test.js @@ -64,7 +64,7 @@ module.exports = () => { it('shows correct datatypes in respective columns', async () => { // eslint-disable-next-line require-jsdoc - const validateQcFlagDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, hh:mm:ss.SSS')); + const validateQcFlagDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, HH:mm:ss.SSS')); const tableDataValidators = { generalQuality: (generalQuality) => ['good', 'bad', 'MC.R', ''].includes(generalQuality), from: (timestamp) => timestamp === 'Whole run coverage' || validateQcFlagDate(timestamp), diff --git a/test/public/qcFlags/synchronousOverview.test.js b/test/public/qcFlags/synchronousOverview.test.js index 476194f86b..d0f3e1faec 100644 --- a/test/public/qcFlags/synchronousOverview.test.js +++ b/test/public/qcFlags/synchronousOverview.test.js @@ -60,8 +60,8 @@ module.exports = () => { it('shows correct datatypes in respective columns', async () => { // eslint-disable-next-line require-jsdoc - const validateDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, hh:mm:ss')); - const validateQcFlagDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, hh:mm:ss.SSS')); + const validateDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, HH:mm:ss')); + const validateQcFlagDate = (date) => date === '-' || !isNaN(dateAndTime.parse(date, 'DD/MM/YYYY, HH:mm:ss.SSS')); const tableDataValidators = { flagType: (flagType) => flagType && flagType !== '-',