Rename AddUrl page and controller to UrlList

hawkular · Jul 10, 2015 · aa454b7 · aa454b7
1 parent 1339bac
commit aa454b7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/...scripts/plugins/metrics/html/add-url.html → ...cripts/plugins/metrics/html/url-list.html b/...scripts/plugins/metrics/html/add-url.html → ...cripts/plugins/metrics/html/url-list.html
@@ -1,4 +1,4 @@
-<div ng-controller="HawkularMetrics.AddUrlController as vm">
+<div ng-controller="HawkularMetrics.UrlListController as vm">
   <div class="text-center hk-urls-list hk-spinner-container" ng-hide="vm.resourceList">
     <div class="spinner spinner-lg"></div>
     <p class="hk-spinner-legend-below">Loading...</p>

diff --git a/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts b/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
@@ -89,7 +89,7 @@ module HawkularMetrics {
           }
         }
       }).
-      when('/hawkular-ui/url/url-list', {templateUrl: 'plugins/metrics/html/add-url.html'}).
+      when('/hawkular-ui/url/url-list', {templateUrl: 'plugins/metrics/html/url-list.html'}).
       when('/hawkular-ui/url/response-time/:resourceId/:timeOffset?/:endTime?', {
         templateUrl: 'plugins/metrics/html/response-time.html',
         reloadOnSearch: false,

diff --git a/.../scripts/plugins/metrics/ts/addUrlPage.ts → ...ain/scripts/plugins/metrics/ts/urlList.ts b/.../scripts/plugins/metrics/ts/addUrlPage.ts → ...ain/scripts/plugins/metrics/ts/urlList.ts
@@ -24,7 +24,7 @@
 module HawkularMetrics {
 
 
-  export class AddUrlController {
+  export class UrlListController {
     /// this is for minification purposes
     public static $inject = ['$location', '$scope', '$rootScope', '$interval', '$log', '$filter', '$modal',
       'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager','HawkularErrorManager', '$q',
@@ -183,8 +183,8 @@ module HawkularMetrics {
             // get things
           }
         }
-        var expanded = this.resourceList ? this.resourceList.expanded : [];
-        aResourceList.expanded = expanded;
+
+        aResourceList.expanded = this.resourceList ? this.resourceList.expanded : [];
         this.HawkularAlert.Alert.query({statuses:'OPEN'}, (anAlertList) => {
           this.alertList = anAlertList;
         }, this);
@@ -193,7 +193,6 @@ module HawkularMetrics {
           promises.push(this.HawkularMetric.GaugeMetricData(tenantId).queryMetrics({
             resourceId: res.id, gaugeId: (res.id + '.status.duration'),
             start: moment().subtract(1, 'hours').valueOf(), end: moment().valueOf()}, (resource) => {
-            // FIXME: Work data so it works for chart ?
             res['responseTime'] = resource;
           }).$promise);
           promises.push(this.HawkularMetric.AvailabilityMetricData(tenantId).query({
@@ -213,23 +212,13 @@ module HawkularMetrics {
           }).$promise);
           this.lastUpdateTimestamp = new Date();
         }, this);
-        this.$q.all(promises).then((result) => {
+        this.$q.all(promises).then(() => {
           this.resourceList = aResourceList;
         });
 
       });
     }
 
-    public getAverage(data:any, field:string):number {
-      if (data) {
-        var sum = 0;
-        for (var i = 0; i < data.length; i++) {
-          sum += parseInt(data[i][field], 10);
-        }
-        return Math.round(sum / data.length);
-      }
-    }
-
     public deleteResource(resource:any):any {
       this.$modal.open({
         templateUrl: 'plugins/metrics/html/modals/delete-resource.html',
@@ -293,6 +282,6 @@ module HawkularMetrics {
     }
 
   }
-  _module.controller('HawkularMetrics.AddUrlController', AddUrlController);
+  _module.controller('HawkularMetrics.UrlListController', UrlListController);
 
 }