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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/10.7.0 #5188

Merged
merged 329 commits into from
Jan 15, 2024
Merged

Release/10.7.0 #5188

merged 329 commits into from
Jan 15, 2024

Conversation

sidharthv96
Copy link
Member

No description provided.

guypursey and others added 30 commits October 31, 2023 17:24
Changed argument names from commit1 and commit2 to
commitA and commitB respectively to prevent confusion
with seq number values.

Replaced Array filter method with array some method
so that as soon as one overlap is found, function is
finished.

Used Object.entries instead of Object.keys to reduce
number of variables needed and make function easier
to read.
On previous rewrite, I had created new functions within the
overlapping functions but these were being recreated on each
iteration of Object.some(). I moved them outside this for
clarity and so they're not recreated each iteration.
The function also now does an additional check to see
if source branch in overlap check is on main.

As we're no longer purely checking for an overlap and
the only use of this function is to reroute the arrows
to avoid running over commits, this more literal name
should be clearer.
Checking if branch was same as main turned out to be redundant
for now, since there don't seem to be any cases where routing
curves into main.

This fixes issue found in review by @nirname and avoids a
situation where branching from the same commit results in
unnecessary rerouting.
Followed practice of other tests so that commit IDs are
stabilised (i.e., not randomly generated) and therefore
don't show repeatedly in Cypress diff output screenshots
In these tests, a new branch is created but then a commit is made
on the main branch before the new branch gets a commit. This
important to see what happens with rerouting of arrows.

Suggested by @nirname in PR review of #4927.
Hypothesised that working out which branch needed checking for
overlapping commits might be missing, so added that as a
nested ternary and passed result as new argument to rerouting
check.

If commits are found on the branch which will be getting the
curve (whichever branch is lower or more to the right of main
than the other, for now), then the arrow will be rerouted.

I may refactor in a follow-up commit and I think there's scope
to simplify the logic but this is a test for now.
My focus earlier on had been on relationship to `main` branch
so this is to ensure that we have some tests that cover
relationship between a pair of branches that doesn't
include `main`.
Based on review by @nirname. I had originally been trying
to minimise number of new arguments being passed to
rerouting check but as the branch curve check is not used
elsewhere and is part of the same rerouting check it makes
sense for them to be together.

Position information now passed to rerouting fn instead.
Should stop randomised commit IDs from showing arbitrary
differences between test runs.
Wanted to avoid repetition given that the originally nested
ternaries had the same structure
Pre-commit lint hook had made the use of ternaries harder to read
than I'd originally intended so I introduced an additional
variable which explains what is being checked and keeps ternaries
from becoming obscured.
Copy link

netlify bot commented Jan 11, 2024

Deploy Preview for mermaid-js ready!

Name Link
🔨 Latest commit d972ddd
🔍 Latest deploy log https://app.netlify.com/sites/mermaid-js/deploys/65a4f3a09fa3460008fe8ca1
😎 Deploy Preview https://deploy-preview-5188--mermaid-js.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@sidharthv96 sidharthv96 changed the base branch from develop to master January 11, 2024 09:04
Copy link

codecov bot commented Jan 11, 2024

Codecov Report

Attention: 56 lines in your changes are missing coverage. Please review.

Comparison is base (d6d465d) 76.60% compared to head (d972ddd) 62.94%.
Report is 1 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #5188       +/-   ##
===========================================
- Coverage   76.60%   62.94%   -13.67%     
===========================================
  Files         164      108       -56     
  Lines       13820    10398     -3422     
  Branches      693      519      -174     
===========================================
- Hits        10587     6545     -4042     
- Misses       3077     3740      +663     
+ Partials      156      113       -43     
Flag Coverage Δ
e2e 65.51% <64.70%> (-16.26%) ⬇️
unit 43.04% <43.33%> (+0.10%) ⬆️

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

Files Coverage Δ
packages/mermaid/src/Diagram.ts 74.35% <100.00%> (+0.67%) ⬆️
packages/mermaid/src/dagre-wrapper/createLabel.js 52.38% <ø> (-40.48%) ⬇️
packages/mermaid/src/dagre-wrapper/edges.js 62.00% <100.00%> (-15.01%) ⬇️
packages/mermaid/src/dagre-wrapper/nodes.js 37.08% <ø> (-31.79%) ⬇️
packages/mermaid/src/diagrams/gantt/styles.js 100.00% <ø> (ø)
packages/mermaid/src/rendering-util/createText.ts 1.14% <ø> (-87.36%) ⬇️
packages/mermaid/src/setupGraphViewbox.js 77.77% <100.00%> (+12.71%) ⬆️
packages/mermaid/src/utils/imperativeState.ts 100.00% <100.00%> (ø)
packages/mermaid/src/dagre-wrapper/edgeMarker.ts 92.30% <92.30%> (ø)
packages/mermaid/src/mermaidAPI.ts 72.31% <66.66%> (-6.11%) ⬇️
... and 6 more

... and 94 files with indirect coverage changes

markqian and others added 2 commits January 11, 2024 12:09
Update integrations-community.md (Add Codemia to the list of productivity tools using Mermaid)
@sidharthv96
Copy link
Member Author

State and Sequence diagrams have regressions.

image image

…graph-title-margin-config-option

Revert 5041 feature/4935 subgraph title margin config option
…-order-sequence-participant

Revert "fix: render the participants in same order as they are created"
…/mermaid into release/10.7.0

* 'master' of github.com:mermaid-js/mermaid:
  add inadvertent tracking removal
  update announcement bar

* 'release/10.7.0' of github.com:mermaid-js/mermaid:
…10.7.0

* 'develop' of github.com:mermaid-js/mermaid:
  Revert "fix: render the participants in same order as they are created"
  Revert "Feature/4935 subgraph title margin config option"
  Update integrations-community.md (Add Codemia to the list of productivity tools using Mermaid.)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.