Refactor things that came up in code review.

hawkular · Jul 9, 2015 · 78fffd9 · 78fffd9
1 parent 03868a1
commit 78fffd9
Show file tree

Hide file tree

Showing 14 changed files with 164 additions and 176 deletions.
diff --git a/console/src/main/scripts/plugins/metrics/ts/addUrlPage.ts b/console/src/main/scripts/plugins/metrics/ts/addUrlPage.ts
@@ -29,14 +29,15 @@ module HawkularMetrics {
       'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager','HawkularErrorManager', '$q',
       'md5', 'HkHeaderParser'];
 
+    private autoRefreshPromise:ng.IPromise<number>;
     private httpUriPart = 'http://';
-    public addProgress: boolean = false;
     private resourceList;
-    public alertList;
-    public lastUpdateTimestamp:Date = new Date();
     private resPerPage = 5;
     public resCurPage = 0;
+    public alertList;
+    public lastUpdateTimestamp:Date = new Date();
     public headerLinks = {};
+    public addProgress: boolean = false;
 
     constructor(private $location:ng.ILocationService,
                 private $scope:any,
@@ -68,15 +69,9 @@ module HawkularMetrics {
 
       this.autoRefresh(20);
     }
-    private autoRefreshPromise:ng.IPromise<number>;
 
 
-    cancelAutoRefresh():void {
-      this.$interval.cancel(this.autoRefreshPromise);
-      toastr.info('Canceling Auto Refresh');
-    }
-
-    autoRefresh(intervalInSeconds:number):void {
+    public autoRefresh(intervalInSeconds:number):void {
       this.autoRefreshPromise = this.$interval(()  => {
         this.getResourceList();
       }, intervalInSeconds * 1000);
@@ -86,7 +81,7 @@ module HawkularMetrics {
       });
     }
 
-    addUrl(url:string):void {
+    public addUrl(url:string):void {
       this.addProgress = true;
 
       var resourceId = this.md5.createHash(url || '');
@@ -171,7 +166,7 @@ module HawkularMetrics {
         });
     }
 
-    getResourceList(currentTenantId?: TenantId):any {
+    public getResourceList(currentTenantId?: TenantId):any {
       var tenantId:TenantId = currentTenantId || this.$rootScope.currentPersona.id;
       this.HawkularInventory.ResourceOfType.query(
           {resourceTypeId: 'URL', per_page: this.resPerPage, page: this.resCurPage},
@@ -222,7 +217,7 @@ module HawkularMetrics {
       });
     }
 
-    getAverage(data:any, field:string):number {
+    public getAverage(data:any, field:string):number {
       if (data) {
         var sum = 0;
         for (var i = 0; i < data.length; i++) {
@@ -232,7 +227,7 @@ module HawkularMetrics {
       }
     }
 
-    deleteResource(resource:any):any {
+    public deleteResource(resource:any):any {
       this.$modal.open({
         templateUrl: 'plugins/metrics/html/modals/delete-resource.html',
         controller: DeleteResourceModalController,
@@ -242,7 +237,7 @@ module HawkularMetrics {
       }).result.then(result => this.getResourceList());
     }
 
-    setPage(page:number):void {
+    public setPage(page:number):void {
       this.resCurPage = page;
       this.getResourceList();
     }
@@ -289,7 +284,7 @@ module HawkularMetrics {
       });
     }
 
-    cancel() {
+    public cancel() {
       this.$modalInstance.dismiss('cancel');
     }
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/alertsManager.ts b/console/src/main/scripts/plugins/metrics/ts/alertsManager.ts
@@ -130,14 +130,14 @@ module HawkularMetrics {
       return this.HawkularAlert.Trigger.put({triggerId: triggerId}, data).$promise;
     }
 
-    getAction(email: string): ng.IPromise<void> {
+    public getAction(email: string): ng.IPromise<void> {
       return this.HawkularAlert.Action.get({
         pluginId: 'email',
         actionId: email
       }).$promise;
     }
 
-    createAction(email: string): ng.IPromise<void> {
+    public createAction(email: string): ng.IPromise<void> {
       return this.HawkularAlert.Action.save({
         actionPlugin: 'email',
         actionId: email,
@@ -146,7 +146,7 @@ module HawkularMetrics {
       }).$promise;
     }
 
-    addEmailAction(email: string): ng.IPromise<void> {
+    public addEmailAction(email: string): ng.IPromise<void> {
       return this.getAction(email).then((promiseValue: any) => {
         return promiseValue;
       }, (reason: any) => {
@@ -158,7 +158,7 @@ module HawkularMetrics {
       });
     }
 
-    updateAction(email: string): ng.IPromise<void> {
+    public updateAction(email: string): ng.IPromise<void> {
       return this.HawkularAlert.Action.put({
         actionPlugin: 'email',
         actionId: email,
@@ -167,15 +167,15 @@ module HawkularMetrics {
       }).$promise;
     }
 
-    createCondition(triggerId: string, condition: any): ng.IPromise<void> {
+    public createCondition(triggerId: string, condition: any): ng.IPromise<void> {
       return this.HawkularAlert.Condition.save({triggerId: triggerId}, condition).$promise;
     }
 
-    updateCondition(triggerId: string, conditionId: string, condition: any): ng.IPromise<void> {
+    public updateCondition(triggerId: string, conditionId: string, condition: any): ng.IPromise<void> {
       return this.HawkularAlert.Condition.put({triggerId: triggerId, conditionId: conditionId}, condition).$promise;
     }
 
-    createDampening(triggerId: string, duration: number, triggerMode?: string): ng.IPromise<void> {
+    public createDampening(triggerId: string, duration: number, triggerMode?: string): ng.IPromise<void> {
       return this.HawkularAlert.Dampening.save({ triggerId: triggerId }, {
         triggerId: triggerId,
         evalTimeSetting: duration,
@@ -184,20 +184,20 @@ module HawkularMetrics {
       }).$promise;
     }
 
-    updateDampening(triggerId: string, dampeningId: string, dampening: any): ng.IPromise<void> {
+    public updateDampening(triggerId: string, dampeningId: string, dampening: any): ng.IPromise<void> {
       dampening.dampeningId = dampeningId;
       return this.HawkularAlert.Dampening.put({ triggerId: triggerId, dampeningId: dampeningId }, dampening).$promise;
     }
 
-    getActions(triggerId:string): ng.IPromise<void> {
+    public getActions(triggerId:string): ng.IPromise<void> {
       return undefined;
     }
 
-    getTrigger(triggerId: string): ng.IPromise<void> {
+    public getTrigger(triggerId: string): ng.IPromise<void> {
       return this.HawkularAlert.Trigger.get({ triggerId: triggerId }).$promise;
     }
 
-    setEmail(triggerId:string, email:string):ng.IPromise<void> {
+    public setEmail(triggerId:string, email:string):ng.IPromise<void> {
       var actions = this.getActions(triggerId);
       return actions.then((actions)=> {
 
@@ -219,15 +219,16 @@ module HawkularMetrics {
       });
     }
 
-    setResponseTime(triggerId:string, treshold:number, duration:number, enabled:boolean):ng.IPromise<void> {
+    public setResponseTime(triggerId:string, treshold:number, duration:number, enabled:boolean):ng.IPromise<void> {
       return undefined;
     }
 
-    setDowntime(triggerId:string, duration:number, enabled:boolean):ng.IPromise<void> {
+    public setDowntime(triggerId:string, duration:number, enabled:boolean):ng.IPromise<void> {
       return undefined;
     }
 
-    queryConsoleAlerts(metricId: string, startTime?:TimestampInMillis, endTime?:TimestampInMillis, alertType?:AlertType,
+    public queryConsoleAlerts(metricId: MetricId, startTime?:TimestampInMillis,
+                              endTime?:TimestampInMillis, alertType?:AlertType,
                        currentPage?:number, perPage?:number): any {
       var alertList = [];
       var headers;

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDatasourcesDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDatasourcesDetails.ts
@@ -33,6 +33,7 @@ module HawkularMetrics {
     public static WAIT_COLOR = '#d5d026'; /// yellow
     public static CREATION_COLOR = '#95489c'; /// purple
 
+    private autoRefreshPromise: ng.IPromise<number>;
     private resourceList;
     private expandedList;
     public alertList;
@@ -66,14 +67,26 @@ module HawkularMetrics {
       this.autoRefresh(20);
     }
 
-    private autoRefreshPromise: ng.IPromise<number>;
 
-    cancelAutoRefresh(): void {
-      this.$interval.cancel(this.autoRefreshPromise);
-      toastr.info('Canceling Auto Refresh');
+    private formatBucketedChartOutput(response):IChartDataPoint[] {
+      //  The schema is different for bucketed output
+      return _.map(response, (point:IChartDataPoint) => {
+        return {
+          timestamp: point.start,
+          date: new Date(point.start),
+          value: !angular.isNumber(point.value) ? 0 : point.value,
+          avg: (point.empty) ? 0 : point.avg,
+          min: !angular.isNumber(point.min) ? 0 : point.min,
+          max: !angular.isNumber(point.max) ? 0 : point.max,
+          percentile95th: !angular.isNumber(point.percentile95th) ? 0 : point.percentile95th,
+          median: !angular.isNumber(point.median) ? 0 : point.median,
+          empty: point.empty
+        };
+      });
     }
 
-    autoRefresh(intervalInSeconds: number): void {
+
+    public autoRefresh(intervalInSeconds: number): void {
       this.autoRefreshPromise = this.$interval(() => {
         this.getDatasources();
       }, intervalInSeconds * 1000);
@@ -83,7 +96,7 @@ module HawkularMetrics {
       });
     }
 
-    getDatasources(currentTenantId?: TenantId): any {
+    public getDatasources(currentTenantId?: TenantId): any {
       this.alertList = []; // FIXME: when we have alerts for app server
       this.endTimeStamp = this.$routeParams.endTime || +moment();
       this.startTimeStamp = this.endTimeStamp - (this.$routeParams.timeOffset || 3600000);
@@ -121,7 +134,7 @@ module HawkularMetrics {
       });
     }
 
-    getDatasourceChartData(currentTenantId?: TenantId): any {
+    public getDatasourceChartData(currentTenantId?: TenantId): any {
       this.endTimeStamp = this.$routeParams.endTime || +moment();
       this.startTimeStamp = this.endTimeStamp - (this.$routeParams.timeOffset || 3600000);
 
@@ -177,22 +190,7 @@ module HawkularMetrics {
 
     }
 
-    private formatBucketedChartOutput(response):IChartDataPoint[] {
-      //  The schema is different for bucketed output
-      return _.map(response, (point:IChartDataPoint) => {
-        return {
-          timestamp: point.start,
-          date: new Date(point.start),
-          value: !angular.isNumber(point.value) ? 0 : point.value,
-          avg: (point.empty) ? 0 : point.avg,
-          min: !angular.isNumber(point.min) ? 0 : point.min,
-          max: !angular.isNumber(point.max) ? 0 : point.max,
-          percentile95th: !angular.isNumber(point.percentile95th) ? 0 : point.percentile95th,
-          median: !angular.isNumber(point.median) ? 0 : point.median,
-          empty: point.empty
-        };
-      });
-    }
+
 
 
 

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts
@@ -27,6 +27,7 @@ module HawkularMetrics {
       '$modal', 'HawkularInventory', 'HawkularMetric', 'HawkularAlert', 'HawkularAlertsManager', 'HawkularErrorManager',
       '$q', 'md5'];
 
+    private autoRefreshPromise: ng.IPromise<number>;
     private resourceList;
     private metricsList;
     public alertList;
@@ -65,14 +66,9 @@ module HawkularMetrics {
         this.autoRefresh(20);
     }
 
-    private autoRefreshPromise: ng.IPromise<number>;
 
-    cancelAutoRefresh(): void {
-      this.$interval.cancel(this.autoRefreshPromise);
-      toastr.info('Canceling Auto Refresh');
-    }
 
-    autoRefresh(intervalInSeconds: number): void {
+    public autoRefresh(intervalInSeconds: number): void {
       this.autoRefreshPromise = this.$interval(() => {
         this.getResourceList();
       }, intervalInSeconds * 1000);
@@ -82,7 +78,7 @@ module HawkularMetrics {
       });
     }
 
-    getResourceList(currentTenantId?: TenantId): any {
+    public getResourceList(currentTenantId?: TenantId): any {
       this.alertList = []; // FIXME: when we have alerts for app server
       var tenantId:TenantId = currentTenantId || this.$rootScope.currentPersona.id;
       this.HawkularInventory.ResourceOfType.query({resourceTypeId: 'Deployment'},

diff --git a/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts b/console/src/main/scripts/plugins/metrics/ts/app-details/appServerJvmDetails.ts
@@ -80,12 +80,26 @@ module HawkularMetrics {
 
     private autoRefreshPromise: ng.IPromise<number>;
 
-    cancelAutoRefresh(): void {
-      this.$interval.cancel(this.autoRefreshPromise);
-      toastr.info('Canceling Auto Refresh');
+    private formatBucketedChartOutput(response):IChartDataPoint[] {
+      function convertBytesToMegaBytes(bytes:number):number { return bytes / 1024 / 1024; }
+
+      //  The schema is different for bucketed output
+      return _.map(response, (point:IChartDataPoint) => {
+        return {
+          timestamp: point.start,
+          date: new Date(point.start),
+          value: !angular.isNumber(point.value) ? 0 : point.value,
+          avg: (point.empty) ? 0 : convertBytesToMegaBytes(point.avg),
+          min: !angular.isNumber(point.min) ? 0 : point.min,
+          max: !angular.isNumber(point.max) ? 0 : point.max,
+          percentile95th: !angular.isNumber(point.percentile95th) ? 0 : point.percentile95th,
+          median: !angular.isNumber(point.median) ? 0 : point.median,
+          empty: point.empty
+        };
+      });
     }
 
-    autoRefresh(intervalInSeconds: number): void {
+    public autoRefresh(intervalInSeconds: number): void {
       this.autoRefreshPromise = this.$interval(() => {
         this.getJvmData();
         this.getJvmChartData();
@@ -96,7 +110,7 @@ module HawkularMetrics {
       });
     }
 
-    getJvmData(currentTenantId?: TenantId): any {
+    public getJvmData(currentTenantId?: TenantId): any {
       this.alertList = []; // FIXME: when we have alerts for app server
       this.endTimeStamp = this.$routeParams.endTime || +moment();
       this.startTimeStamp = this.endTimeStamp - (this.$routeParams.timeOffset || 3600000);
@@ -119,7 +133,7 @@ module HawkularMetrics {
       this.getJvmChartData(currentTenantId);
     }
 
-    getJvmChartData(currentTenantId?: TenantId): any {
+    public getJvmChartData(currentTenantId?: TenantId): any {
 
       this.endTimeStamp = this.$routeParams.endTime || +moment();
       this.startTimeStamp = this.endTimeStamp - (this.$routeParams.timeOffset || 3600000);
@@ -164,24 +178,7 @@ module HawkularMetrics {
     }
 
 
-    private formatBucketedChartOutput(response):IChartDataPoint[] {
-      function convertBytesToMegaBytes(bytes:number):number { return bytes / 1024 / 1024; }
 
-      //  The schema is different for bucketed output
-      return _.map(response, (point:IChartDataPoint) => {
-        return {
-          timestamp: point.start,
-          date: new Date(point.start),
-          value: !angular.isNumber(point.value) ? 0 : point.value,
-          avg: (point.empty) ? 0 : convertBytesToMegaBytes(point.avg),
-          min: !angular.isNumber(point.min) ? 0 : point.min,
-          max: !angular.isNumber(point.max) ? 0 : point.max,
-          percentile95th: !angular.isNumber(point.percentile95th) ? 0 : point.percentile95th,
-          median: !angular.isNumber(point.median) ? 0 : point.median,
-          empty: point.empty
-        };
-      });
-    }
 
   }