HAWKULAR-676 - the graph wasn't working properly if the controls were…

… hidden by ng-hide because of the spinner
hawkular · Oct 19, 2015 · eef131a · eef131a
1 parent 270f44f
commit eef131a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 34 deletions.
diff --git a/console/src/main/scripts/plugins/topology/html/index.html b/console/src/main/scripts/plugins/topology/html/index.html
@@ -1,10 +1,10 @@
 <div class="hk-application-servers" data-ng-controller="HawkularTopology.TopologyController as vm">
 
-  <div class="text-center hk-urls-list hk-spinner-container" ng-hide="vm.data.relations.length">
+  <div class="text-center hk-urls-list hk-spinner-container hawkular-topology-spinner" ng-hide="vm.data.relations.length">
     <div class="spinner spinner-lg"></div>
     <p class="hk-spinner-legend-below">Loading...</p>
   </div>
-  <div ng-show="vm.data.relations.length" ng-class="{'hk-fade-in': vm.data.relations.length}">
+  <div ng-class="{'hk-fade-in': vm.data.relations.length}">
 
     <hawkular-topology-graph items="vm.data.items" relations="vm.data.relations" kinds="vm.kinds">
     </hawkular-topology-graph>

diff --git a/console/src/main/scripts/plugins/topology/less/priority01Topology.less b/console/src/main/scripts/plugins/topology/less/priority01Topology.less
@@ -144,6 +144,11 @@ hawkular-topology-icon:hover use {
     opacity: 0.7;
 }
 
+.hawkular-topology-spinner {
+  position: absolute;
+  left: 50%;
+}
+
 .iconWithLabel {
   > hawkular-topology-icon {
     float: left;

diff --git a/console/src/main/scripts/plugins/topology/ts/topologyPlugin.ts b/console/src/main/scripts/plugins/topology/ts/topologyPlugin.ts
@@ -132,44 +132,45 @@ module HawkularTopology {
       };
       let extractServerId = (id: string): string => id.substring(0, id.indexOf('/')) + '~';
 
-      this.HawkularInventory.Feed.query({environmentId:globalEnvironmentId},
-        (aFeedList) => {
-          let promises = [];
-          angular.forEach(aFeedList, (feed) => {
-            promises.push(this.getDataForOneFeed(feed.id));
-          });
-          this.$q.all(promises).then((aResourceList) => {
-            let newRelations = [];
-            let newData = {
-              items: {},
-              relations: {}
+      this.HawkularInventory.Feed.query({environmentId:globalEnvironmentId}, (aFeedList) => {
+        if (!aFeedList.length) {
+          return;
+        }
+        let promises = [];
+        angular.forEach(aFeedList, (feed) => {
+          promises.push(this.getDataForOneFeed(feed.id));
+        });
+        this.$q.all(promises).then((aResourceList) => {
+          let newRelations = [];
+          let newData = {
+            items: {},
+            relations: {}
+          };
+          let flatResources = _.flatten(aResourceList, true);
+          angular.forEach(flatResources, (res) => {
+            let newItem = {
+              kind: typeToKind[res.type.id],
+              id: res.id,
+              metadata: {
+                name: res.properties.name
+              }
             };
-            let flatResources = _.flatten(aResourceList, true);
-            angular.forEach(flatResources, (res) => {
-              let newItem = {
-                kind: typeToKind[res.type.id],
-                id: res.id,
-                metadata: {
-                  name: res.properties.name
-                }
-              };
-              if (newItem.kind !== 'Server') {
-                newRelations.push({
-                  source: extractServerId(res.id),
-                  target: res.id
-                });
-              } else {
+            if (newItem.kind !== 'Server') {
+              newRelations.push({
+                source: extractServerId(res.id),
+                target: res.id
+              });
+            } else {
                 // todo: feed id
                 this.getServerMetadata('localhost', res.id, newItem);
               }
               newData.items[res.id] = newItem;
             });
-            newData.relations = newRelations;
-            this.data = newData;
-          });
-});
-}
-
+          newData.relations = newRelations;
+          this.data = newData;
+        });
+      });
+    }
   }
 
   _module.controller('HawkularTopology.TopologyController', TopologyController);