Merge pull request #645 from Jiri-Kremser/HAWKULAR-788

HAWKULAR-788 - Topology view keeps showing the waiting spinner when no resource.
hawkular · Nov 11, 2015 · 95e0e3b · 95e0e3b
2 parents a760271 + 141fafe
commit 95e0e3b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/console/src/main/scripts/plugins/directives/topbar/html/topbar.html b/console/src/main/scripts/plugins/directives/topbar/html/topbar.html
@@ -8,7 +8,7 @@
   <li ng-class="getClass('/hawkular-ui/app/')">
     <a href="/hawkular-ui/app/app-list">Application Servers</a>
   </li>
-  <li ng-class="getClass('/hawkular-ui/topology/')" ng-show="$root.isExperimental">
+  <li ng-class="getClass('/hawkular-ui/topology/')">
     <a href="/hawkular-ui/topology/view">Topology</a>
   </li>
 </ul>
diff --git a/console/src/main/scripts/plugins/topology/html/index.html b/console/src/main/scripts/plugins/topology/html/index.html
@@ -1,9 +1,16 @@
 <div class="hk-application-servers" data-ng-controller="HawkularTopology.TopologyController as vm">
 
-  <div class="text-center hk-urls-list hk-spinner-container hawkular-topology-spinner" 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 || !vm.requestPending">
     <div class="spinner spinner-lg"></div>
     <p class="hk-spinner-legend-below">Loading...</p>
   </div>
+
+  <div class="text-center hk-urls-list hk-spinner-container hawkular-topology-spinner"
+    ng-hide="vm.data.relations.length || vm.requestPending">
+    <p class="hk-spinner-legend-below">No Data</p>
+  </div>
+
   <div ng-class="{'hk-fade-in': vm.data.relations.length}">
 
     <hawkular-topology-graph items="vm.data.items" relations="vm.data.relations" kinds="vm.kinds">

diff --git a/console/src/main/scripts/plugins/topology/ts/topologyPlugin.ts b/console/src/main/scripts/plugins/topology/ts/topologyPlugin.ts
@@ -32,6 +32,7 @@ module HawkularTopology {
 
   export class TopologyController {
     private data: any;
+    private requestPending: boolean;
     private index = 0;
     private kinds: any;
     private autoRefreshPromise: ng.IPromise<any>;
@@ -113,6 +114,7 @@ module HawkularTopology {
     }
 
     public getData(): any {
+      this.requestPending = true;
       let typeToKind = {
         'WildFly Server': 'Server',
         'Datasource': 'DataSource',
@@ -122,6 +124,7 @@ module HawkularTopology {
 
       this.HawkularInventory.Feed.query({environmentId:globalEnvironmentId}, (aFeedList) => {
         if (!aFeedList.length) {
+          this.requestPending = false;
           return;
         }
         let promises = [];
@@ -135,6 +138,10 @@ module HawkularTopology {
             relations: {}
           };
           let flatResources = _.flatten(aResourceList, true);
+          if (!flatResources.length) {
+            this.requestPending = false;
+            return;
+          }
           angular.forEach(flatResources, (res) => {
             let newItem = {
               kind: typeToKind[res.type.id],
@@ -156,6 +163,7 @@ module HawkularTopology {
             });
           newData.relations = newRelations;
           this.data = newData;
+          this.requestPending = false;
         });
       });
     }