', cellTooltip: true},
- {name: 'Name', field: 'name', cellTemplate: '{{row.entity.name}}' +
- '' +
- '' +
- '', cellTooltip: true},
- {name: 'Provider Name', displayName: 'Provider Name', field: 'providerId', cellTooltip: true},
- {name: 'Ip Address', displayName: 'IP Address', cellTemplate: 'Public: {{row.entity.instanceIP}}Private: {{row.entity.privateIpAddress}}', cellTooltip: true}, - {name: 'RunLists', width: 90, enableSorting: false, cellTemplate: 'NA', cellTooltip: true}, - {name: 'Status', width: 90, enableSorting: false, cellTemplate: '', cellTooltip: true}, - {name: 'Log Info', width: 90, enableSorting: false, cellTemplate: '', cellTooltip: true}, - {name: 'Action', width: 160, enableSorting: false, cellTemplate: 'src/partials/sections/dashboard/workzone/instance/popups/instanceActionGridTemplate.html'} - ], + columnDefs: [{ + name: 'Logo', + displayName: '', + width: 100, + enableSorting: false, + cellTemplate: '
',
+ cellTooltip: true
+ }, {
+ name: 'Name',
+ field: 'name',
+ cellTemplate: '{{row.entity.name}}' +
+ '' +
+ '' +
+ '',
+ cellTooltip: true
+ }, {
+ name: 'Provider Name',
+ displayName: 'Provider Name',
+ field: 'providerId',
+ cellTooltip: true
+ }, {
+ name: 'Ip Address',
+ displayName: 'IP Address',
+ cellTemplate: 'Public: {{row.entity.instanceIP}}Private: {{row.entity.privateIpAddress}}', + cellTooltip: true + }, { + name: 'RunLists', + width: 90, + enableSorting: false, + cellTemplate: 'NA', + cellTooltip: true + }, { + name: 'Status', + width: 90, + enableSorting: false, + cellTemplate: '', + cellTooltip: true + }, { + name: 'Log Info', + width: 90, + enableSorting: false, + cellTemplate: '', + cellTooltip: true + }, { + name: 'Action', + width: 160, + enableSorting: false, + cellTemplate: 'src/partials/sections/dashboard/workzone/instance/popups/instanceActionGridTemplate.html' + }], }); }; /*APIs registered are triggered as ui-grid is configured - for server side(external) pagination.*/ + for server side(external) pagination.*/ $scope.instancesGridOptions = angular.extend(instanceUIGridDefaults.gridOption, { - onRegisterApi: function (gridApi) { + onRegisterApi: function(gridApi) { $scope.gridApi = gridApi; //Sorting for sortBy and sortOrder - gridApi.core.on.sortChanged($scope, function (grid, sortColumns) { + gridApi.core.on.sortChanged($scope, function(grid, sortColumns) { if (sortColumns[0] && sortColumns[0].field && sortColumns[0].sort && sortColumns[0].sort.direction) { $scope.paginationParams.sortBy = sortColumns[0].field; $scope.paginationParams.sortOrder = sortColumns[0].sort.direction; @@ -155,7 +190,7 @@ } }); //Pagination for page and pageSize - gridApi.pagination.on.paginationChanged($scope, function (newPage, pageSize) { + gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { $scope.paginationParams.page = newPage; $scope.paginationParams.pageSize = pageSize; $scope.currentCardPage = newPage; @@ -164,22 +199,22 @@ }); }, }); - $scope.cardPaginationChange = function () { + $scope.cardPaginationChange = function() { $scope.paginationParams.page = $scope.currentCardPage; $scope.paginationParams.pageSize = $scope.cardsPerPage; $scope.instancesGridOptions.paginationCurrentPage = $scope.currentCardPage; }; //variables used in rendering of the cards and table && checking ssh angular.extend($scope, { - instancesListCardView: function () { + instancesListCardView: function() { $scope.isInstancePageLoading = true; $scope.instanceList = []; // service to get the list of instances. - workzoneServices.getPaginatedInstances($scope.envParams, $scope.paginationParams, $scope.filterBy).then(function (result) { - $timeout(function () { + workzoneServices.getPaginatedInstances($scope.envParams, $scope.paginationParams, $scope.filterBy).then(function(result) { + $timeout(function() { $scope.instancesGridOptions.totalItems = $scope.totalCards = result.data.metaData.totalRecords; /*calling the helper method to check if $host is present - so that it gets replaced with instanceIP*/ + so that it gets replaced with instanceIP*/ helper.setHostToIp(result.data.instances); $scope.tabData = $scope.instanceList; if ($scope.totalCards > $scope.paginationParams.pageSize) { @@ -190,14 +225,14 @@ $scope.isInstancePageLoading = false; $scope.numofCardPages = Math.ceil($scope.instancesGridOptions.totalItems / $scope.paginationParams.pageSize); }, 100); - }, function (error) { + }, function(error) { $scope.isInstancePageLoading = false; console.log(error); $scope.errorMessage = "No Records found"; }); }, /*method to get the AWS instance status(specific only to AWS currently)*/ - getAWSStatus: function (instanceStatus, type) { + getAWSStatus: function(instanceStatus, type) { var colorSuffix = ''; var instanceStateImagePrefix = 'instance-state-'; var instanceStateTextPrefix = 'instance-state-text-'; @@ -212,6 +247,9 @@ case 'stopped': colorSuffix = 'stopped'; break; + case 'shutting-down': + colorSuffix = 'shutting-down'; + break; case 'pending': colorSuffix = 'pending'; break; @@ -232,7 +270,7 @@ } }, /*method to get the instance role*/ - getRoleLogo: function (inst) { + getRoleLogo: function(inst) { var imagePath = ''; var type = ''; type = inst.blueprintData && inst.blueprintData.templateId; @@ -260,7 +298,7 @@ } return imagePath; }, - getOSLogo: function (inst) { + getOSLogo: function(inst) { var imagePath = ''; var type = ''; type = inst.hardware && inst.hardware.platform; @@ -285,7 +323,7 @@ } return imagePath; }, - getPlatformId: function (providerType, platformID) { + getPlatformId: function(providerType, platformID) { var providerIdPrefix; switch (providerType) { case 'aws': @@ -309,94 +347,99 @@ actionSet: instanceActions }); /* START: Methods which make use of instanceService - Below methods on the instance card/table make use of instanceActions service. - Same sevice is reused in control panel actions tab but promise handlers may be different. - */ + Below methods on the instance card/table make use of instanceActions service. + Same sevice is reused in control panel actions tab but promise handlers may be different. + */ $scope.operationSet = {}; - $scope.operationSet.deleteInstance = function (inst) { + $scope.operationSet.deleteInstance = function(inst) { var promise = instanceOperations.deleteInstance(inst); - promise.then(function (resolveMessage) { + promise.then(function(resolveMessage) { console.log("Promise resolved deleteInstance:" + resolveMessage); $scope.instancesListCardView(); - }, function (rejectMessage) { + }, function(rejectMessage) { console.log("Promise rejected deleteInstance:" + rejectMessage); }); }; - $scope.operationSet.editInstanceName = function (inst) { + $scope.operationSet.editInstanceName = function(inst) { var promise = instanceOperations.editInstanceName(inst); - promise.then(function (resolveMessage) { + promise.then(function(resolveMessage) { console.log("Promise resolved editInstanceName:" + resolveMessage); $scope.selected = inst; - }, function (rejectMessage) { + }, function(rejectMessage) { console.log("Promise rejected editInstanceName:" + rejectMessage); }); }; - $scope.operationSet.instanceSSH = function (inst) { + $scope.operationSet.instanceSSH = function(inst) { var promise = instanceOperations.instanceSSH(inst); - promise.then(function (resolveMessage) { + promise.then(function(resolveMessage) { console.log("Promise resolved instanceSSH:" + resolveMessage); $scope.selected = inst; - }, function (rejectMessage) { + }, function(rejectMessage) { console.log("Promise rejected instanceSSH:" + rejectMessage); }); }; - $scope.operationSet.viewLogs = function (inst) { + $scope.operationSet.viewLogs = function(inst) { var promise = instanceOperations.viewLogs(inst); - promise.then(function (resolveMessage) { + promise.then(function(resolveMessage) { console.log("Promise resolved viewLogs:" + resolveMessage); $scope.selected = inst; - }, function (rejectMessage) { + }, function(rejectMessage) { console.log("Promise rejected viewLogs:" + rejectMessage); }); }; - $scope.operationSet.viewRunList = function (inst) { + $scope.operationSet.viewRunList = function(inst) { var promise = instanceOperations.viewRunList(inst); - promise.then(function (resolveMessage) { + promise.then(function(resolveMessage) { console.log("Promise resolved viewRunList:" + resolveMessage); - }, function (rejectMessage) { + }, function(rejectMessage) { console.log("Promise rejected viewRunList:" + rejectMessage); }); }; - $scope.operationSet.updateCookbook = function (inst) { + $scope.operationSet.updateCookbook = function(inst) { var promise = instanceOperations.updateCookbook(inst); - promise.then(function (resolveMessage) { + promise.then(function(resolveMessage) { console.log("Promise resolved updateCookbook:" + resolveMessage); $scope.selected = inst; - }, function (rejectMessage) { + }, function(rejectMessage) { console.log("Promise rejected updateCookbook:" + rejectMessage); }); }; - $scope.operationSet.puppetRunClient = function (inst) { + $scope.operationSet.puppetRunClient = function(inst) { var promise = instanceOperations.puppetRunClient(inst); - promise.then(function (resolveMessage) { + promise.then(function(resolveMessage) { console.log("Promise resolved puppetRunClient:" + resolveMessage); $scope.selected = inst; - }, function (rejectMessage) { + }, function(rejectMessage) { console.log("Promise rejected puppetRunClient:" + rejectMessage); }); }; - $scope.operationSet.changeInstanceStatus = function (inst) { + $scope.operationSet.changeInstanceStatus = function(inst) { $scope.instStartStopFlag = true; - var instObj = {_inst: inst, _id: inst._id, state: inst.instanceState, instIdx: $scope.instanceList.indexOf(inst)}; + var instObj = { + _inst: inst, + _id: inst._id, + state: inst.instanceState, + instIdx: $scope.instanceList.indexOf(inst) + }; workzoneServices.getInstanceData(inst).then( - function (response) { + function(response) { if (response.data.instanceState === "running") { var stopPromise = instanceOperations.stopInstanceHandler(inst, $scope.perms.stop); - stopPromise.then(function () { + stopPromise.then(function() { $scope.operationSet.checkInstanceStatus(instObj, 2000); $scope.operationSet.viewLogs(inst); $scope.instStartStopFlag = false; - }, function (rejectMessage) { + }, function(rejectMessage) { $scope.instStartStopFlag = false; console.log("Promise rejected " + rejectMessage); }); } else { var startPromise = instanceOperations.startInstanceHandler(inst, $scope.perms.start); - startPromise.then(function () { + startPromise.then(function() { $scope.operationSet.checkInstanceStatus(instObj, 2000); $scope.operationSet.viewLogs(inst); $scope.instStartStopFlag = false; - }, function (rejectMessage) { + }, function(rejectMessage) { $scope.instStartStopFlag = false; console.log("Promise rejected " + rejectMessage); }); @@ -404,11 +447,11 @@ } ); }; - $scope.operationSet.checkInstanceStatus = function (instObj, delay) { + $scope.operationSet.checkInstanceStatus = function(instObj, delay) { var _instObj = instObj; - $timeout(function () { + $timeout(function() { workzoneServices.getInstanceData(instObj._inst).then( - function (response) { + function(response) { if (response) { $scope.instanceList[_instObj.instIdx].instanceState = response.data.instanceState; console.log(response.data.instanceState, ' polling'); @@ -421,17 +464,16 @@ } } }, - function () { - } + function() {} ); }, delay); }; /*END: Methods which make use of instanceService*/ /*setting the firstPageView*/ - $scope.setFirstPageView = function () { + $scope.setFirstPageView = function() { $scope.instancesGridOptions.paginationCurrentPage = $scope.paginationParams.page = 1; }; - $rootScope.$on('WZ_ENV_CHANGE_START', function (event, requestParams) { + $rootScope.$on('WZ_ENV_CHANGE_START', function(event, requestParams) { $scope.envParams = requestParams; $scope.initGrids(); helper.setPaginationDefaults(); @@ -439,14 +481,14 @@ //workzoneUIUtils.makeTabScrollable('instancePage');//TODO: Ideally this should be on resize event; }); //root scope method for refreshing the list view at the time of blueprint launch. - $rootScope.$on('WZ_INSTANCES_SHOW_LATEST', function () { + $rootScope.$on('WZ_INSTANCES_SHOW_LATEST', function() { helper.setPaginationDefaults(); }); //root scope method for refreshing the list view at the time of docker cookbook run. - $rootScope.$on('WZ_INSTANCES_REFRESH_CURRENT', function () { + $rootScope.$on('WZ_INSTANCES_REFRESH_CURRENT', function() { $scope.instancesListCardView(); }); - $scope.instanceImportByIP = function () { + $scope.instanceImportByIP = function() { $scope.isImportClickEnabled = false; var whetherConfigListAvailable = workzoneServices.getCheckIfConfigListAvailable(); var getOSList = workzoneServices.getOSList(); @@ -459,41 +501,41 @@ backdrop: 'static', keyboard: false, resolve: { - items: function () { + items: function() { return allPromise; } } }); - modalInstance.result.then(function (newinstId) { + modalInstance.result.then(function(newinstId) { $scope.isImportClickEnabled = true; $rootScope.$emit('WZ_INSTANCES_SHOW_LATEST'); $scope.operationSet.viewLogs(newinstId); - }, function () { + }, function() { $scope.isImportClickEnabled = true; console.log('Modal dismissed at: ' + new Date()); }); }; - $scope.rdpFileLink = function (instanceObj) { + $scope.rdpFileLink = function(instanceObj) { var fileLink = '/instances/rdp/' + instanceObj.instanceIP + '/3389'; return fileLink; }; - $scope.rdpFileName = function (instanceObj) { + $scope.rdpFileName = function(instanceObj) { var fileName = instanceObj.instanceIP + '.rdp'; return fileName; }; - $scope.showAppLinksPopup = function (inst) { + $scope.showAppLinksPopup = function(inst) { inst.showAppLinks = !inst.showAppLinks; console.log(inst.showAppLinks); }; - $scope.selectCard = function (identi) { + $scope.selectCard = function(identi) { $scope.selectedCard = identi; }; - $scope.setCardView = function () { + $scope.setCardView = function() { $scope.isCardViewActive = true; $scope.instanceCardViewSelection = "instance-tab-active"; $scope.instanceTableViewSelection = ""; }; - $scope.instanceExecute = function (task) { + $scope.instanceExecute = function(task) { var modalOptions = { closeButtonText: 'Cancel', actionButtonText: 'Ok', @@ -501,8 +543,8 @@ headerText: 'Confirmation', bodyText: 'Are you sure you want to execute this Job?' }; - confirmbox.showModal({}, modalOptions).then(function () { - workzoneServices.runTask(task.id).then(function (response) { + confirmbox.showModal({}, modalOptions).then(function() { + workzoneServices.runTask(task.id).then(function(response) { $modal.open({ animation: true, templateUrl: 'src/partials/sections/dashboard/workzone/orchestration/popups/orchestrationLog.html', @@ -510,7 +552,7 @@ backdrop: 'static', keyboard: false, resolve: { - items: function () { + items: function() { return { taskId: task.id, historyId: response.data.historyId, @@ -522,18 +564,18 @@ }); }); }; - $scope.instanceTableView = function () { + $scope.instanceTableView = function() { $scope.isCardViewActive = false; $scope.instanceTableViewSelection = "instance-tab-active"; $scope.instanceCardViewSelection = ""; var tableData = $scope.tabData; $scope.tabData = []; - $timeout(function () { + $timeout(function() { $scope.tabData = tableData; }, 500); }; - $scope.instanceControlPanel = function (instanceObj) { + $scope.instanceControlPanel = function(instanceObj) { $modal.open({ animation: true, templateUrl: 'src/partials/sections/dashboard/workzone/instance/manage/controlPanel.html', @@ -542,19 +584,19 @@ keyboard: false, size: 'lg', resolve: { - instance: function () { + instance: function() { return instanceObj; } } }); }; - $scope.refreshCurrentPage = function () { + $scope.refreshCurrentPage = function() { $rootScope.$emit('WZ_INSTANCES_REFRESH_CURRENT'); }; - $scope.fnShowFilters = function () { + $scope.fnShowFilters = function() { $scope.showFilters = !$scope.showFilters; }; - $scope.resetFilter = function () { + $scope.resetFilter = function() { $scope.filter = angular.copy(filters); $scope.regions = []; $scope.vpcs = []; @@ -563,25 +605,25 @@ $scope.showFilters = false; }; - $scope.getAllRegionsList = function () { - workzoneServices.getAllRegionsList().then(function (response) { + $scope.getAllRegionsList = function() { + workzoneServices.getAllRegionsList().then(function(response) { $scope.allRegions = response.data; - }, function (error) { + }, function(error) { console.log(error); }); }; - $scope.getProviders = function () { - workzoneServices.getProviders().then(function (response) { + $scope.getProviders = function() { + workzoneServices.getProviders().then(function(response) { $scope.providers = response.data; - }, function (error) { + }, function(error) { console.log(error); }); }; - $scope.getProviderRegions = function () { + $scope.getProviderRegions = function() { $scope.providerLoading = true; - workzoneServices.getProviderRegions($scope.filter.providerId).then(function (response) { + workzoneServices.getProviderRegions($scope.filter.providerId).then(function(response) { var keyPairs = response.data.keyPairs; var keyPairsLength = keyPairs.length; var regions = []; @@ -601,7 +643,7 @@ } } $scope.providerLoading = false; - }, function (error) { + }, function(error) { console.log(error); $scope.providerLoading = false; }); @@ -609,19 +651,19 @@ - $scope.getProviderVPCs = function () { + $scope.getProviderVPCs = function() { $scope.regionLoading = true; - workzoneServices.getProviderVPCs($scope.filter.providerId, $scope.filter.regionId).then(function (response) { + workzoneServices.getProviderVPCs($scope.filter.providerId, $scope.filter.regionId).then(function(response) { $scope.vpcs = response.data.Vpcs; $scope.regionLoading = false; - }, function (error) { + }, function(error) { $scope.regionLoading = false; console.log(error); }); }; - $scope.fnProviderChange = function () { + $scope.fnProviderChange = function() { $scope.filter.regionId = ''; $scope.filter.vpcId = ''; $scope.regions = []; @@ -631,7 +673,7 @@ } }; - $scope.fnRegionChange = function () { + $scope.fnRegionChange = function() { $scope.filter.vpcId = ''; $scope.vpcs = []; if ($scope.filter.regionId && $scope.filter.regionId !== '') { @@ -639,26 +681,35 @@ } }; - $scope.fnSearchFilters = function () { + $scope.fnSearchFilters = function() { $scope.filterBy = null; - $scope.filterChips = []; + $scope.filterChips = []; if ($scope.filter.providerId && $scope.filter.providerId !== '') { - $scope.filterBy = 'providerId:'+$scope.filter.providerId; - $scope.filterChips.push({'key':'Provider','value':$scope.filter.providerId}); + $scope.filterBy = 'providerId:' + $scope.filter.providerId; + $scope.filterChips.push({ + 'key': 'Provider', + 'value': $scope.filter.providerId + }); } if ($scope.filter.regionId && $scope.filter.regionId !== '') { - $scope.filterBy += '+region:'+$scope.filter.regionId; - $scope.filterChips.push({'key':'Region','value':$scope.filter.regionId}); + $scope.filterBy += '+region:' + $scope.filter.regionId; + $scope.filterChips.push({ + 'key': 'Region', + 'value': $scope.filter.regionId + }); } if ($scope.filter.vpcId && $scope.filter.vpcId !== '') { - $scope.filterBy += '+vpcId:'+$scope.filter.vpcId; - $scope.filterChips.push({'key':'VPC','value':$scope.filter.vpcId}); + $scope.filterBy += '+vpcId:' + $scope.filter.vpcId; + $scope.filterChips.push({ + 'key': 'VPC', + 'value': $scope.filter.vpcId + }); } $scope.instancesListCardView(); $scope.showFilters = false; }; - $scope.init = function () { + $scope.init = function() { helper.setInitPaginationDefaults(); $scope.setCardView(); $scope.getProviders(); @@ -667,4 +718,4 @@ $scope.init(); } ]); -})(angular); +})(angular); \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss index 6d55e5c30..658518e7c 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/orchestration.scss @@ -353,6 +353,18 @@ $imagePath : "../../../../../../images"; margin: 3px 0 0 0; } } + + .paddingtop8 { + padding-top: 8px; + } + + .paddingleft0 { + padding-left: 0px; + } + + .paddingright15 { + padding-right: 15px; + } } #viewNodesPage { diff --git a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html index c709ad262..89499be44 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html +++ b/client/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/newTask.html @@ -80,18 +80,30 @@
Job Details
-
@@ -154,7 +166,7 @@
Chef Server Details for - RLChefServer
- - @@ -442,7 +454,9 @@
Script Details
{{row.entity.status}}
'},
+ { name:'Status',field:'status',cellTemplate:'{{row.entity.status.toUpperCase()}}
'},
{ name:'Start Time',field:'timestampStarted',cellTemplate:'{{row.entity.timestampStarted | timestampToLocaleTime}}',cellTooltip: true},
{ name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}',cellTooltip: true}
];
diff --git a/client/htmls/private/ajax/DesignBlueprint.html b/client/htmls/private/ajax/DesignBlueprint.html
index 6b0739e70..4dadd7215 100644
--- a/client/htmls/private/ajax/DesignBlueprint.html
+++ b/client/htmls/private/ajax/DesignBlueprint.html
@@ -492,7 +492,7 @@