JBPM-8263 - Handle missing SVG image (#1306)

kiegroup · Feb 28, 2019 · e41ebbe · e41ebbe
1 parent c32dd32
commit e41ebbe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/...t/src/main/java/org/jbpm/workbench/pr/client/editors/diagram/ProcessDiagramPresenter.java b/...t/src/main/java/org/jbpm/workbench/pr/client/editors/diagram/ProcessDiagramPresenter.java
@@ -64,7 +64,7 @@ public void displayImage(final String svgContent, final String containerId) {
     }
 
     public void expandDiagramContainer() {
-        view.expandDiagramContanier();
+        view.expandDiagramContainer();
     }
 
     @WorkbenchPartTitle

diff --git a/.../src/main/java/org/jbpm/workbench/pr/client/editors/diagram/ProcessDiagramWidgetView.java b/.../src/main/java/org/jbpm/workbench/pr/client/editors/diagram/ProcessDiagramWidgetView.java
@@ -23,7 +23,7 @@
 public interface ProcessDiagramWidgetView extends HasBusyIndicator,
                                                   IsWidget {
 
-    void expandDiagramContanier();
+    void expandDiagramContainer();
 
     void displayImage(String svgContent);
 

diff --git a/.../main/java/org/jbpm/workbench/pr/client/editors/diagram/ProcessDiagramWidgetViewImpl.java b/.../main/java/org/jbpm/workbench/pr/client/editors/diagram/ProcessDiagramWidgetViewImpl.java
@@ -187,7 +187,7 @@ public void hideBusyIndicator() {
     }
 
     @Override
-    public void expandDiagramContanier() {
+    public void expandDiagramContainer() {
         diagramContainerDiv.classList.remove("col-md-10");
         diagramContainerDiv.classList.add("col-md-12");
     }

diff --git a/...org/jbpm/workbench/pr/client/editors/instance/diagram/ProcessInstanceDiagramViewImpl.java b/...org/jbpm/workbench/pr/client/editors/instance/diagram/ProcessInstanceDiagramViewImpl.java
@@ -148,7 +148,7 @@ public void onProcessNodeChange(@ForEvent("change") Event e) {
     public void hideNodeActions() {
         nodeActionsPanel.classList.remove("col-md-2");
         nodeActionsPanel.classList.add("hidden");
-        diagram.expandDiagramContanier();
+        diagram.expandDiagramContainer();
     }
 
     @Override
@@ -181,7 +181,13 @@ protected void renderBadges() {
 
         final D3 d3 = D3.Builder.get();
 
-        final D3 svg = d3.select("#processDiagramDiv svg");
+        final D3.Selection svg = d3.select("#processDiagramDiv svg");
+
+        if(svg.empty()){
+            //Couldn't find SVG element
+            return;
+        }
+
         final D3.DOMRect svgRect = svg.node().getBoundingClientRect();
         if(svgRect.getWidth() == 0 && svgRect.getHeight() == 0){
             //SVG not visible