feat(analytics) : handle deleted api/application analytics

This closes gravitee-io/issues#312
gravitee-io · Nov 21, 2016 · 62a92b9 · 62a92b9
1 parent 7ec74b3
commit 62a92b9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/src/app/api/admin/analytics/analytics.controller.js b/src/app/api/admin/analytics/analytics.controller.js
@@ -178,9 +178,10 @@ class ApiAnalyticsController {
     } else {
       this.ApplicationService.get(id).then(response => {
         _this.cache[id] = response.data;
+        _this.cache[id].exists = true;
         deferred.resolve(this.cache[id]);
       }).catch(function() {
-        _this.cache[id] = { 'name' : id };
+        _this.cache[id] = { 'name' : id, 'exists' : false };
         deferred.resolve(_this.cache[id]);
       });
     }

diff --git a/src/app/api/admin/analytics/analyticsApplicationModel.html b/src/app/api/admin/analytics/analyticsApplicationModel.html
@@ -15,9 +15,8 @@
     limitations under the License.
 
 -->
-<span ng-if="entity.name">
-  {{entity.name}}
-</span>
-<span ng-if="!entity.name">
-  {{id}}
+<span ng-if="entity.exists">{{entity.name}}</span>
+
+<span ng-if="!entity.exists" style="color: grey;">
+  Deleted application
 </span>
diff --git a/src/app/application/details/analytics/analytics.controller.js b/src/app/application/details/analytics/analytics.controller.js
@@ -175,9 +175,10 @@ class ApplicationAnalyticsController {
     } else {
       this.ApiService.get(id).then(response => {
         _this.cache[id] = response.data;
+        _this.cache[id].exists = true;
         deferred.resolve(this.cache[id]);
       }).catch(function() {
-        _this.cache[id] = { 'name' : id, 'version' : 'N/A' };
+        _this.cache[id] = { 'name' : id, 'exists' : false };
         deferred.resolve(_this.cache[id]);
       });
     }

diff --git a/src/app/application/details/analytics/analyticsAPIModel.html b/src/app/application/details/analytics/analyticsAPIModel.html
@@ -15,9 +15,10 @@
     limitations under the License.
 
 -->
-<span ng-if="entity.name">
+<span ng-if="entity.exists">
   {{entity.name}} <small>({{entity.version}})</small>
 </span>
-<span ng-if="!entity.name">
-  {{id}}
+
+<span ng-if="!entity.exists" style="color: grey;">
+  Deleted API
 </span>
diff --git a/src/app/platform/dashboard/dashboardModel.html b/src/app/platform/dashboard/dashboardModel.html
@@ -19,6 +19,14 @@
   <a ng-if="entity.exists" ui-sref="apis.admin.analytics({ apiId: entity.id } )">
     {{entity.name}} <small ng-if="model === 'api'">({{entity.version}})</small>
   </a>
-  <span ng-if="!entity.exists" style="color: grey;">{{entity.name}}</span>
+  <span ng-if="!entity.exists" style="color: grey;">
+    Deleted API
+  </span>
+</span>
+
+<span ng-if="entity && model === 'application'">
+  <span ng-if="entity.exists">{{entity.name}}</span>
+  <span ng-if="!entity.exists" style="color: grey;" layout="row">
+    Deleted application
+  </span>
 </span>
-<span ng-if="entity && model === 'application'" ng-style="!entity.exists && {'color':'grey'}">{{entity.name}}</span>