Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions test/public/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/public/qcFlagTypes/overview.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 !== '-',
};

Expand Down
4 changes: 2 additions & 2 deletions test/public/qcFlags/forDataPassOverview.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 !== '-',
Expand Down
4 changes: 2 additions & 2 deletions test/public/qcFlags/forSimulationPassOverview.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 !== '-',
Expand Down
2 changes: 1 addition & 1 deletion test/public/qcFlags/gaqOverview.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions test/public/qcFlags/synchronousOverview.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 !== '-',
Expand Down
Loading