diff --git a/client/cat3/bower.json b/client/cat3/bower.json index 01d8209e5..8b234a313 100644 --- a/client/cat3/bower.json +++ b/client/cat3/bower.json @@ -29,7 +29,9 @@ "angular-ui-grid": "^3.1.1", "lodash": "^4.11.2", "ng-file-upload": "^12.0.4", - "angular-nvd3": "^1.0.7" + "angular-nvd3": "^1.0.7", + "angularMultipleSelect": "angular-multiple-select#^1.1.2", + "glyphicons-halflings": "*" }, "exportsOverride": { "font-awesome": { diff --git a/client/cat3/main.html b/client/cat3/main.html index da9406da0..d7cfa2ac0 100644 --- a/client/cat3/main.html +++ b/client/cat3/main.html @@ -16,6 +16,7 @@ + @@ -41,6 +42,7 @@ + @@ -107,7 +109,10 @@ + + + diff --git a/client/cat3/src/clientRoutes.js b/client/cat3/src/clientRoutes.js index fca4c6c1e..778ee4db0 100644 --- a/client/cat3/src/clientRoutes.js +++ b/client/cat3/src/clientRoutes.js @@ -73,7 +73,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe }] } }).state('dashboard.analytics', { - url: "/analytics/", + url: "/CM/", templateUrl: "src/partials/sections/dashboard/analytics/analytics.html", controller: "analyticsCtrl as analytic", params:{filterView:{analytics:true}}, diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss index b85ade95c..74db63c13 100644 --- a/client/cat3/src/partials/global.scss +++ b/client/cat3/src/partials/global.scss @@ -773,6 +773,12 @@ accordion .panel-heading { .ui-grid-cell { text-overflow: ellipsis; overflow: initial; + border-right: none !important; + border-bottom: 1px solid rgba(180, 180, 180, 0.23); + } + .ui-grid-header-cell{ + font-size: 12px; + font-weight: 500; } ul.ng-scope { @@ -799,6 +805,7 @@ accordion .panel-heading { height: auto; padding:6px; overflow: hidden; + font-size: 12px; } .ui-grid-cell-contents { @@ -1265,6 +1272,12 @@ accordion .panel-heading { margin-left: 6px !important; } // ui grid style +.ui-grid-row:nth-child(odd) .ui-grid-cell{ + background-color: rgba(255, 255, 255, 0.43) !important; +} +.ui-grid-row:last-child .ui-grid-cell{ + border-bottom-width: 1px !important; +} .ui-grid-header-cell-row{ background: #636363 !important; color: #FBFBFB !important; @@ -1413,4 +1426,29 @@ label { -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s; -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; -} \ No newline at end of file +} + +div::-webkit-scrollbar-track +{ + -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); + background-color: #F5F5F5; +} + +div::-webkit-scrollbar +{ + width: 10px; + background-color: #F5F5F5; +} + +div::-webkit-scrollbar-thumb +{ + background-color: #40BAF1; + background-image: -webkit-linear-gradient(45deg, + rgba(255, 255, 255, .2) 25%, + transparent 25%, + transparent 50%, + rgba(255, 255, 255, .2) 50%, + rgba(255, 255, 255, .2) 75%, + transparent 75%, + transparent) +} diff --git a/client/cat3/src/partials/globals/header/headerDashboard.html b/client/cat3/src/partials/globals/header/headerDashboard.html index 25c5f30bc..5a07f691f 100644 --- a/client/cat3/src/partials/globals/header/headerDashboard.html +++ b/client/cat3/src/partials/globals/header/headerDashboard.html @@ -35,7 +35,7 @@
  • - ANALYTICS + Cloud
  • @@ -46,7 +46,7 @@
  • - + {{appDetails.cn | uppercase}} [{{appDetails.roleId}}]
    diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html index b90bab094..e8610f1b3 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html @@ -68,9 +68,9 @@
    @@ -97,7 +97,7 @@
    - +
    @@ -107,20 +107,23 @@
    -
    +
    - - - - + + + + + +
    diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js index b4c37f53a..86888270a 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js @@ -1,10 +1,10 @@ (function (angular) { "use strict"; - angular.module('dashboard.analytics', ['apis.analytics','nvd3']) + angular.module('dashboard.analytics', ['apis.analytics','nvd3','multipleSelect','ui.grid.edit']) .config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'modulePermissionProvider', function($stateProvider, $urlRouterProvider, $httpProvider, modulePermissionProvider) { var modulePerms = modulePermissionProvider.$get(); $stateProvider.state('dashboard.analytics.cost', { - url: "cost/", + url: "analytics/cost/", templateUrl: "src/partials/sections/dashboard/analytics/view/cost.html", controller: "costCtrl as cost", params:{filterView:{cost:true,viewBy:true,splitUpType:true,org:true}}, @@ -22,7 +22,7 @@ }] } }).state('dashboard.analytics.capacity', { - url: "capacity/", + url: "analytics/capacity/", templateUrl: "src/partials/sections/dashboard/analytics/view/capacity.html", controller: "capacityCtrl as capaCtr", params:{filterView:{period:true,cost:true,viewBy:true,splitUpType:true,org:true}}, @@ -40,7 +40,7 @@ }] } }).state('dashboard.analytics.usage', { - url: "usage/", + url: "analytics/usage/", templateUrl: "src/partials/sections/dashboard/analytics/view/usage.html", controller: "usageCtrl as usage", params:{filterView:{usage:true,org:true,provi:true,instanceType:true,resources:true}}, @@ -57,10 +57,47 @@ return deferred.promise; }] } + }).state('dashboard.analytics.tagMapping', { + url: "discovery/tagMapping/", + templateUrl: "src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html", + controller: "discoveryTagMappingCtrl as disTgMap", + params:{filterView:{period:true,org:true,provi:true},dashboardHide:true,reportHide:true,otherTab:'Tag mapping',otherTabView:true}, + resolve: { + auth: ["$q", function ($q) { + var deferred = $q.defer(); + // instead, go to a different page + if (modulePerms.analyticsBool()) { + // everything is fine, proceed + deferred.resolve(); + } else { + deferred.reject({redirectTo: 'dashboard'}); + } + return deferred.promise; + }] + } + }).state('dashboard.analytics.resources', { + url: "discovery/resources/", + templateUrl: "src/partials/sections/dashboard/analytics/view/discoveryResources.html", + controller: "discoveryResourcesCtrl as disResrc", + params:{filterView:{period:true,org:true,provi:true,instanceType:true},dashboardHide:true,otherTab:'Resources',otherTabView:true,reportHide:true}, + resolve: { + auth: ["$q", function ($q) { + var deferred = $q.defer(); + // instead, go to a different page + if (modulePerms.analyticsBool()) { + // everything is fine, proceed + deferred.resolve(); + } else { + deferred.reject({redirectTo: 'dashboard'}); + } + return deferred.promise; + }] + } }); }]) .controller('analyticsCtrl',['$scope', '$rootScope','$state','genericServices','analyticsServices', 'workzoneServices', 'toastr', function ($scope, $rootScope, $state, genericServices,analyticsServices, workzoneServices, toastr) { var analytic = this; + $scope.isTreeOpen = false; //var splitUp=null; analytic.tabShowChat=true; analytic.tabShowReport=false; @@ -170,7 +207,7 @@ $scope.getResourse = function(instType) { $rootScope.filterNewEnt.resources=[]; $scope.selectedResources=[]; - if(instType === 'Managed') { + if(instType === 'managedInstances') { workzoneServices.getManagedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.managedInstances && response.data.managedInstances.length >0){ $scope.resourceList = response.data.managedInstances; @@ -181,7 +218,7 @@ toastr.error(error); }); } - if(instType === 'Assigned') { + if(instType === 'unmanagedInstances') { workzoneServices.getAssignedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.unmanagedInstances.length >0){ $scope.resourceList = response.data.unmanagedInstances; @@ -193,7 +230,7 @@ toastr.error(error); }); } - if(instType === 'Unassigned') { + if(instType === 'unassigned-instances') { workzoneServices.getUnassignedInstances($scope.filter.providerId).then(function(response) { if(response.data && response.data.data && response.data.data.length >0){ $scope.resourceList = response.data.data; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss index cf8c2d7cf..4769ac191 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss +++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.scss @@ -209,6 +209,13 @@ #analyticsPage { + .ui-grid-row > div .ui-grid-cell { + float: left !important; + vertical-align: middle; + height: 40px !important; + padding: 0px !important; + overflow: hidden; + } .filter-btn { margin: 9px 10px 0 0; } @@ -308,4 +315,50 @@ } .marginbottom10{ margin-bottom: 10px !important; +} +#tagMappting{ + .saveBtn{ + position: fixed; + bottom: 0px; + display: block; + padding: 13px 14px 15px; + border-top: 1px solid rgba(0, 0, 0, .1); + background: rgba(249, 249, 249, .9); + z-index: 999; + } + .btnFoot{ + float: right; + width: 51%; + } + .form-control{ + height: 29px; + padding: 2px 10px; + font-size: 12px; + line-height: 1; + } + .with250{ + width: 250px !important; + } +} +.form-item-container { + .list-inline { + input { + width: 96px; + height: 20px; + border: 1px solid #ccc; + border-radius: 0px !important; + } + li span { + border: 1px solid #23a9e1; + border-radius: 0px !important; + padding: 2px 4px; + font-size: 12px; + } + } + +} +.autocomplete-list { + width: calc(37% + 3px) !important; + left: 40% !important; + z-index: 100; } \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js index f0d1c239e..06cb441b0 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/analyticsServices.js @@ -48,6 +48,8 @@ id: $rootScope.organNewEnt.instanceType, title: 'Instance' }; + } else { + $rootScope.filterNewEnt.instanceType = {}; } if ($rootScope.organNewEnt.provider) { $rootScope.filterNewEnt.provider = { @@ -62,8 +64,8 @@ $rootScope.organNewEnt = {}; if($state.current.name === "dashboard.analytics.usage"){ $rootScope.organNewEnt.provider='0'; - $rootScope.organNewEnt.instanceType='Unassigned'; - $rootScope.$emit('INI_usage', 'Unassigned'); + $rootScope.organNewEnt.instanceType='unassigned-instances'; + $rootScope.$emit('INI_usage', 'unassigned-instances'); } $rootScope.organNewEnt.org = or; } 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 bbc80f290..789d15ea9 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/capacityCtrl.js @@ -295,7 +295,7 @@ $timeout(function () { $rootScope.applyFilter(true,'month'); capaCtr.trendsChart($rootScope.filterNewEnt); - var treeNames = ['Analytics','capacity']; + var treeNames = ['Cloud Management','Analytics','capacity']; $rootScope.$emit('treeNameUpdate', treeNames); },500); }; 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 ba53d284d..74a1b312a 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/costCtrl.js @@ -290,7 +290,7 @@ $timeout(function () { $rootScope.applyFilter(true,'month'); costObj.trendsChart($rootScope.filterNewEnt); - var treeNames = ['Analytics','Cost']; + var treeNames = ['Cloud Management','Analytics','Cost']; $rootScope.$emit('treeNameUpdate', treeNames); },500); }; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js new file mode 100644 index 000000000..6c4829c8b --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -0,0 +1,45 @@ +(function (angular) { + "use strict"; + angular.module('dashboard.analytics') + .controller('discoveryResourcesCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){ + var disResrc=this; + $scope.tagValue=[{'id':'a','value':'a'},{'id':'b','value':'b'}] + disResrc.gridOptionInstances = { + columnDefs : [ + { name: 'InstanceId',field:'platformId' }, + { name: 'os', displayName:'OS', enableCellEdit: true, type: 'number'}, + { name: 'privateIpAddress', displayName: 'IP Address'}, + { name: 'state', displayName: 'Status'}, + { name: 'Region', displayName: 'Region',field:'providerData.region_name',cellTooltip: true}, + { name: 'Bg Tag Value',width:300, enableCellEdit: true,editableCellTemplate: 'ui-grid/dropdownEditor', + editDropdownOptionsArray: $scope.tagValue}, + { name: 'Project Tag Value', enableCellEdit: true}, + { name: 'Env. Tag Value', enableCellEdit: true} + ] + }; + $rootScope.stateItems = $state.params; + $rootScope.organNewEnt.provider='0'; + $rootScope.organNewEnt.instanceType='unassigned-instances'; + analyticsServices.applyFilter(true,null); + var treeNames = ['Cloud Management','Discovery','Resources']; + $rootScope.$emit('treeNameUpdate', treeNames); + var fltrObj=$rootScope.filterNewEnt; + disResrc.getInstances =function () { + disResrc.gridOptionInstances.data=[]; + if(fltrObj && fltrObj.provider && fltrObj.provider.id) { + var param = { + url: '/providers/' + fltrObj.provider.id +'/'+ $rootScope.organNewEnt.instanceType + }; + genSevs.promiseGet(param).then(function (instResult) { + disResrc.gridOptionInstances.data=instResult.data; + }); + } + }; + $rootScope.applyFilter =function(filterApp,period){ + analyticsServices.applyFilter(true,null); + disResrc.getInstances(); + }; + disResrc.getInstances(); + + }]); +})(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js new file mode 100644 index 000000000..e129a4417 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js @@ -0,0 +1,64 @@ +(function (angular) { + "use strict"; + angular.module('dashboard.analytics') + .controller('discoveryTagMappingCtrl', ['$scope', '$rootScope', '$state','analyticsServices', 'genericServices','$timeout', function ($scope,$rootScope,$state,analyticsServices,genSevs,$timeout){ + var disTgMap=this; + $rootScope.stateItems = $state.params; + $rootScope.organNewEnt.instanceType=false; + $rootScope.organNewEnt.provider='0'; + analyticsServices.applyFilter(true,null); + var treeNames = ['Cloud Management','Discovery','Tag Mapping']; + $rootScope.$emit('treeNameUpdate', treeNames); + $scope.newEnt={}; + var fltrObj=$rootScope.filterNewEnt; + disTgMap.tagOption=[]; + disTgMap.getAllTags =function () { + $scope.newEnt={}; + if(fltrObj && fltrObj.provider && fltrObj.provider.id) { + //$scope.newEnt.providerId = fltrObj.provider.id; + $scope.isLoadingTag = true; + var param = { + inlineLoader: true, + url: '/providers/' + fltrObj.provider.id + '/tags' + }; + genSevs.promiseGet(param).then(function (tagResult) { + $scope.isLoadingTag = false; + disTgMap.tagOption = tagResult; + }); + } + }; + disTgMap.getTagValues= function (type,tagName,valueType) { + if(tagName) { + var param = { + inlineLoader: true, + url: '/providers/' + fltrObj.provider.id + '/tags/' + tagName + }; + genSevs.promiseGet(param).then(function (tagResult) { + $scope.isLoadingTagValue = false; + for (var key in $scope.newEnt[valueType].catalystEntityMapping) { + $scope.newEnt[valueType].catalystEntityMapping[key].tagValues = []; + } + ; + disTgMap[type] = tagResult.values; + }); + } + }; + disTgMap.save =function(){ + console.log($scope.newEnt); + var param = { + inlineLoader: true, + url: '/providers/' + fltrObj.provider.id + '/tags-mappings', + data:$scope.newEnt + }; + genSevs.promisePost(param).then(function (tagResult) { + console.log(tagResult); + }); + }; + $rootScope.applyFilter =function(filterApp,period){ + analyticsServices.applyFilter(true,null); + disTgMap.getAllTags(); + }; + disTgMap.getAllTags(); + + }]); +})(angular); diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js index e06e454a6..fec01faf9 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js @@ -130,7 +130,7 @@ $rootScope.organNewEnt.provider='0'; $rootScope.$emit('INI_usage', 'Unassigned'); $timeout(function(){$rootScope.applyFilter(true,'month')},500); - var treeNames = ['Analytics','Usage']; + var treeNames = ['Cloud Management','Analytics','Usage']; $rootScope.$emit('treeNameUpdate', treeNames); }; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html index 4e1c17730..a0790b787 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.html @@ -2,67 +2,121 @@
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    - - diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html new file mode 100644 index 000000000..bfef10192 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html @@ -0,0 +1,35 @@ +
    + + + + + Instances + +
    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 new file mode 100644 index 000000000..17680da44 --- /dev/null +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryTagMapping.html @@ -0,0 +1,143 @@ +
    + + + + + Business Group + +
    +
    + +
    + + + + + + + +
    +
    +
    +
    +
    + All Business Groups : +
    + + +
    + + + +
    +
    +
    +
    +     + + + + + + + Project + + +
    +
    + +
    + + + + + + + +
    +
    + +
    +
    +
    + All Projects : + +
    +
    + +
    + + + +
    +
    +
    +
    +
    +     + + + + + Environment + +
    +
    + +
    + + + + + + + +
    +
    +
    +
    +
    + All Environments : +
    + +
    + + + +
    +
    +
    +
    +     +     + + + +
    + +
    +
    + +
    +
    +
    diff --git a/client/cat3/src/partials/sections/dashboard/bots/bots.scss b/client/cat3/src/partials/sections/dashboard/bots/bots.scss index 75a7f2895..152523d25 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/bots.scss +++ b/client/cat3/src/partials/sections/dashboard/bots/bots.scss @@ -142,4 +142,73 @@ .bg-red { background-color: #dd4b39 !important; } -} \ No newline at end of file +} + +#botLibraryPage{ + .circle-tile { + margin-bottom: 15px; + text-align: center; + } + + .circle-tile-heading { + position: relative; + width: 80px; + height: 80px; + margin: 10px auto -40px; + border: 3px solid rgba(255,255,255,0.3); + border-radius: 100%; + color: #fff; + padding-top: 16px; + transition: all ease-in-out .3s; + } + + .circle-tile-number { + padding: 5px 0 15px; + font-size: 26px; + font-weight: 700; + line-height: 1; + } + + .circle-tile-content { + padding-top: 50px; + } + + .circle-tile-description { + text-transform: uppercase; + } + + .text-faded { + color: rgba(255,255,255,0.7); + font-weight: bold; + } + + .dark-blue { + background-color: #00c0ef; + } + + .green { + background-color: #00a65a; + } + + .orange { + background-color: #f39c12; + } + + .red { + background-color: #e74c3c; + } + + #botLibraryPage .selected-blue { + border: none !important; + } + + .ui-grid-cell{ + border-right:none !important; + } + + /*global css*/ + .ui-grid .ui-grid-row { + + border-bottom: 1px solid #ccc; + } +} diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js index cb62431a9..3b622b85a 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -43,7 +43,7 @@ ], data:[] }; - var gridBottomSpace = 190; + var gridBottomSpace = 250; $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; $scope.launchInstance = function(launch){ if(launch.launcType === 'task'){ diff --git a/client/cat3/src/partials/sections/dashboard/bots/view/library.html b/client/cat3/src/partials/sections/dashboard/bots/view/library.html index 263da4839..50ccc9785 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -10,47 +10,121 @@
    -
    -
    - - - -
    - Total Number of BOTs - {{botSummary.totalNoOfBots}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    + +
    +
    +
    +
    + Total Number of BOTs +
    +
    + {{botSummary.totalNoOfBots}} + +
    +
    -
    -
    - - - -
    - Number of BOTs running - {{botSummary.totalNoOfRunningBots}} +
    +
    +
    +
    + +
    +
    +
    +
    + Number of BOTs running +
    +
    + {{botSummary.totalNoOfRunningBots}} +
    +
    -
    -
    - - - -
    - Total Time saved - {{totalSavedTimeForBots}} mins +
    +
    +
    +
    + +
    +
    +
    +
    + Total Time saved +
    +
    + {{totalSavedTimeForBots}} mins +
    +
    -
    -
    - - - -
    - Number of failed runs - {{botSummary.totalNoOfFailedBots}} +
    +
    +
    +
    + +
    +
    +
    +
    + Number of failed runs +
    +
    + {{botSummary.totalNoOfFailedBots}} + +
    +
    @@ -61,4 +135,4 @@
    No data Available
    -
    \ No newline at end of file +
    diff --git a/client/cat3/src/partials/sections/dashboard/workzone/application/application.scss b/client/cat3/src/partials/sections/dashboard/workzone/application/application.scss index d551d10b9..ec84cbe4f 100755 --- a/client/cat3/src/partials/sections/dashboard/workzone/application/application.scss +++ b/client/cat3/src/partials/sections/dashboard/workzone/application/application.scss @@ -154,6 +154,7 @@ .ui-grid-cell{ background-color: inherit; border-right: none !important; + border-bottom: none !important; } .ui-grid-row:nth-child(odd) { .ui-grid-cell { diff --git a/client/cat3/src/partials/sections/dashboard/workzone/data/app.json b/client/cat3/src/partials/sections/dashboard/workzone/data/app.json new file mode 100644 index 000000000..e69de29bb diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss index fa4e95d80..7d982f1de 100644 --- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss +++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss @@ -1070,4 +1070,11 @@ $imagePath: "../../../../../../images"; i { color: #40baf1; } +} +#tableView .ui-grid-row > div .ui-grid-cell { + float: left !important; + vertical-align: middle; + height: 55px !important; + padding: 6px !important; + overflow: hidden; } \ No newline at end of file diff --git a/client/cat3/styles/fonts/glyphicons-halflings-regular.ttf b/client/cat3/styles/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 000000000..1413fc609 Binary files /dev/null and b/client/cat3/styles/fonts/glyphicons-halflings-regular.ttf differ diff --git a/client/cat3/styles/fonts/glyphicons-halflings-regular.woff b/client/cat3/styles/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 000000000..9e612858f Binary files /dev/null and b/client/cat3/styles/fonts/glyphicons-halflings-regular.woff differ diff --git a/client/cat3/styles/fonts/glyphicons-halflings-regular.woff2 b/client/cat3/styles/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 000000000..64539b54c Binary files /dev/null and b/client/cat3/styles/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/client/htmls/private/index.html b/client/htmls/private/index.html index 88416a3b1..0648ff0c7 100644 --- a/client/htmls/private/index.html +++ b/client/htmls/private/index.html @@ -50,7 +50,7 @@
    • @@ -827,7 +827,7 @@

    if(checkUrl.indexOf('ajax/Dev.html') !==-1){ console.log('here'); }else{ - window.location.href = "../../cat3/#/dashboard/analytics/cost/"; + window.location.href = "../../cat3/#/dashboard/CM/analytics/cost/"; return false; } } diff --git a/server/app/cronjobs/provider-sync/AWSProviderSync.js b/server/app/cronjobs/provider-sync/AWSProviderSync.js index b21f9f861..a203438a2 100644 --- a/server/app/cronjobs/provider-sync/AWSProviderSync.js +++ b/server/app/cronjobs/provider-sync/AWSProviderSync.js @@ -19,6 +19,7 @@ AWSProviderSync.execute = awsProviderSync; module.exports = AWSProviderSync; +// @TODO Simplify methods function awsProviderSync() { MasterUtils.getAllActiveOrg(function(err, orgs) { if(err) { @@ -190,6 +191,8 @@ function saveEC2Data(ec2Info,provider, callback){ })(ec2Info[i]); }; }; + +//@TODO To be re-factored function tagMappingForInstances(instances,provider,next){ tagsModel.getTagsByProviderId(provider._id, function (err, tagDetails) { if (err) { @@ -203,9 +206,11 @@ function tagMappingForInstances(instances,provider,next){ for (var i = 0; i < tagDetails.length; i++) { if (('catalystEntityType' in tagDetails[i]) && tagDetails[i].catalystEntityType == 'project') { projectTag = tagDetails[i]; - }else if (('catalystEntityType' in tagDetails[i]) && tagDetails[i].catalystEntityType == 'environment') { + }else if (('catalystEntityType' in tagDetails[i]) + && tagDetails[i].catalystEntityType == 'environment') { environmentTag = tagDetails[i]; - }else if (('catalystEntityType' in tagDetails[i]) && tagDetails[i].catalystEntityType == 'bgName') { + }else if (('catalystEntityType' in tagDetails[i]) + && tagDetails[i].catalystEntityType == 'businessGroup') { bgTag = tagDetails[i]; } } @@ -227,31 +232,43 @@ function tagMappingForInstances(instances,provider,next){ if(instance.tags) { if ((bgTag !== null || projectTag !== null || environmentTag !== null) && (instance.isDeleted === false)){ if(bgTag !== null && bgTag.name in instance.tags) { - for (var y = 0; y < bgTag.catalystEntityMapping.length; y++) { - if (bgTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[bgTag.name] !== '' - && bgTag.catalystEntityMapping[y].tagValue === instance.tags[bgTag.name]) { - catalystBgId = bgTag.catalystEntityMapping[y].catalystEntityId; - catalystBgName = bgTag.catalystEntityMapping[y].catalystEntityName; + var entityMappingArray + = Object.keys(bgTag.catalystEntityMapping).map( + function(k){return bgTag.catalystEntityMapping[k]}); + for (var y = 0; y < entityMappingArray.length; y++) { + if (entityMappingArray[y].tagValue !== '' && instance.tags[bgTag.name] !== '' + && 'tagValues' in entityMappingArray[y] + && instance.tags[bgTag.name] in entityMappingArray[y].tagValues) { + catalystBgId = entityMappingArray[y].catalystEntityId; + catalystBgName = entityMappingArray[y].catalystEntityName; break; } } } if(projectTag !== null && projectTag.name in instance.tags) { - for (var y = 0; y < projectTag.catalystEntityMapping.length; y++) { - if (projectTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[projectTag.name] !== '' && - projectTag.catalystEntityMapping[y].tagValue === instance.tags[projectTag.name]) { - catalystProjectId = projectTag.catalystEntityMapping[y].catalystEntityId; - catalystProjectName = projectTag.catalystEntityMapping[y].catalystEntityName; + var entityMappingArray + = Object.keys(projectTag.catalystEntityMapping).map( + function(k){return projectTag.catalystEntityMapping[k]}); + for (var y = 0; y < entityMappingArray.length; y++) { + if (entityMappingArray[y].tagValue !== '' && instance.tags[projectTag.name] !== '' + && 'tagValues' in entityMappingArray[y] + && instance.tags[projectTag.name] in entityMappingArray[y].tagValues) { + catalystProjectId = entityMappingArray[y].catalystEntityId; + catalystProjectName = entityMappingArray[y].catalystEntityName; break; } } } if(environmentTag !== null && environmentTag.name in instance.tags) { - for (var y = 0; y < environmentTag.catalystEntityMapping.length; y++) { - if (environmentTag.catalystEntityMapping[y].tagValue !== '' && instance.tags[environmentTag.name] !== '' && - environmentTag.catalystEntityMapping[y].tagValue === instance.tags[environmentTag.name]) { - catalystEnvironmentId = environmentTag.catalystEntityMapping[y].catalystEntityId; - catalystEnvironmentName = environmentTag.catalystEntityMapping[y].catalystEntityName; + var entityMappingArray + = Object.keys(environmentTag.catalystEntityMapping).map( + function(k){return environmentTag.catalystEntityMapping[k]}); + for (var y = 0; y < entityMappingArray.length; y++) { + if (entityMappingArray[y].tagValue !== '' && instance.tags[environmentTag.name] !== '' + && 'tagValues' in entityMappingArray[y] + && instance.tags[environmentTag.name] in entityMappingArray[y].tagValues) { + catalystEnvironmentId = entityMappingArray[y].catalystEntityId; + catalystEnvironmentName = entityMappingArray[y].catalystEntityName; break; } } diff --git a/server/app/model/tags/tags.js b/server/app/model/tags/tags.js index 2d05dff28..c4439b34d 100644 --- a/server/app/model/tags/tags.js +++ b/server/app/model/tags/tags.js @@ -46,27 +46,11 @@ var TagSchema = new Schema({ }, catalystEntityType: { type: String, - enum: ['project', 'environment','bgName'], + enum: ['project', 'environment', 'businessGroup'], trim: true, required: false }, - catalystEntityMapping: [{ - catalystEntityId: { - type: String, - trim: true, - required: false - }, - catalystEntityName: { - type: String, - trim: true, - required: false - }, - tagValue: { - type: String, - trim: true, - required: false - } - }], + catalystEntityMapping: Schema.Types.Mixed, isDeleted: { type: Boolean, required: true, diff --git a/server/app/routes/v1.0/routes_providercommon.js b/server/app/routes/v1.0/routes_providercommon.js index dc29d85c9..0a01cb85b 100644 --- a/server/app/routes/v1.0/routes_providercommon.js +++ b/server/app/routes/v1.0/routes_providercommon.js @@ -1004,6 +1004,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccess {Object[]} tags List of tags * @apiSuccess {String} tags.name Tag name * @apiSuccess {String} tags.description Tag description + * @apiSuccess {String[]} tags.values Tag values * @apiSuccess {Number} count Number of tags in the result set * @apiSuccess {pageSize} pageSize Page size * @apiSuccess {pageIndex} pageIndex Page index @@ -1015,11 +1016,13 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "tags": [ * { * "name": "env", - * "description": "Deployment environment" + * "description": "Deployment environment", + * "values": ["value1", "value2"] * }, * { * "name": "application", - * "description": "Project name" + * "description": "Project name", + * "values": ["value1", "value2"] * } * ], * "count": 2, @@ -1043,12 +1046,14 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccess {Object} tag Tag details * @apiSuccess {String} tag.name Tag name * @apiSuccess {String} tag.description Tag description + * @apiSuccess {String[]} tag.values Tag values * * @apiSuccessExample {json} Success-Response: * HTTP/1.1 200 OK * { * "name": "environment", - * "description": "Deployment environment" + * "description": "Deployment environment", + * "values": ["value1", "value2"] * } * */ @@ -1067,7 +1072,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiParamExample {json} Request-Example: * { * "name": "environment", - * "description": "Tag description" + * "description": "Tag description", + * "values": ["value1", "value2"] * } * * @apiSuccess {Object} tag Tag details @@ -1078,7 +1084,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * HTTP/1.1 200 OK * { * "name": "environment", - * "description": "Deployment environment" + * "description": "Deployment environment", + * "values": ["value1", "value2"] * } */ // app.post('/providers/:providerId/tags', validate(tagsValidator.create), createTags); @@ -1105,7 +1112,8 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * HTTP/1.1 200 OK * { * "name": "environment", - * "description": "Deployment environment" + * "description": "Deployment environment", + * "values": ["value1", "value2"] * } */ app.put('/providers/:providerId/tags/:tagName', validate(tagsValidator.update), updateTag); @@ -1139,41 +1147,36 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccessExample {json} Success-Response: * HTTP/1.1 200 OK * { - * "tagMappings": [ - * { - * "tagName": "application", - * "tagValues": ["proj1", "proj2"], - * "catalystEntityType": "project", - * "catalystEntityMapping": [ - * { - * "catalystEntityId": "", - * "tagValue": "proj1" - * }, - * { - * "catalystEntityId": "", - * "tagValue": "proj2" - * } - * ] + * "project": { + * "tagName": "application", + * "tagValues": ["proj1", "proj2"], + * "catalystEntityType": "project", + * "catalystEntityMapping": { + * "": { + * "catalystEntityId": "", + * "tagValue": "proj1" * }, - * { - * "tagName": "environment", - * "tagValues": ["prod", "dev"], - * "catalystEntityType": "environment" - * "catalystEntityMapping": [ - * { - * "catalystEntityId": "", - * "tagValue": "dev" - * }, - * { - * "catalystEntityId": "", - * "tagValue": "prod" - * } - * ] + * "": { + * "catalystEntityId": "", + * "tagValue": "proj2" * } - * ], - * "count": 2, - * "pageSize": 10, - * "pageIndex": 1 + * } + * }, + * "environment": { + * "tagName": "environment", + * "tagValues": ["prod", "dev"], + * "catalystEntityType": "environment" + * "catalystEntityMapping": { + * "": { + * "catalystEntityId": "", + * "tagValue": "dev" + * }, + * "": { + * "catalystEntityId": "", + * "tagValue": "prod" + * } + * } + * } * } */ // @TODO Response should match doc @@ -1201,18 +1204,18 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * HTTP/1.1 200 OK * { * "name": "application", - * "values": ["proj1", "proj2"] + * "values": ["proj1", "proj2"], * "catalystEntityType": "project", - * "catalystEntityMapping": [ - * { + * "catalystEntityMapping": { + * "": { * "catalystEntityId": "", * "tagValue": "proj1" * }, - * { + * "": { * "catalystEntityId": "", * "tagValue": "proj2" * } - * ] + * } * } */ app.get('/providers/:providerId/tag-mappings/:catalystEntityType', validate(tagsValidator.tagsMapping), @@ -1226,25 +1229,44 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiParam {Number} providerId Provider ID * @apiParam {Object[]} tagMappings Tag mappings * @apiParam {String} tagMappings.tagName Tag name - * @apiParam {String[]} tagMappings.tagValues Tag values * @apiSuccess {Object[]} tagMappings.catalystEntityType Catalyst entity type * @apiSuccess {String} tagNameMapping.catalystEntityMapping.catalystEntityId Catalyst entity id * @apiSuccess {String} tagNameMapping.catalystEntityMapping.tagValue Tag value * @apiParamExample {json} Request-Example: - * [ - * { - * "tagName": "application", - * "tagValues": [], + * { + * "project": { + * "tagName": "application" * "catalystEntityType": "project", - * "catalystEntityMapping": [] + * "catalystEntityMapping": { + * "": { + * "catalystEntityId": "", + * "catalystEntityName": "project 1", + * "tagValues": ["proj1"] + * }, + * "": { + * "catalystEntityId": "", + * "catalystEntityName": "project 2", + * "tagValues": ["proj2"] + * } + * } * }, - * { + * "environment": { * "tagName": "env", - * "tagValues": [], * "catalystEntityType": "environment", - * "catalystEntityMapping": [] + * "catalystEntityMapping": { + * "": { + * "catalystEntityId": "", + * "catalystEntityName": "Environment 1", + * "tagValues": ["env1"] + * }, + * "": { + * "catalystEntityId": "", + * "catalystEntityName": "Environment 2", + * "tagValues": ["env2"] + * } + * } * } - * ] + * } * * @apiSuccess {Object[]} tags Tags * @apiSuccess {String} tagMappings Tag mappings @@ -1258,20 +1280,41 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccessExample {json} Success-Response: * HTTP/1.1 201 OK * { - * "tagMappings": [ - * { - * "name": "application", - * "values": ["proj1", "proj2"], - * "catalystEntityType": "project", - * "catalystEntityMapping": [] + * "project": { + * "name": "application", + * "values": ["proj1", "proj2"], + * "catalystEntityType": "project", + * "catalystEntityMapping": { + * "": { + * "catalystEntityId": "", + * "catalystEntityName": "project 1", + * "tagValues": ["proj1"] + * }, + * "": { + * "catalystEntityId": "", + * "catalystEntityName": "project 2", + * "tagValues": ["proj2"] + * } + * } + * }, + * "environment": { + * "name": "environment", + * "values": ["prod", "dev"], + * "catalystEntityType": "environment", + * "catalystEntityMapping": { + * "": { + * "catalystEntityId": "", + * "catalystEntityName": "Environment 1", + * "tagValues": ["env1"] * }, - * { - * "name": "environment", - * "values": ["prod", "dev"], - * "catalystEntityType": "environment" - * "catalystEntityMapping": [] + * "": { + * "catalystEntityId": "", + * "catalystEntityName": "Environment 2", + * "tagValues": ["env2"] * } - * ] + * } + * } + * * } */ app.post('/providers/:providerId/tag-mappings', validate(tagsValidator.list), addTagMappings); @@ -1290,19 +1333,18 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * @apiSuccess {String} tagMapping.catalystEntityMapping.tagValue Tag value * @apiParamExample {json} Request-Example: * { - * "catalystEntityMapping": [ - * { + * "catalystEntityMapping": { + * "": { * "catalystEntityId": "", * "catalystEntityName": "project 1", - * "tagValue": "proj1" + * "tagValues": ["proj1"] * }, - * { + * "": { * "catalystEntityId": "", * "catalystEntityName": "project 2", - * "tagValue": "proj2" - * + * "tagValues": ["proj2"] * } - * ] + * } * } * * @apiSuccess {Object} tagMapping Tag mapping @@ -1319,19 +1361,19 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { * "tagName": "application", * "tagValues": ["proj1", "proj2"], * "catalystEntityType": "project", - * "catalystEntityMapping": [ - * { + * "catalystEntityMapping": { + * "": { * "catalystEntityId": "", * "catalystEntityName": "project 1", - * "tagValue": "proj1" + * "tagValues": ["proj2", "Proj2"] * }, - * { + * "": { * "catalystEntityId": "", * "catalystEntityName": "project 2", - * "tagValue": "proj2" + * "tagValues": ["proj2", "Proj2"] * * } - * ] + * } * } */ app.patch('/providers/:providerId/tag-mappings/:catalystEntityType', validate(tagsValidator.tagsMapping), @@ -1514,7 +1556,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { app.patch('/providers/:providerId/unassigned-instances', validate(instanceValidator.get), bulkUpdateUnassignedInstances); - function getTagsList(req, res, next) { + function getTagsList(req, res, callback) { async.waterfall( [ @@ -1526,7 +1568,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1534,7 +1576,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ); } - function getUnassignedInstancesList(req, res, next) { + function getUnassignedInstancesList(req, res, callback) { var reqData = {}; async.waterfall( [ @@ -1560,16 +1602,13 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) - next(err); + callback(err); else return res.status(200).send(results); }); } - ; - - - function getTag(req, res, next) { + function getTag(req, res, callback) { async.waterfall( [ @@ -1583,7 +1622,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1594,7 +1633,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { // @TODO to be implemented function createTags(req, res, next) {} - function updateTag(req, res, next) { + function updateTag(req, res, callback) { async.waterfall( [ @@ -1612,7 +1651,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1620,7 +1659,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ); } - function deleteTag(req, res, next) { + function deleteTag(req, res, callback) { async.waterfall( [ @@ -1633,7 +1672,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1641,7 +1680,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ); } - function getTagMappingsList(req, res, next) { + function getTagMappingsList(req, res, callback) { async.waterfall( [ @@ -1653,7 +1692,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1661,7 +1700,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ); } - function getTagMapping(req, res, next) { + function getTagMapping(req, res, callback) { async.waterfall( [ @@ -1676,7 +1715,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1684,7 +1723,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ); } - function addTagMappings(req, res, next) { + function addTagMappings(req, res, callback) { async.waterfall( [ @@ -1698,7 +1737,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(201).send(results); } @@ -1707,7 +1746,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { } - function updateTagMapping(req, res, next) { + function updateTagMapping(req, res, callback) { async.waterfall( [ function (next) { @@ -1720,14 +1759,14 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { function (tag, next) { providerService.updateTagMapping(tag, req.body, next); }, - function (tag, next) { + /*function (tag, next) { providerService.getTagByNameAndProvider(req.params.providerId, tag.name, next); - }, + },*/ providerService.createTagMappingObject ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1735,7 +1774,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ); } - function deleteTagMapping(req, res, next) { + function deleteTagMapping(req, res, callback) { async.waterfall( [ @@ -1748,7 +1787,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1756,7 +1795,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ); } - function getCatalystEntityMapping(req, res, next) { + function getCatalystEntityMapping(req, res, callback) { async.waterfall( [ @@ -1773,7 +1812,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1781,7 +1820,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ); } - function updateUnassignedInstanceTags(req, res, next) { + function updateUnassignedInstanceTags(req, res, callback) { async.waterfall( [ function (next) { @@ -1808,7 +1847,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } @@ -1816,7 +1855,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ); } - function bulkUpdateUnassignedInstances(req, res, next) { + function bulkUpdateUnassignedInstances(req, res, callback) { async.waterfall( [ function (next) { @@ -1837,7 +1876,7 @@ module.exports.setRoutes = function (app, sessionVerificationFunc) { ], function (err, results) { if (err) { - next(err); + callback(err); } else { return res.status(200).send(results); } diff --git a/server/app/services/providerService.js b/server/app/services/providerService.js index 6dcab6b74..ed2326b57 100644 --- a/server/app/services/providerService.js +++ b/server/app/services/providerService.js @@ -21,6 +21,7 @@ var providersModel = require('_pr/model/v2.0/providers/providers'); var gcpProviderModel = require('_pr/model/v2.0/providers/gcp-providers'); var appConfig = require('_pr/config'); var Cryptography = require('_pr/lib/utils/cryptography'); +var async = require('async'); const errorType = 'provider'; @@ -307,7 +308,8 @@ providerService.getTagMappingsByProviderId providerService.getTagByCatalystEntityTypeAndProvider = function getTagByCatalystEntityTypeAndProvider(providerId, catalystEntityType, callback) { // @TODO entity types to be moved to config - if((catalystEntityType != 'project') && (catalystEntityType != 'environment') && (catalystEntityType != 'bgName')) { + if((catalystEntityType != 'project') && (catalystEntityType != 'environment') + && (catalystEntityType != 'businessGroup')) { var err = new Error('Malformed Request'); err.status = 400; return callback(err); @@ -371,134 +373,139 @@ providerService.updateTag = function updateTag(provider, tagDetails, callback) { // @TODO Update conflict based on tag names should be handled // @TODO Nested callbacks to be handled providerService.addMultipleTagMappings = function addMultipleTagMappings(providerId, tagMappings, callback) { - if(tagMappings.length < 1) { - return callback(null, []); + if(tagMappings == null) { + return callback(null, {}); } - logger.debug(tagMappings.length); - var tagNames = []; - for(var i = 0; i < tagMappings.length; i++) { - (function(tagMapping) { - if (!('tagName' in tagMapping) || !('catalystEntityType' in tagMapping)) { - var err = new Error('Malformed Request'); + var tagsList = []; + async.forEach(Object.keys(tagMappings), + function(catalystEntityType, next1) { + var tagMapping = tagMappings[catalystEntityType]; + + if (['project', 'environment', 'businessGroup'].indexOf(catalystEntityType ) < 0) { + var err = new Error('Invalid Request'); err.status = 400; - return callback(err); + return next1(err); } - // @TODO entity types to be moved to config - if ((tagMapping.catalystEntityType != 'project') - && (tagMapping.catalystEntityType != 'environment') && (tagMapping.catalystEntityType != 'bgName')) { + if (!('tagName' in tagMapping)) { var err = new Error('Malformed Request'); err.status = 400; - return callback(err); + return next1(err); } - var deleteParams = { - 'providerId': providerId, - 'catalystEntityType': tagMapping.catalystEntityType - }; - var deleteFields = { - 'catalystEntityType': null, - 'catalystEntityMapping': [] - }; - tagsModel.updateTag(deleteParams, deleteFields, function (err, tag) { - - if (err) { - var err = new Error('Internal server error'); - err.status = 500; - return callback(err); - } else { - - tagNames.push(tagMapping.tagName); - var params = { + async.waterfall([ + function(next2) { + var deleteParams = { 'providerId': providerId, - 'name': tagMapping.tagName + 'catalystEntityType': catalystEntityType }; - var fields = { - 'catalystEntityType': tagMapping.catalystEntityType + var deleteFields = { + 'catalystEntityType': null, + 'catalystEntityMapping': {} }; - tagsModel.updateTag(params, fields, function (err, tag) { - if (err) { - var err = new Error('Internal server error'); - err.status = 500; - return callback(err); - } else if (!tag) { - var err = new Error('Tag not found'); - err.status = 404; - return callback(err); - } - }); - + tagsModel.updateTag(deleteParams, deleteFields, next2) + }, + function(tagDeleted, next2) { + providerService.getTagByNameAndProvider(providerId, + tagMapping.tagName, next2); + }, + function(tagDetails, next2) { + providerService.updateTagMapping(tagDetails, catalystEntityType, + tagMapping, next2); } - - }); - })(tagMappings[i]); - } - - if(tagNames.length > 0) { - return tagsModel.getTagsByProviderIdAndNames(providerId, tagNames, callback); - } else { - return callback(null, []); - } + ], function(err, tagDetails) { + if(err) { + var err = new Error('Internal server error'); + err.status = 500; + return next1(err); + } else { + tagsList.push(tagDetails); + return next1(); + } + }) + }, + function(err) { + if(err) { + return callback(err); + } else { + return callback(null, tagsList); + } + } + ); }; -providerService.updateTagMapping = function updateTagMapping(tagDetails, tagMapping, callback) { +providerService.updateTagMapping = function updateTagMapping(tagDetails, catalystEntityType, tagMapping, callback) { if(!('tagName' in tagMapping) && !('catalystEntityMapping' in tagMapping)) { var err = new Error('Malformed Request'); err.status = 400; return callback(err); } + if(!('values' in tagDetails)) { var err = new Error('Invalid Request'); err.status = 400; return callback(err); } - var catalystEntityMappingList = []; - for(var i = 0; i < tagMapping.catalystEntityMapping.length; i++) { - if(!('tagValue' in tagMapping.catalystEntityMapping[i]) - || !('catalystEntityId' in tagMapping.catalystEntityMapping[i]) - || !('catalystEntityName' in tagMapping.catalystEntityMapping[i])) { - var err = new Error('Malformed Request'); - err.status = 400; - return callback(err); - } - - if((tagMapping.catalystEntityMapping[i].tagValue) - && (tagDetails.values.indexOf(tagMapping.catalystEntityMapping[i].tagValue) < 0)) { - var err = new Error('Tag value not found'); - err.status = 404; - return callback(err); - } + tagDetails.toObject(); + var catalystEntityMappings = {}; + async.forEach(Object.keys(tagMapping.catalystEntityMapping), + function(catalystEntityId, next) { + if(!('tagValues' in tagMapping.catalystEntityMapping[catalystEntityId]) + || !('catalystEntityId' in tagMapping.catalystEntityMapping[catalystEntityId]) + || !('catalystEntityName' in tagMapping.catalystEntityMapping[catalystEntityId])) { + var err = new Error('Malformed Request'); + err.status = 400; + return next(err); + } - catalystEntityMappingList.push({ - 'tagValue': tagMapping.catalystEntityMapping[i].tagValue, - 'catalystEntityId': tagMapping.catalystEntityMapping[i].catalystEntityId, - 'catalystEntityName': tagMapping.catalystEntityMapping[i].catalystEntityName - }); - } + // Tag value validation to be added + /*if((tagMapping.catalystEntityMapping[catalystEntityId].tagValue) + && (tagDetails.values.indexOf(tagMapping.catalystEntityMapping[catalystEntityId].tagValue) < 0)) { + var err = new Error('Tag value not found'); + err.status = 404; + next(err); + }*/ + + catalystEntityMappings[catalystEntityId] = { + 'tagValues': tagMapping.catalystEntityMapping[catalystEntityId].tagValues, + 'catalystEntityId': tagMapping.catalystEntityMapping[catalystEntityId].catalystEntityId, + 'catalystEntityName': tagMapping.catalystEntityMapping[catalystEntityId].catalystEntityName + } - var params = { - 'providerId': tagDetails.providerId, - 'name': tagDetails.name - }; - var fields = { - 'catalystEntityMapping': catalystEntityMappingList - }; - tagsModel.updateTag(params, fields, function(err, tag) { - if(err) { - var err = new Error('Internal server error'); - err.status = 500; - return callback(err); - } else if(!tag) { - var err = new Error('Tag not found'); - err.status = 404; - return callback(err); - }else { - tagDetails.catalystEntityMapping = catalystEntityMappingList; - return callback(null, tagDetails); + return next(); + }, + function(err) { + if(err) { + return callback(err); + } else { + var params = { + 'providerId': tagDetails.providerId, + 'name': tagDetails.name + }; + var fields = { + 'catalystEntityType': catalystEntityType, + 'catalystEntityMapping': catalystEntityMappings + }; + tagsModel.updateTag(params, fields, function(err, tag) { + if(err) { + var err = new Error('Internal server error'); + err.status = 500; + return callback(err); + } else if(!tag) { + var err = new Error('Tag not found'); + err.status = 404; + return callback(err); + }else { + tagDetails.catalystEntityType = catalystEntityType; + tagDetails.catalystEntityMapping = catalystEntityMappings; + return callback(null, tagDetails); + } + }); + } } - }); + ); }; providerService.updateCatalystEntityMapping @@ -606,7 +613,8 @@ providerService.createTagsList = function createTagsList(tags, callback) { tags.forEach(function(tag) { tagsList.push({ 'name': tag.name, - 'description': tag.description?tag.description:null + 'description': tag.description?tag.description:null, + 'values': tag.values?tag.values:[] }); }); tagsListObject.tags = tagsList; @@ -617,34 +625,28 @@ providerService.createTagsList = function createTagsList(tags, callback) { providerService.createTagObject = function createTagObject(tag, callback) { var tagObject = { 'name': tag.name, - 'description': tag.description?tag.description:null + 'description': tag.description?tag.description:null, + 'values': tag.values?tag.values:[] }; return callback(null, tagObject); }; providerService.createTagMappingList = function createTagMappingList(tags, callback) { - var tagMappingsListObject = {}; - var tagMappingsList = []; - tags.forEach(function(tag) { - if(tag.catalystEntityType) { - var tagMapping = { + var tagMappingsList = tags.reduce(function(result, tag) { + if(('catalystEntityType' in tag) && (tag.catalystEntityType != null)) { + result[tag.catalystEntityType] = { 'tagName': tag.name, 'tagValues': tag.values ? tag.values.sort(function (a, b) { - return a.toLowerCase().localeCompare(b.toLowerCase()); - }) : [], + return a.toLowerCase().localeCompare(b.toLowerCase()); + }) : [], 'catalystEntityType': tag.catalystEntityType ? tag.catalystEntityType : null, - 'catalystEntityMapping': tag.catalystEntityMapping ? tag.catalystEntityMapping : [] + 'catalystEntityMapping': tag.catalystEntityMapping ? tag.catalystEntityMapping : {} }; - for (var i = 0; i < tagMapping.catalystEntityMapping.length; i++) { - delete tagMapping.catalystEntityMapping[i]._id; - } - tagMappingsList.push(tagMapping); } - }); + return result; + }, {}); - tagMappingsListObject.tagMappings = tagMappingsList; - - return callback(null, tagMappingsList); + callback(null, tagMappingsList); }; providerService.createTagMappingObject = function createTagMappingObject(tag, callback) { @@ -654,11 +656,8 @@ providerService.createTagMappingObject = function createTagMappingObject(tag, ca return a.toLowerCase().localeCompare(b.toLowerCase()); }) : [], 'catalystEntityType': tag.catalystEntityType?tag.catalystEntityType : null, - 'catalystEntityMapping': tag.catalystEntityMapping?tag.catalystEntityMapping : [] + 'catalystEntityMapping': tag.catalystEntityMapping?tag.catalystEntityMapping : {} }; - for (var i = 0; i < tagMappingObject.catalystEntityMapping.length; i++) { - delete tagMappingObject.catalystEntityMapping[i]._id; - } return callback(null, tagMappingObject); }; \ No newline at end of file