Merge pull request #7173 from deutschebank/db-contrib/waltz-7167-diag…

…-fix Diag fix
finos · Oct 18, 2024 · 89e1759 · 89e1759
2 parents db98073 + c22116a
commit 89e1759
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/waltz-ng/client/common/hierarchy-utils.js b/waltz-ng/client/common/hierarchy-utils.js
@@ -182,7 +182,7 @@ export function groupHierarchyByKey(tree = [], keyFn = n => n.id, acc = {}) {
 
 
 export function flattenChildren(node, acc = []) {
-    _.forEach(node.children || [], child => {
+    _.forEach(node?.children || [], child => {
         acc.push(child);
         flattenChildren(child, acc);
     });

diff --git a/...tity-diagrams/components/entity-overlay-diagrams/interact-view/DiagramInteractView.svelte b/...tity-diagrams/components/entity-overlay-diagrams/interact-view/DiagramInteractView.svelte
@@ -34,12 +34,12 @@
     }
 
     $: children = $hideEmptyCells && $selectedOverlay
-        ? _.filter(group.children, child => hasData(child, $overlayData))
-        : group.children;
+        ? _.filter(group?.children, child => hasData(child, $overlayData))
+        : group?.children || [];
 
-    $: overlayRequiresTitle = group.data && $selectedOverlay?.showTitle;
+    $: overlayRequiresTitle = group?.data && $selectedOverlay?.showTitle;
 
-    $: cellData = _.get($overlayData, group.id);
+    $: cellData = _.get($overlayData, group?.id);
 
     $: childKinds = _
         .chain(flattenChildren(group))

diff --git a/...ity-diagrams/components/entity-overlay-diagrams/overlays/ApplicationChangesOverlay.svelte b/...ity-diagrams/components/entity-overlay-diagrams/overlays/ApplicationChangesOverlay.svelte
@@ -135,6 +135,7 @@
     <div>
         <svg viewBox={`0 0 ${width} ${height}`}
              bind:this={svgElem}
+             width="100%"
              class:focused={renderMode === RenderModes.FOCUSED}
              style="background: white">
             <g class="app-summary">

diff --git a/...nt/entity-diagrams/components/entity-overlay-diagrams/overlays/assessment/BarGraph.svelte b/...nt/entity-diagrams/components/entity-overlay-diagrams/overlays/assessment/BarGraph.svelte
@@ -36,6 +36,7 @@
 <div>
     {#if renderMode !== RenderModes.FOCUSED}
         <svg viewBox={`0 0 ${width} ${height}`}
+             width="100%"
              style="background: white">
             <g>
                 {#each counts as r}

diff --git a/...nt/entity-diagrams/components/entity-overlay-diagrams/overlays/assessment/BoxGraph.svelte b/...nt/entity-diagrams/components/entity-overlay-diagrams/overlays/assessment/BoxGraph.svelte
@@ -21,6 +21,7 @@
 <div>
     <svg viewBox={`0 0 ${width} ${height}`}
          shape-rendering="crispEdges"
+         width="100%"
          style="background: white">
         <g transform={`translate(${cellPadding} , ${cellPadding})`}>
             {#each rows as row, idx}

diff --git a/...entity-diagrams/components/entity-overlay-diagrams/overlays/cost/RatingCostOverlay.svelte b/...entity-diagrams/components/entity-overlay-diagrams/overlays/cost/RatingCostOverlay.svelte
@@ -48,6 +48,7 @@
 <div>
     <svg class="content"
          viewBox="0 0 {width} {height}"
+         width="100%"
          style={`background: ${cellData?.totalCost ? colorScale(cellData?.totalCost) : "#fff"}`}>
         <g>
             <text x={width / 2}