commit 9b460043a7ecdac1ed1aee33a10d247bac4820bd
author Matteo Scandolo <matteo.scandolo@gmail.com> Fri Apr 14 16:24:45 2017 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Mon Apr 17 19:30:14 2017 -0700
tree ddd3667560e10cddc9374672f3b4f84de27f3f06
parent c817849d2fa67b84556ff0040529eaad34f745cc

[CORD-1117] XOS GUI Various fix

Change-Id: I4237a5e23509e9173c958d76aa929a70583ba1e6

src/app/service-graph/components/coarse/coarse.component.ts

diff --git a/src/app/service-graph/components/coarse/coarse.component.ts b/src/app/service-graph/components/coarse/coarse.component.ts
index d02bb23..c7a7ac5 100644
--- a/src/app/service-graph/components/coarse/coarse.component.ts
+++ b/src/app/service-graph/components/coarse/coarse.component.ts
@@ -80,6 +80,9 @@
   }
 
   private _renderGraph() {
+    if (!angular.isDefined(this.graph) || !angular.isDefined(this.graph.nodes) || !angular.isDefined(this.graph.links)) {
+      return;
+    }
     this.addNodeLinksToForceLayout(this.graph);
     this.renderNodes(this.graph.nodes);
     this.renderLinks(this.graph.links);
@@ -87,8 +90,8 @@
 
   private getSvgDimensions(): {width: number, heigth: number} {
     return {
-      width: $('xos-coarse-tenancy-graph svg').width(),
-      heigth: $('xos-coarse-tenancy-graph svg').height()
+      width: $('xos-coarse-tenancy-graph svg').width() || 0,
+      heigth: $('xos-coarse-tenancy-graph svg').height() || 0
     };
   }
 

src/app/service-graph/components/fine-grained/fine-grained.component.ts

diff --git a/src/app/service-graph/components/fine-grained/fine-grained.component.ts b/src/app/service-graph/components/fine-grained/fine-grained.component.ts
index 64955ae..d0aea83 100644
--- a/src/app/service-graph/components/fine-grained/fine-grained.component.ts
+++ b/src/app/service-graph/components/fine-grained/fine-grained.component.ts
@@ -83,6 +83,9 @@
   }
 
   private _renderGraph() {
+    if (!angular.isDefined(this.graph) || !angular.isDefined(this.graph.nodes) || !angular.isDefined(this.graph.links)) {
+      return;
+    }
     this.addNodeLinksToForceLayout(this.graph);
     this.renderNodes(this.graph.nodes);
     this.renderLinks(this.graph.links);