fix(class): keep members in namespace classes #4532

tomperr · 2023-06-24T22:23:22Z

📑 Summary

Keep members of classes in namespaces, whether relations are defined before or after classes definition

Resolves #4519

📏 Design Decisions

We keep all classes (including the ones inside a namespace) inside classes dictionary so we don't consider them as undefined

📋 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-commenter · 2023-06-24T22:26:58Z

Codecov Report

Merging #4532 (47db1a3) into develop (ecc5289) will increase coverage by 2.93%.
The diff coverage is 82.35%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #4532      +/-   ##
===========================================
+ Coverage    81.01%   83.95%   +2.93%     
===========================================
  Files          136      136              
  Lines        10446    10445       -1     
  Branches       492      491       -1     
===========================================
+ Hits          8463     8769     +306     
+ Misses        1829     1529     -300     
+ Partials       154      147       -7

Flag	Coverage Δ
e2e	`83.83% <82.35%> (+2.94%)`	⬆️
unit	`28.28% <ø> (ø)`

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

Impacted Files	Coverage Δ
...ges/mermaid/src/diagrams/class/classRenderer-v2.ts	`79.85% <81.25%> (-0.15%)`	⬇️
packages/mermaid/src/diagrams/class/classDb.ts	`73.79% <100.00%> (-9.19%)`	⬇️

... and 36 files with indirect coverage changes

sidharthv96 · 2023-06-26T16:44:48Z

packages/mermaid/src/diagrams/class/classRenderer-v2.ts

+      let cssClassStr = '';
+      if (vertex.cssClasses.length > 0) {
+        cssClassStr = cssClassStr + ' ' + vertex.cssClasses.join(' ');
+      }


Suggested change

let cssClassStr = '';

if (vertex.cssClasses.length > 0) {

cssClassStr = cssClassStr + ' ' + vertex.cssClasses.join(' ');

}

const cssClassStr = vertex.cssClasses.join(' ');

sidharthv96 · 2023-06-26T16:46:23Z

packages/mermaid/src/diagrams/class/classRenderer-v2.ts

-    if (parent) {
-      g.setParent(vertex.id, parent);
-    }
+      const styles = { labelStyle: '', style: '' }; //getStylesFromArray(vertex.styles);


This is not modified afterwards. Bug?

sidharthv96 · 2023-06-26T16:46:43Z

packages/mermaid/src/diagrams/class/classRenderer-v2.ts

+        tooltip: diagObj.db.getTooltip(vertex.id, parent) || '',
+        haveCallback: vertex.haveCallback,
+        link: vertex.link,
+        width: vertex.type === 'group' ? 500 : undefined,


Avoid magic number 500

tomperr · 2023-06-26T20:47:57Z

@sidharthv96 seems like there is a bug on this PR, the only thing I added in classRenderer-v2.ts was the filter before the foreach loop

tomperr · 2023-06-26T20:51:01Z

There might be some lines of code in this file that need to be reworked, but I don't think this should be done in this PR (as it is not linked to the issue + I am not the author of the code you commented)

fix(class): keep members in namespace classes

61e5dbe

github-actions bot added the fix label Jun 24, 2023

sidharthv96 requested changes Jun 26, 2023

View reviewed changes

Cleanup

47db1a3

sidharthv96 merged commit 562910e into mermaid-js:develop Jun 29, 2023

tomperr deleted the fix/4519-namespace-lose-members branch June 29, 2023 06:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(class): keep members in namespace classes #4532

fix(class): keep members in namespace classes #4532

tomperr commented Jun 24, 2023

codecov-commenter commented Jun 24, 2023 •

edited

Loading

sidharthv96 Jun 26, 2023

sidharthv96 Jun 26, 2023

sidharthv96 Jun 26, 2023

tomperr commented Jun 26, 2023

tomperr commented Jun 26, 2023

fix(class): keep members in namespace classes #4532

fix(class): keep members in namespace classes #4532

Conversation

tomperr commented Jun 24, 2023

📑 Summary

📏 Design Decisions

📋 Tasks

codecov-commenter commented Jun 24, 2023 • edited Loading

Codecov Report

sidharthv96 Jun 26, 2023

Choose a reason for hiding this comment

sidharthv96 Jun 26, 2023

Choose a reason for hiding this comment

sidharthv96 Jun 26, 2023

Choose a reason for hiding this comment

tomperr commented Jun 26, 2023

tomperr commented Jun 26, 2023

codecov-commenter commented Jun 24, 2023 •

edited

Loading