updated UI

aerogear · Jan 14, 2016 · b90f147 · b90f147
1 parent ef251ec
commit b90f147
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/admin-ui/app/components/app-detail/include/activity.html b/admin-ui/app/components/app-detail/include/activity.html
@@ -38,12 +38,11 @@ <h3>Notification activity</h3>
       <td>{{ metric.$message.alert | limitTo : 15 }}{{ metric.$message.alert.length > 15 ? '&hellip;' : '' }}</td>
       <td>{{ metric.ipAddress }}</td>
       <td>{{ metric.totalReceivers }} receivers / {{ metric.appOpenCounter }} opened</td>
-      <td ng-if="metric.servedVariants < metric.totalVariants">
-        <!--<i class="pficon-running"></i>-->
+      <td ng-if="!metric.$deliveryStatus">
         <span class="pficon spinner spinner-sm spinner-inline"></span>
         Pending...</td>
-      <td ng-if="metric.servedVariants == metric.totalVariants && metric.deliveryFailed != true" class="success"><i class="fa fa-check"></i> Succeeded</td>
-      <td ng-if="metric.servedVariants == metric.totalVariants && metric.deliveryFailed == true" class="danger">
+      <td ng-if="metric.$deliveryStatus && !metric.$deliveryFailed" class="success"><i class="fa fa-check"></i> Succeeded</td>
+      <td ng-if="metric.$deliveryStatus && metric.$deliveryFailed" class="danger">
           <span class="pficon-layered">
             <span class="pficon pficon-error-octagon"></span>
             <span class="pficon pficon-error-exclamation"></span>

diff --git a/admin-ui/app/scripts/endpoints/metricsEndpoint.js b/admin-ui/app/scripts/endpoints/metricsEndpoint.js
@@ -17,10 +17,9 @@ upsServices.factory('metricsEndpoint', function ($resource, $q, apiPrefix) {
       var deferred = $q.defer();
       this.application({id: applicationId, page: pageNo - 1, per_page: perPage, sort:'desc', search: searchString}, function (data, responseHeaders) {
         angular.forEach(data, function (metric) {
-          angular.forEach(metric.variantInformations, function (variant) {
-            if (!variant.deliveryStatus) {
-              metric.deliveryFailed = true;
-            }
+          metric.$deliveryStatus = (metric.servedVariants === metric.totalVariants);
+          metric.$deliveryFailed = metric.variantInformations.some(function( variantMetric ) {
+            return variantMetric.reason;
           });
         });
         deferred.resolve({