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.

Sign up for GitHub

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

Jump to bottom

Fixing system diagram styling #587

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Fixing system diagram styling #587

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42c73e9
mermaid behaviour appears to have changed
therealryan Oct 19, 2023
74aa6c3
let's try that again
therealryan Oct 19, 2023
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
25 changes: 16 additions & 9 deletions report/report-ng/projects/report/src/app/system-diagram/system-diagram.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,13 @@ export class SystemDiagramComponent implements OnInit {
}
else {
// edge count hasn't changed, so we can get away with editing styles

// style names have the svg's ID (which is dynamic) as a prefix, so we have to find that first
let markers: HTMLElement[] = (Array.from(this.containerElRef?.nativeElement
.querySelectorAll("marker")) as HTMLElement[])
.filter(marker => marker.id.includes("flowchart-pointEnd"));
let pointEndId = markers.length > 0 ? markers[0].id : "unknown!";

let paths: HTMLElement[] = (Array.from(this.containerElRef?.nativeElement
.querySelectorAll("path")) as HTMLElement[])
.filter(path => path.classList.contains("flowchart-link"));
Expand All @@ -255,42 +262,42 @@ export class SystemDiagramComponent implements OnInit {
&& path.classList.contains("LE-" + edge.to))
.forEach(path => {
if (edge.edge === this.dottedEdge) {
this.dottedEdgeStyle(path);
this.dottedEdgeStyle(path, pointEndId);
}
else if (edge.edge === this.thickEdge) {
this.thickEdgeStyle(path);
this.thickEdgeStyle(path, pointEndId);
}
else if (edge.edge === this.invisibleEdge) {
this.invisibleEdgeStyle(path);
}
else {
this.lineEdgeStyle(path);
this.lineEdgeStyle(path, pointEndId);
}
});
});
}
}
}

private lineEdgeStyle(e: HTMLElement): void {
private lineEdgeStyle(e: HTMLElement, pointEndId: string): void {
this.replaceClass(e, "edge-thickness-", "normal");
this.replaceClass(e, "edge-pattern-", "solid");
this.setAttr(e, "style", "");
this.setAttr(e, "marker-end", "url(#flowchart-pointEnd)");
this.setAttr(e, "marker-end", "url(#" + pointEndId + ")");
}

private thickEdgeStyle(e: HTMLElement): void {
private thickEdgeStyle(e: HTMLElement, pointEndId: string): void {
this.replaceClass(e, "edge-thickness-", "thick");
this.replaceClass(e, "edge-pattern-", "solid");
this.setAttr(e, "style", "");
this.setAttr(e, "marker-end", "url(#flowchart-pointEnd)");
this.setAttr(e, "marker-end", "url(#" + pointEndId + ")");
}

private dottedEdgeStyle(e: HTMLElement): void {
private dottedEdgeStyle(e: HTMLElement, pointEndId: string): void {
this.replaceClass(e, "edge-thickness-", "normal");
this.replaceClass(e, "edge-pattern-", "dotted");
this.setAttr(e, "style", "");
this.setAttr(e, "marker-end", "url(#flowchart-pointEnd)");
this.setAttr(e, "marker-end", "url(#" + pointEndId + ")");
}

private invisibleEdgeStyle(e: HTMLElement): void {
Expand Down
Loading