Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add custom Gantt Date Range #4563

Conversation

AlexMooney
Copy link
Contributor

@AlexMooney AlexMooney commented Jun 30, 2023

馃搼 Summary

Add dateRange to specify a custom range for a Gantt Chart.

Resolves #1530

馃搹 Design Decisions

Describe the way your implementation works or what design decisions you made if applicable.

  • Remove all tasks which are completely outside of the custom range
  • Force the x-range on the plot to match the custom range (though there might be some rounding)
  • Allow setting an absolute range dateRange :2023-06-01, 2023-07-01
  • Allow setting a relative range dateRange :today - 7d, today + 30d
    • I think I'll leave this to future PRs
  • Allow setting only lower bound dateRange :2023-06-01
  • Allow setting only upper bound dateRange :,2023-07-01 馃憟 kind of strange; proposals welcomed
  • Tests for the range values
  • Manual testing with some screen shots
    • I'm not a JS/TS dev and need some instructions for how to generate plots locally to do this part. 馃槄

Possible problems

  • The dateRange is interpreted with the dateFormat, so if the former comes first, it'll can screw up the date parsing

馃搵 Tasks

Make sure you

  • 馃摉 have read the contribution guidelines
  • 馃捇 have added unit/e2e tests (if appropriate)
  • 馃摀 have added documentation (if appropriate)
  • 馃敄 targeted develop branch

@codecov
Copy link

codecov bot commented Jun 30, 2023

Codecov Report

Merging #4563 (41c61d0) into develop (db30f21) will decrease coverage by 17.18%.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##           develop    #4563       +/-   ##
============================================
- Coverage    75.61%   58.44%   -17.18%     
============================================
  Files          143       52       -91     
  Lines        16489     8732     -7757     
  Branches       518       18      -500     
============================================
- Hits         12468     5103     -7365     
+ Misses        3894     3629      -265     
+ Partials       127        0      -127     
Flag Coverage 螖
e2e ?
unit 58.44% <100.00%> (+0.31%) 猬嗭笍

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage 螖
packages/mermaid/src/diagrams/gantt/ganttDb.js 78.53% <100.00%> (-5.25%) 猬囷笍

... and 137 files with indirect coverage changes

@AlexMooney AlexMooney marked this pull request as ready for review June 30, 2023 23:45
Copy link
Member

@sidharthv96 sidharthv96 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work!
Only few minor suggestions.

packages/mermaid/src/diagrams/gantt/ganttDb.js Outdated Show resolved Hide resolved
Comment on lines +495 to +504
imgSnapshotTest(
`
---
displayMode: compact
---
gantt
title GANTT compact
dateFormat HH:mm:ss
dateRange 12:30:00,13:30:00
axisFormat %Hh%M
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the imgSnapshotTests, for the other scenarios of dateRange?

  • Actual date
  • Only start
  • Only end

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Certainly, but how do these work? Where are the images produced so that I can check them? I suspect that without altering the tasks, the display is going to be messed up, with the task bars invading the margins, but I don't know how to produce any diagram output from this repo.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To verify snapshots:

pnpm e2e
open cypress/snapshots

Can you also add this into the contribution docs if it's not present there?

packages/mermaid/src/diagrams/gantt/ganttDb.js Outdated Show resolved Hide resolved
packages/mermaid/src/diagrams/gantt/ganttDb.js Outdated Show resolved Hide resolved
packages/mermaid/src/diagrams/gantt/ganttDb.js Outdated Show resolved Hide resolved
packages/mermaid/src/diagrams/gantt/ganttDb.js Outdated Show resolved Hide resolved
@sidharthv96
Copy link
Member

The current failure is from the new tests.

   1) should render with an end-only dateRange


  20 passing (43s)
  1 failing

  1) Gantt diagram
       should render with an end-only dateRange:
     CypressError: The following error originated from your application code, not from Cypress. It was caused by an unhandled promise rejection.

  > Invalid date: '' with date format: ' HH:mm:ss'

@sidharthv96
Copy link
Member

@AlexMooney It would be nice to have this released. Please let us know if you're working on it.

@paldeep-singh
Copy link

I'd be keen to take this on as a first issue if you need someone to

@AlexMooney
Copy link
Contributor Author

I'd be keen to take this on as a first issue if you need someone to

Hi @paldeep-singh feel free to take this over! Sorry for leaving this half-done, everyone. 馃檱

@sidharthv96
Copy link
Member

Hi @paldeep-singh feel free to take this over! Sorry for leaving this half-done, everyone. 馃檱

No need for any apologies @AlexMooney, we're all doing this for free 鉂わ笍

@sidharthv96
Copy link
Member

Work continued in #5220

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Gnatt Chart Custom Date Range
3 participants