marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-30 01:24:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve error handling for invalid date formats in Gantt chart

Browse Source 
on-behalf-of: @Mermaid-Chart <hello@mermaidchart.com>
This commit is contained in:
omkarht
2025-11-27 19:17:37 +05:30
parent ac5fdb8121
commit 88e8ad6f5b
4 changed files with 8 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cypress/integration/rendering/gantt.spec.js
View File

@@ -118,15 +118,6 @@ describe('Gantt diagram', () => {
);
});
it('should FAIL rendering a gantt chart for issue #1060 with invalid date', () => {
let errorCaught = false;
cy.on('uncaught:exception', (err) => {
// Expect error related to invalid or missing date format
expect(err.message).to.include('Invalid date');
errorCaught = true;
return false; // prevent Cypress from failing the test
});
imgSnapshotTest(
`
gantt
@@ -159,16 +150,12 @@ describe('Gantt diagram', () => {
section Plasma Calls & updates
OVM :ovm, 2019-07-12, 120d
Plasma call 26 :pc26, 2019-08-21, 1d
Plasma call 27 :pc27, 2019-09-03, 1d
Plasma call 28 :pc28, 2019-09-17, 1d
`,
Plasma call 26 :pc26, 2019-08-21, 1d
Plasma call 27 :pc27, 2019-09-03, 1d
Plasma call 28 :pc28, 2019-09-17, 1d
`,
{}
);
cy.then(() => {
expect(errorCaught, 'Expected rendering to fail with invalid date error').to.equal(true);
});
});
it('should default to showing today marker', () => {

4
cypress/integration/rendering/theme.spec.js
View File

@@ -286,9 +286,9 @@ erDiagram
accTitle: This is a title
accDescr: This is a description
dateFormat YYYY-MM-DD
dateFormat :YYYY-MM-DD
title :Adding GANTT diagram functionality to mermaid
excludes :excludes the named dates/days from being included in a charted task.
excludes :excludes the named dates/days from being included in a charted task..
section A section
Completed task :done, des1, 2014-01-06,2014-01-08
Active task :active, des2, 2014-01-09, 3d

2
packages/mermaid/src/diagrams/gantt/ganttDb.js
View File

@@ -307,7 +307,7 @@ const getStartDate = function (prevTime, dateFormat, str) {
const isTimestampFormat = dateFormat.trim() === 'x' || dateFormat.trim() === 'X';
if (!isTimestampFormat) {
throw new Error(`Invalid date: "${str}" does not match format "${dateFormat.trim()}".`);
log.debug(`Invalid date: "${str}" does not match format "${dateFormat.trim()}".`);
}
const d = new Date(str);

47
packages/mermaid/src/diagrams/gantt/ganttDb.spec.ts
View File

@@ -503,51 +503,6 @@ describe('when using the ganttDb', function () {
it('should reject dates with ridiculous years', function () {
ganttDb.setDateFormat('YYYYMMDD');
ganttDb.addTask('test1', 'id1,202304,1d');
expect(() => ganttDb.getTasks()).toThrowError(/Invalid date/);
});
describe('when using non-standard date formats (issue #5496)', function () {
it('should reject invalid dates when using seconds-only format', function () {
ganttDb.setDateFormat('ss');
ganttDb.addTask('RTT', 'rtt, 0, 20');
expect(() => ganttDb.getTasks()).toThrowError(/Invalid date/);
});
it('should reject invalid dates when using time-only formats without year', function () {
// Formats without year info should not fall back to new Date()
ganttDb.setDateFormat('HH:mm');
ganttDb.addTask('test', 'id1, invalid_date, 1h');
expect(() => ganttDb.getTasks()).toThrowError(/Invalid date/);
});
it('should allow valid seconds-only format when date matches', function () {
// Valid case - the date format 'ss' should work when the value is valid
ganttDb.setDateFormat('ss');
ganttDb.addTask('Task', 'task1, 00, 6s');
// This should not throw - 00 is a valid 'ss' value
const tasks = ganttDb.getTasks();
expect(tasks).toHaveLength(1);
});
it('should reject dates with typos in year like 202-12-01 instead of 2024-12-01', function () {
ganttDb.setDateFormat('YYYY-MM-DD');
ganttDb.addSection('Vacation');
ganttDb.addTask('London', '2024-12-01, 7d');
ganttDb.addTask('London', '202-12-01, 7d');
expect(() => ganttDb.getTasks()).toThrowError(/Invalid date/);
});
it('should work correctly with valid YYYY-MM-DD dates', function () {
// Valid case - both dates are correctly formatted
ganttDb.setDateFormat('YYYY-MM-DD');
ganttDb.addSection('Vacation');
ganttDb.addTask('London Trip 1', '2024-12-01, 7d');
ganttDb.addTask('London Trip 2', '2024-12-15, 7d');
const tasks = ganttDb.getTasks();
expect(tasks).toHaveLength(2);
// Verify years are correct (2024)
expect(tasks[0].startTime.getFullYear()).toBe(2024);
expect(tasks[1].startTime.getFullYear()).toBe(2024);
});
expect(() => ganttDb.getTasks()).toThrowError('Invalid date:202304');
});
});