From d02e209032fa45030e1a014a8163b6c26afcc727 Mon Sep 17 00:00:00 2001 From: srikanthv02 Date: Tue, 3 Jan 2017 11:50:24 +0530 Subject: [PATCH] Changes for chef import --- client/cat3/main.html | 1 + .../controller/discoveryResourcesCtrl.js | 39 ++++++++++++++--- .../controller/discoverySyncResultCtrl.js | 43 +++++++++++++++++++ .../analytics/view/discoverySyncResult.html | 14 ++++++ .../analytics/view/instanceManage.html | 13 +++--- 5 files changed, 99 insertions(+), 11 deletions(-) create mode 100644 client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js create mode 100644 client/cat3/src/partials/sections/dashboard/analytics/view/discoverySyncResult.html diff --git a/client/cat3/main.html b/client/cat3/main.html index c2e86ed3b..7aee82223 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -112,6 +112,7 @@ + diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index 9b7b76b02..846049070 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -147,7 +147,6 @@ ]; $scope.instanceType= 'managedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ - disResrc.gridOptionInstances.enableFiltering=true; disResrc.gridOptionInstances.columnDefs=[ {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, enableCellEdit: false,enableFiltering: true}, @@ -186,7 +185,6 @@ ]; $scope.instanceType= 'unmanagedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ - disResrc.gridOptionInstances.enableFiltering=false; disResrc.gridOptionInstances.columnDefs= [ {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, enableCellEdit: false}, @@ -309,7 +307,7 @@ }; disResrc.init(); - }]).controller('instanceManageCtrl',['$scope','$rootScope','items','$modalInstance','genericServices',function ($scope,$rootScope,items,$modalInstance,genericServices) { + }]).controller('instanceManageCtrl',['$scope','$rootScope','items','$modalInstance','genericServices','$modal',function ($scope,$rootScope,items,$modalInstance,genericServices,$modal) { $scope.items=items; var fltrObj=$rootScope.filterNewEnt; var reqBody = {}; @@ -340,6 +338,8 @@ } }; $scope.ok = function() { + $scope.importSpinner = true; + $scope.importSync = true; reqBody.orgId = $scope.IMGNewEnt.org.orgid; reqBody.bgId = $scope.IMGNewEnt.buss.rowid; reqBody.projectId = $scope.IMGNewEnt.proj.rowId; @@ -362,9 +362,36 @@ data:reqBody } genericServices.promisePost(params).then(function (response) { - if(response.data){ - toastr.success('Successfully Imported.','Update'); - $modalInstance.dismiss(response.data); + + if(response.taskId){ + $modalInstance.dismiss(response.taskId); + $scope.importSpinner = false; + $scope.importSync = false; + $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/analytics/view/discoverySyncResult.html', + controller: 'discoverySyncResultCtrl', + backdrop: 'static', + keyboard: false, + resolve: { + items: function() { + return { + taskId:response.taskId, + nodeIds:reqBody.instanceIds + }; + } + } + }).result.then(function(response) { + }, function() { + console.log("Dismiss at " + new Date()); + }); + } + },function(response){ + $scope.isStartStopInstanceLoading = false; + if(response.data.message){ + $scope.authMsg = response.data.message; + }else{ + $scope.authMsg = response.data; } }); }; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js new file mode 100644 index 000000000..e9668e5ba --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js @@ -0,0 +1,43 @@ +(function (angular) { + "use strict"; + angular.module('dashboard.analytics') + .controller('discoverySyncResultCtrl', ['$scope','$rootScope', '$state', 'items','analyticsServices', 'genericServices','toastr','$modalInstance','$timeout', function ($scope, $rootScope, $state, items,analyticsServices,genSevs,toastr,$modalInstance,$timeout){ + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + $scope.isInstanceImporting = true; + $scope.pollTaskStatus = function(timestamp) { + $timeout(function () { + var params={ + url:'/taskstatus/' + items.taskId + '/status?timestamp=' + timestamp + }; + $scope.progressValue = 0; + genSevs.promiseGet(params).then(function (data) { + if (!data.completed) { + if (data.statusList && data.statusList.length) { + $scope.progressValue = data.statusList.length; + for (var i = 0; i < data.statusList.length; i++) { + $scope.statusMessage = data.statusList[i].status.message; + $scope.isInstanceImporting = false; + } + $scope.pollTaskStatus(data.statusList[data.statusList.length - 1].timestamp); + } else { + $scope.pollTaskStatus(timestamp); + } + } else { + if (data.statusList && data.statusList.length) { + $scope.progressValue = data.statusList.length; + for (var i = 0; i < data.statusList.length; i++) { + $scope.statusMessage = data.statusList[i].status.message; + $scope.isInstanceImporting = false; + } + } + $scope.progressValue = items.nodeIds.length; + $scope.instanceLength = items.nodeIds.length; + } + }); + },1000); + }; + $scope.pollTaskStatus(0); + }]) +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoverySyncResult.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoverySyncResult.html new file mode 100644 index 000000000..22d991b87 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoverySyncResult.html @@ -0,0 +1,14 @@ +
+ × +

+ Importing Instance +

+
+
+ +
+
{{statusMessage}}
+
+
+ +
\ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html b/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html index 4c90e7b8c..0713256a5 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html @@ -53,7 +53,7 @@

Import Instance

@@ -79,7 +79,7 @@

Import Instance

- +
@@ -97,9 +97,12 @@

Import Instance

- + + +
- +