HAWKULAR-370 Add new deployment wizard

hawkular · Sep 9, 2015 · cfbcc29 · cfbcc29
1 parent fd6dd5f
commit cfbcc29
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 23 deletions.
diff --git a/console/src/main/scripts/bower.json b/console/src/main/scripts/bower.json
@@ -21,7 +21,7 @@
     "angular-toastr": "1.4.1",
     "ngInfiniteScroll": "1.2.1",
     "bootstrap-select": "1.6",
-    "hawkular-charts": "0.4.15",
+    "hawkular-charts": "0.5.0",
     "hawkular-ui-services": "0.6.7",
     "hawtio-core-navigation": "2.0.51",
     "hawtio-core": "2.0.18",

diff --git a/console/src/main/scripts/plugins/metrics/html/app-details/modals/detail-deployments-add.html b/console/src/main/scripts/plugins/metrics/html/app-details/modals/detail-deployments-add.html
@@ -130,4 +130,4 @@ <h4 class="modal-title">Add Deployment</h4>
 
   </wz-step>
 
-</wizard>
+</wizard>
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
@@ -108,24 +108,26 @@ module HawkularMetrics {
     }
 
 
-    public getResourceList(currentTenantId?:TenantId):void {
-      ///this.alertList = [];  FIXME: when we have alerts for app server
+    public getResourceList(currentTenantId?: TenantId): any {
+      this.alertList = []; // FIXME: when we have alerts for app server
       let tenantId:TenantId = currentTenantId || this.$rootScope.currentPersona.id;
-
-      this.HawkularInventory.ResourceOfType.query({resourceTypeId: 'Deployment'},
-        (aResourceList, getResponseHeaders) => {
+      let idParts = this.$routeParams.resourceId.split('~');
+      let feedId = idParts[0];
+      this.HawkularInventory.ResourceOfTypeUnderFeed.query({
+          environmentId: globalEnvironmentId,
+          feedId: feedId,
+          resourceTypeId: 'Deployment'}, (aResourceList, getResponseHeaders) => {
           let promises = [];
           let tmpResourceList = [];
-          angular.forEach(aResourceList, (res:any) => {
+          angular.forEach(aResourceList, function(res: any) {
             if (res.id.startsWith(new RegExp(this.$routeParams.resourceId + '~/'))) {
               tmpResourceList.push(res);
               res.selected = _.result(_.find(this.resourceList, {'id': res.id}), 'selected');
               promises.push(this.HawkularMetric.AvailabilityMetricData(this.$rootScope.currentPersona.id).query({
                 tenantId: tenantId,
                 availabilityId: 'AI~R~[' + res.id + ']~AT~Deployment Status~Deployment Status',
-                distinct: true
-              }, (resource) => {
-                let latestData = _.last(resource);
+                distinct: true}, (resource) => {
+                let latestData = resource[resource.length-1];
                 if (latestData) {
                   res['state'] = latestData['value'];
                   res['updateTimestamp'] = latestData['timestamp'];

diff --git a/console/src/main/scripts/plugins/metrics/ts/directives/fileReadDirective.ts b/console/src/main/scripts/plugins/metrics/ts/directives/fileReadDirective.ts
@@ -28,14 +28,9 @@ module HawkularMetrics {
       },
       link: (scope, element )  => {
         element.bind('change', (changeEvent) => {
-          var theFile = changeEvent.target.files[0];
-          var reader = new FileReader();
+          let theFile = changeEvent.target.files[0];
+          let reader = new FileReader();
 
-          //reader.onload = (loadEvent:any) => {
-          //  scope.$apply(() => {
-          //    scope.fileread = loadEvent.target.result;
-          //  });
-          //};
           reader.onload = (readEvent:any) => {
             if (readEvent.target.readyState === FileReader.DONE) {
               scope.$apply(() => {

diff --git a/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts b/console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
@@ -45,7 +45,7 @@ module HawkularMetrics {
             }).$promise;
             resPromise.then(function (hkResourceList) {
               $location.path('/metrics/response-time/' + hkResourceList[0].id);
-            }, function () {
+            }, () => {
               $location.url('/error');
             });
 
@@ -120,13 +120,13 @@ module HawkularMetrics {
         templateUrl: 'plugins/metrics/html/app-details/app-server-details.html',
         reloadOnSearch: false,
         resolve: {
-          resource: function ($route, $location, HawkularInventory, NotificationsService:INotificationsService) {
-            var redirectMissingAppServer = function() {
+          resource: ($route, $location, HawkularInventory, NotificationsService:INotificationsService) => {
+            var redirectMissingAppServer = () => {
               NotificationsService.info('You were redirected to this page because you requested an invalid ' +
-                  'Application Server.');
+                'Application Server.');
               $location.path('/hawkular-ui/app/app-list');
             };
-            var checkAppServerExists = function() {
+            var checkAppServerExists = () => {
               var idParts = $route.current.params.resourceId.split('~');
               if (idParts.length !== 2) {
                 redirectMissingAppServer();