diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html index f69b0326f..6c2df7210 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html @@ -47,7 +47,7 @@
- @@ -88,6 +88,7 @@
  • {{resource.platformId}}
    • + Maximum 10 resources allowed. diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index 2697c6580..f25220e0e 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -196,12 +196,13 @@ }; $scope.getAllRegionsList(); - $scope.fnProviderChange = function() { + $scope.ProviderChange = function(val) { $scope.filter.regionId = ''; $scope.filter.vpcId = ''; $scope.regions = []; - if ($scope.filter.providerId && $scope.filter.providerId !== '') { - $scope.getProviderRegions(); + $scope.filter.providerId=$rootScope.providers[val]._id; + if ($scope.filter.providerId) { + $scope.getResourse($rootScope.organNewEnt.instanceType); } }; $scope.getResourse = function(instType) { @@ -211,6 +212,7 @@ workzoneServices.getManagedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.managedInstances && response.data.managedInstances.length >0){ $scope.resourceList = response.data.managedInstances; + $scope.toggleResourceSelection($scope.resourceList[0]._id,$scope.resourceList[0].platformId); } else{ $scope.resourceList=[]; } @@ -222,6 +224,7 @@ workzoneServices.getAssignedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.unmanagedInstances.length >0){ $scope.resourceList = response.data.unmanagedInstances; + $scope.toggleResourceSelection($scope.resourceList[0]._id,$scope.resourceList[0].platformId); } else{ $scope.resourceList = []; } @@ -234,7 +237,7 @@ workzoneServices.getUnassignedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.data && response.data.data.length >0){ $scope.resourceList = response.data.data; - $scope.selectedResources.push(response.data.data[0]._id); + $scope.toggleResourceSelection(response.data.data[0]._id,response.data.data[0].platformId); $rootScope.filterNewEnt.resources=$scope.selectedResources; $rootScope.filterNewEnt.platformId[response.data.data[0]._id]=response.data.data[0].platformId; } else { @@ -252,7 +255,7 @@ var idx = $scope.selectedResources.indexOf(resourceId); if(idx > -1) { $scope.selectedResources.splice(idx, 1); - + } else { if($scope.selectedResources.length === 10){ console.log($scope.selectedResources.length); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss index 932b37ba7..4335ee085 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss @@ -328,7 +328,7 @@ } .btnFoot{ float: right; - width: 51%; + width: 57%; } .form-control{ height: 29px; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js index 789d15ea9..500014e5a 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js @@ -121,7 +121,7 @@ genSevs.promiseGet(param).then(function (result) { capaCtr.chartData=result; $rootScope.splitUpCapacities=[]; - if(result.splitUpCapacities) { + if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0) { angular.forEach(result.splitUpCapacities, function (val, key) { var a=key.replace(/([A-Z])/g, ' $1').replace(/^./, function(str) { return str.toUpperCase(); @@ -152,12 +152,19 @@ // create bar //if(viewType === 'ProviderView'){ capaCtr.capaGridOptions.data = result.splitUpCapacities[viewType]; - angular.forEach(result.splitUpCapacities[viewType], function (value) { + if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0 ) { + angular.forEach(result.splitUpCapacities[viewType], function (value) { + capaCtr.pieChat.data.push({ + key: value.name, + value: value.capacity.totalCapacity + }); + }); + } else{ capaCtr.pieChat.data.push({ - key: value.name, - value: value.capacity.totalCapacity + key: result.entity.name, + value: result.capacity.totalCapacity }); - }); + } if(result.capacity && result.capacity.AWS && result.capacity.AWS.services) { capaCtr.serviceCapacity = result.capacity.AWS.services; angular.forEach(result.capacity.AWS.services, function (valueChild, keyChild) { @@ -166,20 +173,35 @@ name: keyChild, field: 'capacity.AWS.services.' + keyChild }); - angular.forEach(result.splitUpCapacities[viewType], function (valBar) { + if(result.splitUpCapacities && Object.keys(result.splitUpCapacities).length >0 ) { + angular.forEach(result.splitUpCapacities[viewType], function (valBar) { + var chVal = ''; + if (valBar.capacity.AWS.services[keyChild]) { + chVal = valBar.capacity.AWS.services[keyChild]; + } else { + chVal = 0; + } + va.push( + { + "label": valBar.name, + "value": chVal + } + ); + }); + } else { var chVal = ''; - if (valBar.capacity.AWS.services[keyChild]) { - chVal = valBar.capacity.AWS.services[keyChild]; + if (result.capacity.AWS.services[keyChild]) { + chVal =result.capacity.AWS.services[keyChild]; } else { chVal = 0; } va.push( { - "label": valBar.name, + "label": result.entity.name, "value": chVal } ); - }); + } capaCtr.barChat.data.push({ "key": keyChild, "values": va diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js index 04ea6c7b8..17d145288 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js @@ -146,8 +146,9 @@ costObj.barChat.data = []; // create bar //if(viewType === 'ProviderView'){ - costObj.costGridOptions.data = result.splitUpCosts[viewType]; + if(result.splitUpCosts && Object.keys(result.splitUpCosts).length >0 ) { + costObj.costGridOptions.data = result.splitUpCosts[viewType]; angular.forEach(result.splitUpCosts[viewType], function (value) { costObj.pieChat.data.push({ key: value.name, @@ -155,6 +156,7 @@ }); }); } else { + costObj.costGridOptions.data = result; costObj.pieChat.data.push({ key: result.entity.name, value: result.cost.totalCost 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 032d19fa5..5d36104d3 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -114,19 +114,20 @@ }; disResrc.gridOptionInstances.data = []; if($rootScope.organNewEnt.instanceType === 'Managed') { - $scope.colArray=['platformId','privateIpAddress','os','state']; + disResrc.gridOptionInstances.enableRowHeaderSelection= false; + $scope.colArray=['platformId','privateIpAddress','instanceState','region']; disResrc.gridOptionInstances.columnDefs=[ - {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, cellTooltip: true, enableCellEdit: false,enableFiltering: true}, - {name: 'os', enableFiltering: true,displayName: 'OS', enableCellEdit: false,enableCellEditOnFocus: false}, + {name: 'os', enableFiltering: true,displayName: 'os', field:'hardware.os',enableCellEdit: false,enableCellEditOnFocus: false}, {name: 'privateIpAddress',enableFiltering: true, displayName: 'IP Address',enableCellEditOnFocus: false, enableCellEdit: false}, - {name: 'state',enableFiltering: true, displayName: 'Status',enableCellEditOnFocus: false, + {name: 'instanceState',enableFiltering: true, displayName: 'Status',enableCellEditOnFocus: false, enableCellEdit: false}, { name: 'Region',enableFiltering: true, displayName: 'Region', - field: 'providerData.region_name', + field: 'region', cellTooltip: true,enableCellEditOnFocus: false, enableCellEdit: false }, @@ -155,7 +156,7 @@ } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ $scope.colArray=['platformId','privateIpAddress','os','state']; disResrc.gridOptionInstances.columnDefs=[ - {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, cellTooltip: true, enableCellEdit: false,enableFiltering: true}, {name: 'os', enableFiltering: true,displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, {name: 'privateIpAddress',enableFiltering: true, displayName: 'IP Address',enableCellEditOnFocus: false, @@ -192,9 +193,10 @@ ]; $scope.instanceType= 'unmanagedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Unassigned'){ + disResrc.gridOptionInstances.enableRowHeaderSelection= false; $scope.colArray=['platformId','privateIpAddress','os','state']; disResrc.gridOptionInstances.columnDefs= [ - {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, cellTooltip: true, enableCellEdit: false}, {name: 'os', displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, {name: 'privateIpAddress', displayName: 'IP Address',enableCellEditOnFocus: false, @@ -256,6 +258,7 @@ var param = { inlineLoader:true, url: '/providers/' + fltrObj.provider.id + '/' + $scope.instanceType + // url:'src/partials/sections/dashboard/analytics/data/ins.json' }; genSevs.promiseGet(param).then(function (instResult) { if($rootScope.organNewEnt.instanceType === 'Managed') { diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js index 06c765ca9..a34125ee8 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -21,11 +21,14 @@ }; genSevs.promiseGet(param).then(function (tagResult) { $scope.newEnt.project.tagName=''; + $scope.newEnt.project.tagValues=[]; + $scope.newEnt.businessGroup.tagValues=[]; $scope.newEnt.businessGroup.tagName=''; - $scope.newEnt.environment.tagName=''; - disTgMap.getTagValues('','businessGroup'); - disTgMap.getTagValues('','environment'); - disTgMap.getTagValues('','project'); + $scope.newEnt.environment.tagName='' + $scope.newEnt.environment.tagValues=[];; + disTgMap.getTagValues(false,'businessGroup'); + disTgMap.getTagValues(false,'environment'); + disTgMap.getTagValues(false,'project'); angular.forEach(tagResult, function (val, key) { $scope.newEnt[key].tagName = val.tagName; @@ -45,6 +48,9 @@ }); } }; + disTgMap.reset =function () { + disTgMap.getTagMapping(); + }; disTgMap.getAllTags =function () { //$scope.newEnt.providerId = fltrObj.provider.id; $scope.isLoadingTag = true; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html index e4118ea44..2f9485c64 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html @@ -12,8 +12,11 @@ + +
    +
    No Data Found!
    diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html index 3a7f07d64..d27b67904 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html @@ -135,6 +135,9 @@
    +