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 dce92b810..64a33c60e 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 527ec017d..538102361 100644 --- a/client/cat3/src/clientRoutes.js +++ b/client/cat3/src/clientRoutes.js @@ -71,7 +71,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", resolve: { 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/botExecutionLogsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js index 6748b5692..533f36624 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/botExecutionLogsCtrl.js @@ -8,7 +8,7 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('botExecutionLogsCtrl', ['$q', '$scope', '$timeout', 'items', function ($q, $scope, $timeout, items) { + .controller('botExecutionLogsCtrl', ['$q', '$scope', '$timeout', 'items','$modalInstance', function ($q, $scope, $timeout, items,$modalInstance) { console.log(items); $scope.parentItemDetail=items; var botExecLogCtrl={}; diff --git a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js index fc7e3a947..01283672c 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/editParamsCtrl.js @@ -8,174 +8,174 @@ (function (angular) { "use strict"; angular.module('library.params', []) - .controller('editParamsCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', 'responseFormatter', '$modal', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, responseFormatter, $modal) { - console.log(items); - $scope.botName = items.botName; - $scope.taskType = items.botLinkedSubCategory; - $scope.taggingServerList=[]; - $scope.envOptions=[]; - workzoneServices.getTaggingServer().then(function (topSer) { - $scope.taggingServerList=topSer.data; - }); - $scope.chefAttributesFlag = false; - $scope.scriptParamsFlag = false; - if(items.botConfig && items.botConfig.runlist && items.botConfig.runlist.length) { - $scope.chefAttributesFlag = true; - } - if(items.botLinkedSubCategory === 'script' && items.botConfig) { - for (var i=0; i 0) { - $scope.scriptParamsFlag = true; - } + .controller('editParamsCtrl',['$scope', '$rootScope', 'genericServices', 'workzoneServices', 'toastr', '$modalInstance', 'items', 'responseFormatter', '$modal', function ($scope, $rootScope, genSevs, workzoneServices, toastr, $modalInstance, items, responseFormatter, $modal) { + console.log(items); + $scope.botName = items.botName; + $scope.taskType = items.botLinkedSubCategory; + $scope.taggingServerList=[]; + $scope.envOptions=[]; + workzoneServices.getTaggingServer().then(function (topSer) { + $scope.taggingServerList=topSer.data; + }); + $scope.chefAttributesFlag = false; + $scope.scriptParamsFlag = false; + if(items.botConfig && items.botConfig.runlist && items.botConfig.runlist.length) { + $scope.chefAttributesFlag = true; } - } - $scope.isChefattributesLoading = true; - if (items.botLinkedSubCategory === 'chef' && items.botConfig) { - $scope.chefComponentSelectorList = responseFormatter.findDataForEditValue(items.botConfig.runlist); - var nodesList = responseFormatter.chefRunlistFormatter($scope.chefComponentSelectorList); - $scope.chefattributes = []; - $scope.chefattributes = responseFormatter.formatSavedCookbookAttributes(items.botConfig.attributes); - workzoneServices.getCookBookListForOrg(items.masterDetails.orgId).then(function(data){ - var runlist = []; - for (var i = 0; i < nodesList.length; i++) { - if (nodesList[i].className === "cookbook" || nodesList[i].className === "deploy") { - runlist.push(nodesList[i].value); + if(items.botLinkedSubCategory === 'script' && items.botConfig) { + for (var i=0; i 0) { + $scope.scriptParamsFlag = true; } } - if (runlist.length > 0) { - workzoneServices.getcookBookAttributes(runlist, data.data.serverId).then(function (response) { - var data; - if (response.data) { - data = response.data; - } else { - data = response; + } + $scope.isChefattributesLoading = true; + if (items.botLinkedSubCategory === 'chef' && items.botConfig) { + $scope.chefComponentSelectorList = responseFormatter.findDataForEditValue(items.botConfig.runlist); + var nodesList = responseFormatter.chefRunlistFormatter($scope.chefComponentSelectorList); + $scope.chefattributes = []; + $scope.chefattributes = responseFormatter.formatSavedCookbookAttributes(items.botConfig.attributes); + workzoneServices.getCookBookListForOrg(items.masterDetails.orgId).then(function(data){ + var runlist = []; + for (var i = 0; i < nodesList.length; i++) { + if (nodesList[i].className === "cookbook" || nodesList[i].className === "deploy") { + runlist.push(nodesList[i].value); } - /*Scope apply done to force refresh screen after receiving the AJAX response*/ - $scope.$apply(function () { - if ($scope.chefattributes) { - for (var j = 0; j < data.length; j++) { - for (var attrItem in data[j].attributes) { - if ($scope.chefattributes[attrItem]) { - data[j].attributes[attrItem].default = $scope.chefattributes[attrItem]; + } + if (runlist.length > 0) { + workzoneServices.getcookBookAttributes(runlist, data.data.serverId).then(function (response) { + var data; + if (response.data) { + data = response.data; + } else { + data = response; + } + /*Scope apply done to force refresh screen after receiving the AJAX response*/ + $scope.$apply(function () { + if ($scope.chefattributes) { + for (var j = 0; j < data.length; j++) { + for (var attrItem in data[j].attributes) { + if ($scope.chefattributes[attrItem]) { + data[j].attributes[attrItem].default = $scope.chefattributes[attrItem]; + } } } } - } - $scope.chefattributes = data; - $scope.isChefattributesLoading = false; + $scope.chefattributes = data; + $scope.isChefattributesLoading = false; + }); }); - }); - } - }); - } - if (items.botConfig) { - $scope.jenkinsparams = items.botConfig.parameterized; - $scope.scriptparams = items.botConfig.scriptDetails; - } - $scope.parameters=['']; - var cookbookAttributes = []; - var scriptParams = []; - var choiceParam = {}; - $scope.jenparams = {}; - - var helper = { - botLogModal: function(id,historyId,taskType) { - $modal.open({ - animation: true, - templateUrl: 'src/partials/sections/dashboard/bots/view/botExecutionLogs.html', - controller: 'botExecutionLogsCtrl as botExecLogCtrl', - backdrop: 'static', - keyboard: false, - resolve: { - items: function() { - return { - taskId: id, - historyId: historyId, - taskType: taskType - }; - } } }); } - }; + if (items.botConfig) { + $scope.jenkinsparams = items.botConfig.parameterized; + $scope.scriptparams = items.botConfig.scriptDetails; + } + $scope.parameters=['']; + var cookbookAttributes = []; + var scriptParams = []; + var choiceParam = {}; + $scope.jenparams = {}; - $scope.add = function() { - $scope.parameters.push(''); - }; + var helper = { + botLogModal: function(id,historyId,taskType) { + $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/bots/view/botExecutionLogs.html', + controller: 'botExecutionLogsCtrl as botExecLogCtrl', + backdrop: 'static', + keyboard: false, + resolve: { + items: function() { + return { + taskId: id, + historyId: historyId, + taskType: taskType + }; + } + } + }); + } + }; - $scope.removeScriptInputParams = function(paramInput) { - if($scope.parameters.length > 1){ - var idx = $scope.parameters.indexOf(paramInput); - $scope.parameters.splice(idx,1); - }else{ - toastr.error('Cannot delete the row'); - } - }; + $scope.add = function() { + $scope.parameters.push(''); + }; - $scope.executeBot=function(){ - if (items.botConfig && items.botConfig.taskType === 'script') { - var checkParam = false; - if ($scope.scriptParamsFlag) { - for(var i =0; i<$scope.parameters.length; i++){ - if($scope.parameters[i] === '' || $scope.parameters[i] === null){ - checkParam = false; - toastr.error('Please enter parameters'); - return false; - } else { - checkParam = true; + $scope.removeScriptInputParams = function(paramInput) { + if($scope.parameters.length > 1){ + var idx = $scope.parameters.indexOf(paramInput); + $scope.parameters.splice(idx,1); + }else{ + toastr.error('Cannot delete the row'); + } + }; + + $scope.executeBot=function(){ + if (items.botConfig && items.botConfig.taskType === 'script') { + var checkParam = false; + if ($scope.scriptParamsFlag) { + for(var i =0; i<$scope.parameters.length; i++){ + if($scope.parameters[i] === '' || $scope.parameters[i] === null){ + checkParam = false; + toastr.error('Please enter parameters'); + return false; + } else { + checkParam = true; + } } } + if(checkParam){ + scriptParams = $scope.parameters; + } } - if(checkParam){ - scriptParams = $scope.parameters; - } - } - if (items.botConfig && items.botConfig.taskType === 'chef') { - cookbookAttributes = responseFormatter.formatSelectedCookbookAttributes($scope.chefattributes); - } - if (items.botConfig && items.botConfig.taskType === 'jenkins') { - choiceParam = $scope.jenparams; - } - $scope.executeBot(); - }; - - $scope.executeBot = function(){ - var reqBody = {}; - if (items.botConfig && items.botConfig.taskType === 'jenkins') { - reqBody.choiceParam = choiceParam; - } else if (items.botConfig && items.botConfig.taskType === 'chef'){ - reqBody.tagServer = $scope.tagSerSelected; - if ($scope.chefAttributesFlag) { - reqBody.cookbookAttributes = cookbookAttributes; + if (items.botConfig && items.botConfig.taskType === 'chef') { + cookbookAttributes = responseFormatter.formatSelectedCookbookAttributes($scope.chefattributes); } - } else if (items.botConfig && items.botConfig.taskType === 'script') { - reqBody.tagServer = $scope.tagSerSelected; - if ($scope.scriptParamsFlag) { - reqBody.scriptParams = scriptParams; + if (items.botConfig && items.botConfig.taskType === 'jenkins') { + choiceParam = $scope.jenparams; } - } - var param={ - url:'/bots/' + items.botId + '/execute', - data: reqBody + $scope.executeBot(); }; - genSevs.promisePost(param).then(function (response) { - console.log(response); - $modalInstance.close(response.data); - $rootScope.$emit('BOTS_LIBRARY_REFRESH'); - helper.botLogModal(items.botId, response.historyId, response.taskType); - }, - function (error) { - error = error.responseText || error; - if (error.message) { - toastr.error(error.message); - } else { - toastr.error(error); + + $scope.executeBot = function(){ + var reqBody = {}; + if (items.botConfig && items.botConfig.taskType === 'jenkins') { + reqBody.choiceParam = choiceParam; + } else if (items.botConfig && items.botConfig.taskType === 'chef'){ + reqBody.tagServer = $scope.tagSerSelected; + if ($scope.chefAttributesFlag) { + reqBody.cookbookAttributes = cookbookAttributes; + } + } else if (items.botConfig && items.botConfig.taskType === 'script') { + reqBody.tagServer = $scope.tagSerSelected; + if ($scope.scriptParamsFlag) { + reqBody.scriptParams = scriptParams; + } } - }); - }; + var param={ + url:'/bots/' + items.botId + '/execute', + data: reqBody + }; + genSevs.promisePost(param).then(function (response) { + console.log(response); + $modalInstance.close(response.data); + $rootScope.$emit('BOTS_LIBRARY_REFRESH'); + helper.botLogModal(items.botId, response.historyId, response.taskType); + }, + function (error) { + error = error.responseText || error; + if (error.message) { + toastr.error(error.message); + } else { + toastr.error(error); + } + }); + }; - $scope.cancel= function() { - $modalInstance.dismiss('cancel'); - }; - }]); + $scope.cancel= function() { + $modalInstance.dismiss('cancel'); + }; + }]); })(angular); \ No newline at end of file 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 8206a3c97..5f767e910 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/bots/controller/libraryCtrl.js @@ -8,296 +8,296 @@ (function (angular) { "use strict"; angular.module('dashboard.bots') - .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', 'uiGridOptionsService', '$timeout', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal, uiGridOptionsService, $timeout) { - var treeNames = ['BOTs','Library']; - $rootScope.$emit('treeNameUpdate', treeNames); - var lib=this; - $scope.totalBotsSelected = true; - var botLibraryUIGridDefaults = uiGridOptionsService.options(); - $scope.paginationParams = botLibraryUIGridDefaults.pagination; - $scope.paginationParams=[]; - $scope.paginationParams.sortBy = 'createdOn'; - $scope.paginationParams.sortOrder = 'desc'; - console.log($scope.paginationParams.sortBy); - - $scope.initGrids = function(){ - $scope.botLibGridOptions={ - enableFiltering: false - }; - $scope.botLibGridOptions.columnDefs= [ - { name:'Task Type', field:'botLinkedSubCategory' ,cellTemplate:'row.entity.taskType'+ + .controller('libraryCtrl',['$scope', '$rootScope', '$state', 'genericServices', 'confirmbox', 'toastr', 'workzoneUIUtils', '$modal', 'uiGridOptionsService', '$timeout', function ($scope, $rootScope, $state, genSevs, confirmbox, toastr, workzoneUIUtils, $modal, uiGridOptionsService, $timeout) { + var treeNames = ['BOTs','Library']; + $rootScope.$emit('treeNameUpdate', treeNames); + var lib=this; + $scope.totalBotsSelected = true; + var botLibraryUIGridDefaults = uiGridOptionsService.options(); + $scope.paginationParams = botLibraryUIGridDefaults.pagination; + $scope.paginationParams=[]; + $scope.paginationParams.sortBy = 'createdOn'; + $scope.paginationParams.sortOrder = 'desc'; + console.log($scope.paginationParams.sortBy); + + $scope.initGrids = function(){ + $scope.botLibGridOptions={ + enableFiltering: false + }; + $scope.botLibGridOptions.columnDefs= [ + { name:'Task Type', field:'botLinkedSubCategory' ,cellTemplate:'row.entity.taskType'+ 'row.entity.botLinkedSubCategory'+ 'row.entity.taskType'+ 'row.entity.botType',cellTooltip: true}, - { name: 'BOT Type',displayName: 'BOT Type',field:'botLinkedCategory',cellTooltip: true}, - { name: 'BOT Name',displayName: 'BOT Name',field:'botName',cellTooltip: true}, - { name: 'Category',field:'botCategory',cellTooltip: true}, - { name: 'description',field:'botDesc',cellTooltip: true}, - { name: 'Org',field:'masterDetails.orgName',cellTooltip: true}, - { name: 'Total Runs',field:'executionCount'}, - { name: 'BOT History',displayName: 'BOT History',cellTemplate:'NA'+ + { name: 'BOT Type',displayName: 'BOT Type',field:'botLinkedCategory',cellTooltip: true}, + { name: 'BOT Name',displayName: 'BOT Name',field:'botName',cellTooltip: true}, + { name: 'Category',field:'botCategory',cellTooltip: true}, + { name: 'description',field:'botDesc',cellTooltip: true}, + { name: 'Org',field:'masterDetails.orgName',cellTooltip: true}, + { name: 'Total Runs',field:'executionCount'}, + { name: 'BOT History',displayName: 'BOT History',cellTemplate:'NA'+ ''}, - { name: 'BOT Info',displayName: 'BOT Info',cellTemplate: - ''}, - { name: 'BOT Action',displayName: 'BOT Action',cellTemplate: + { name: 'BOT Info',displayName: 'BOT Info',cellTemplate: + ''}, + { name: 'BOT Action',displayName: 'BOT Action',cellTemplate: '' + '' + '' - } - ] - $scope.botLibGridOptions.data=[]; - angular.extend($scope.botLibGridOptions,botLibraryUIGridDefaults.gridOption); - }; - $scope.initGrids(); - /*APIs registered are triggered as ui-grid is configured - for server side(external) pagination.*/ - angular.extend($scope.botLibGridOptions,botLibraryUIGridDefaults.gridOption, { - onRegisterApi :function(gridApi) { - $scope.gridApi = gridApi; - 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; - $scope.botLibraryGridView(); } + ] + $scope.botLibGridOptions.data=[]; + angular.extend($scope.botLibGridOptions,botLibraryUIGridDefaults.gridOption); + }; + $scope.initGrids(); + /*APIs registered are triggered as ui-grid is configured + for server side(external) pagination.*/ + angular.extend($scope.botLibGridOptions,botLibraryUIGridDefaults.gridOption, { + onRegisterApi :function(gridApi) { + $scope.gridApi = gridApi; + 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; + $scope.botLibraryGridView(); + } + }); + //Pagination for page and pageSize + gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { + $scope.paginationParams.page = newPage; + $scope.paginationParams.pageSize = pageSize; + $scope.botLibraryGridView(); + }); + }, + }); + $scope.setPaginationDefaults = function() { + $scope.paginationParams.sortBy = 'createdOn'; + $scope.paginationParams.sortOrder = 'desc'; + /*if($scope.paginationParams.page !== 1){ + $scope.setFirstPageView();//if current page is not 1, then ui grid will trigger a call when set to 1. + }else{ + $scope.botLibraryGridView(); + }*/ + }; + $scope.setPaginationDefaults(); + $scope.botLibraryGridView = function() { + lib.gridOptions=[]; + var param={ + url:'/bots?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + }; + genSevs.promiseGet(param).then(function (result) { + $timeout(function() { + console.log(result); + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); + $scope.isBotLibraryPageLoading = false; + }, function(error) { + $scope.isBotLibraryPageLoading = false; + console.log(error); + $scope.errorMessage = "No Records found"; }); - //Pagination for page and pageSize - gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) { - $scope.paginationParams.page = newPage; - $scope.paginationParams.pageSize = pageSize; - $scope.botLibraryGridView(); + }; + $scope.botLibraryGridView(); + $scope.searchBotNameCategory = function() { + $scope.searchString = $scope.botLibrarySearch; + console.log($scope.searchString); + lib.gridOptions=[]; + var param={ + url:'/bots?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + }; + genSevs.promiseGet(param).then(function (result) { + $timeout(function() { + console.log(result); + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); + $scope.isBotLibraryPageLoading = false; + }, function(error) { + $scope.isBotLibraryPageLoading = false; + console.log(error); + $scope.errorMessage = "No Records found"; }); - }, - }); - $scope.setPaginationDefaults = function() { - $scope.paginationParams.sortBy = 'createdOn'; - $scope.paginationParams.sortOrder = 'desc'; - /*if($scope.paginationParams.page !== 1){ - $scope.setFirstPageView();//if current page is not 1, then ui grid will trigger a call when set to 1. - }else{ - $scope.botLibraryGridView(); - }*/ - }; - $scope.setPaginationDefaults(); - $scope.botLibraryGridView = function() { - lib.gridOptions=[]; - var param={ - url:'/bots?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; - genSevs.promiseGet(param).then(function (result) { - $timeout(function() { - console.log(result); - $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; - $scope.botLibGridOptions.data=result.bots; - }, 100); - $scope.isBotLibraryPageLoading = false; - }, function(error) { - $scope.isBotLibraryPageLoading = false; - console.log(error); - $scope.errorMessage = "No Records found"; - }); - }; - $scope.botLibraryGridView(); - $scope.searchBotNameCategory = function() { - $scope.searchString = $scope.botLibrarySearch; - console.log($scope.searchString); - lib.gridOptions=[]; - var param={ - url:'/bots?page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + var gridBottomSpace = 190; + $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; + $scope.launchInstance = function(launch){ + console.log(launch.botLinkedCategory); + /*if(launch.launcType === 'task'){ + genSevs.executeTask(launch); + } else if(launch.launcType === 'bp') { + genSevs.launchBlueprint(launch); + }*/ + if(launch.botLinkedCategory === 'Task'){ + genSevs.executeTask(launch); + } else if(launch.botLinkedCategory === 'Blueprint') { + genSevs.launchBlueprint(launch); + } }; - genSevs.promiseGet(param).then(function (result) { - $timeout(function() { - console.log(result); - $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; - $scope.botLibGridOptions.data=result.bots; - }, 100); - $scope.isBotLibraryPageLoading = false; - }, function(error) { - $scope.isBotLibraryPageLoading = false; - console.log(error); - $scope.errorMessage = "No Records found"; - }); - }; - var gridBottomSpace = 190; - $scope.gridHeight = workzoneUIUtils.makeTabScrollable('botLibraryPage') - gridBottomSpace; - $scope.launchInstance = function(launch){ - console.log(launch.botLinkedCategory); - /*if(launch.launcType === 'task'){ - genSevs.executeTask(launch); - } else if(launch.launcType === 'bp') { - genSevs.launchBlueprint(launch); - }*/ - if(launch.botLinkedCategory === 'Task'){ - genSevs.executeTask(launch); - } else if(launch.botLinkedCategory === 'Blueprint') { - genSevs.launchBlueprint(launch); - } - }; - /*$scope.botLogs = function(bot){ - genSevs.botHistory(bot); - };*/ - $scope.botHistory=function(bot) { - var modalInstance = $modal.open({ - animation: true, - templateUrl: 'src/partials/sections/dashboard/bots/view/botHistory.html', - controller: 'botHistoryCtrl', - backdrop : 'static', - size: 'lg', - keyboard: false, - resolve: { - items: function() { - return bot; + /*$scope.botLogs = function(bot){ + genSevs.botHistory(bot); + };*/ + $scope.botHistory=function(bot) { + var modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/bots/view/botHistory.html', + controller: 'botHistoryCtrl', + backdrop : 'static', + size: 'lg', + keyboard: false, + resolve: { + items: function() { + return bot; + } } - } - }); - modalInstance.result.then(function(selectedItem) { - $scope.selected = selectedItem; - }, function() { - console.log('Modal Dismissed at ' + new Date()); - }); - }; - $scope.botInfo=function(bot) { - var modalInstance = $modal.open({ - animation: true, - templateUrl: 'src/partials/sections/dashboard/bots/view/botInfo.html', - controller: 'botInfoCtrl', - backdrop : 'static', - keyboard: false, - resolve: { - items: function() { - return bot; + }); + modalInstance.result.then(function(selectedItem) { + $scope.selected = selectedItem; + }, function() { + console.log('Modal Dismissed at ' + new Date()); + }); + }; + $scope.botInfo=function(bot) { + var modalInstance = $modal.open({ + animation: true, + templateUrl: 'src/partials/sections/dashboard/bots/view/botInfo.html', + controller: 'botInfoCtrl', + backdrop : 'static', + keyboard: false, + resolve: { + items: function() { + return bot; + } } - } - }); - modalInstance.result.then(function(selectedItem) { - $scope.selected = selectedItem; - }, function() { - console.log('Modal Dismissed at ' + new Date()); - }); - }; - $scope.botSchedule = function(bot) { - $modal.open({ - templateUrl: 'src/partials/sections/dashboard/bots/view/botSchedule.html', - controller: 'botScheduleCtrl', - backdrop: 'static', - keyboard: false, - resolve: { - items: function () { - return bot + }); + modalInstance.result.then(function(selectedItem) { + $scope.selected = selectedItem; + }, function() { + console.log('Modal Dismissed at ' + new Date()); + }); + }; + $scope.botSchedule = function(bot) { + $modal.open({ + templateUrl: 'src/partials/sections/dashboard/bots/view/botSchedule.html', + controller: 'botScheduleCtrl', + backdrop: 'static', + keyboard: false, + resolve: { + items: function () { + return bot + } } - } - }).result.then(function (chefEventDetails) { - $scope.isEventAvailable = true; - $scope.chefJenkScriptTaskObj = chefEventDetails; - var startTimeMinute,startTimeHour,dayOfWeek,selectedDayOfTheMonth,selectedMonth; - startTimeMinute = $scope.chefJenkScriptTaskObj.startTimeMinute; - startTimeHour = $scope.chefJenkScriptTaskObj.startTime; - dayOfWeek = $scope.chefJenkScriptTaskObj.dayOfWeek; - selectedDayOfTheMonth = $scope.chefJenkScriptTaskObj.selectedDayOfTheMonth; - selectedMonth = $scope.chefJenkScriptTaskObj.monthOfYear; - $scope.type = 'edit'; - $scope._isEventSelected = true; - - $scope.repeatPattern = 'Repeat Every -' + $scope.chefJenkScriptTaskObj.repeats; - $scope.cronDetails = { - cronStartOn : $scope.chefJenkScriptTaskObj.cronStart, - cronEndOn : $scope.chefJenkScriptTaskObj.cronEnd, - cronRepeatEvery : $scope.chefJenkScriptTaskObj.repeatBy, - cronFrequency: $scope.chefJenkScriptTaskObj.repeats, - cronTime: typeof startTimeHour !=='undefined'? startTimeHour : new Date().getHours() + ':' + typeof startTimeMinute !=='undefined'? startTimeMinute:new Date().getMinutes(), - cronDays: $scope.chefJenkScriptTaskObj.dayOfWeek, - cronMonth: $scope.chefJenkScriptTaskObj.monthOfYear - } - }, function () { - console.log('Dismiss time is ' + new Date()); - }); - }; - $scope.deleteBot = function(bot) { - var modalOptions = { - closeButtonText: 'Cancel', - actionButtonText: 'Delete', - actionButtonStyle: 'cat-btn-delete', - headerText: 'Delete Bot', - bodyText: 'Are you sure you want to delete this bots?' + }).result.then(function (chefEventDetails) { + $scope.isEventAvailable = true; + $scope.chefJenkScriptTaskObj = chefEventDetails; + var startTimeMinute,startTimeHour,dayOfWeek,selectedDayOfTheMonth,selectedMonth; + startTimeMinute = $scope.chefJenkScriptTaskObj.startTimeMinute; + startTimeHour = $scope.chefJenkScriptTaskObj.startTime; + dayOfWeek = $scope.chefJenkScriptTaskObj.dayOfWeek; + selectedDayOfTheMonth = $scope.chefJenkScriptTaskObj.selectedDayOfTheMonth; + selectedMonth = $scope.chefJenkScriptTaskObj.monthOfYear; + $scope.type = 'edit'; + $scope._isEventSelected = true; + + $scope.repeatPattern = 'Repeat Every -' + $scope.chefJenkScriptTaskObj.repeats; + $scope.cronDetails = { + cronStartOn : $scope.chefJenkScriptTaskObj.cronStart, + cronEndOn : $scope.chefJenkScriptTaskObj.cronEnd, + cronRepeatEvery : $scope.chefJenkScriptTaskObj.repeatBy, + cronFrequency: $scope.chefJenkScriptTaskObj.repeats, + cronTime: typeof startTimeHour !=='undefined'? startTimeHour : new Date().getHours() + ':' + typeof startTimeMinute !=='undefined'? startTimeMinute:new Date().getMinutes(), + cronDays: $scope.chefJenkScriptTaskObj.dayOfWeek, + cronMonth: $scope.chefJenkScriptTaskObj.monthOfYear + } + }, function () { + console.log('Dismiss time is ' + new Date()); + }); }; - confirmbox.showModal({}, modalOptions).then(function() { - var param={ - url:'/bots/' + bot.botId + $scope.deleteBot = function(bot) { + var modalOptions = { + closeButtonText: 'Cancel', + actionButtonText: 'Delete', + actionButtonStyle: 'cat-btn-delete', + headerText: 'Delete Bot', + bodyText: 'Are you sure you want to delete this bots?' }; - genSevs.promiseDelete(param).then(function (response) { - if (response) { - toastr.success('Successfully deleted'); - if($scope.totalBotsSelected) { - $scope.botLibraryGridView(); - } else if($scope.runningBotsselected) { - $scope.showBotsRunning(); - } else if($scope.failedBotsselected) { - $scope.showFailedBots(); - } else { - $scope.botLibraryGridView(); + confirmbox.showModal({}, modalOptions).then(function() { + var param={ + url:'/bots/' + bot.botId + }; + genSevs.promiseDelete(param).then(function (response) { + if (response) { + toastr.success('Successfully deleted'); + if($scope.totalBotsSelected) { + $scope.botLibraryGridView(); + } else if($scope.runningBotsselected) { + $scope.showBotsRunning(); + } else if($scope.failedBotsselected) { + $scope.showFailedBots(); + } else { + $scope.botLibraryGridView(); + } + lib.summary(); } - lib.summary(); - } - }, function(data) { - toastr.error('error:: ' + data.toString()); + }, function(data) { + toastr.error('error:: ' + data.toString()); + }); }); - }); - }; - $rootScope.$on('BOTS_LIBRARY_REFRESH', function() { - lib.summary(); - $scope.botLibraryGridView(); - }); - $scope.RefreshBotsLibrary = function() { - $scope.totalBotsSelected = true; - $scope.runningBotsselected = false; - $scope.failedBotsselected = false; - lib.summary(); - $scope.botLibraryGridView(); - }; - $scope.showBotsRunning = function() { - $scope.runningBotsselected = true; - $scope.totalBotsSelected = false; - $scope.failedBotsselected = false; - lib.gridOptions.data=[]; - var param={ - url:'/bots?actionStatus=running&page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder }; - genSevs.promiseGet(param).then(function (result) { - $timeout(function() { - $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; - $scope.botLibGridOptions.data=result.bots; - }, 100); + $rootScope.$on('BOTS_LIBRARY_REFRESH', function() { + lib.summary(); + $scope.botLibraryGridView(); }); - lib.summary(); - }; - $scope.showFailedBots = function() { - $scope.failedBotsselected = true; - $scope.runningBotsselected = false; - $scope.totalBotsSelected = false; - lib.gridOptions.data=[]; - var param={ - url:'/bots?actionStatus=failed&page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + $scope.RefreshBotsLibrary = function() { + $scope.totalBotsSelected = true; + $scope.runningBotsselected = false; + $scope.failedBotsselected = false; + lib.summary(); + $scope.botLibraryGridView(); }; - genSevs.promiseGet(param).then(function (result) { - $timeout(function() { - $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; - $scope.botLibGridOptions.data=result.bots; - }, 100); - }); - lib.summary(); - }; - lib.summary = function() { - $scope.botSummary=[]; - var param={ - url:'/audit-trail/bots-summary' + $scope.showBotsRunning = function() { + $scope.runningBotsselected = true; + $scope.totalBotsSelected = false; + $scope.failedBotsselected = false; + lib.gridOptions.data=[]; + var param={ + url:'/bots?actionStatus=running&page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + }; + genSevs.promiseGet(param).then(function (result) { + $timeout(function() { + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); + }); + lib.summary(); }; - genSevs.promiseGet(param).then(function (response) { - $scope.botSummary = response; - $scope.totalSavedTimeForBots = parseInt($scope.botSummary.totalSavedTimeForBots); - }); - }; - lib.summary(); - }]).controller('botInfoCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { + $scope.showFailedBots = function() { + $scope.failedBotsselected = true; + $scope.runningBotsselected = false; + $scope.totalBotsSelected = false; + lib.gridOptions.data=[]; + var param={ + url:'/bots?actionStatus=failed&page=1&pageSize=10&sortBy=' + $scope.paginationParams.sortBy +'&sortOrder=' + $scope.paginationParams.sortOrder + }; + genSevs.promiseGet(param).then(function (result) { + $timeout(function() { + $scope.botLibGridOptions.totalItems = result.metaData.totalRecords; + $scope.botLibGridOptions.data=result.bots; + }, 100); + }); + lib.summary(); + }; + lib.summary = function() { + $scope.botSummary=[]; + var param={ + url:'/audit-trail/bots-summary' + }; + genSevs.promiseGet(param).then(function (response) { + $scope.botSummary = response; + $scope.totalSavedTimeForBots = parseInt($scope.botSummary.totalSavedTimeForBots); + }); + }; + lib.summary(); + }]).controller('botInfoCtrl',['$scope', 'items', '$modalInstance', function ($scope, items, $modalInstance) { $scope.botInfo = items; console.log(items); @@ -321,15 +321,15 @@ var newdate = datearray[1] + '/' + datearray[0] + '/' + datearray[2]; $scope.schedulerStartOn = newdate; var newEndOn = parseInt(items.chefJenkScriptTaskObj.cronEndOn); - var newEndData = new Date(newEndOn).toLocaleDateString(); + var newEndData = new Date(newEndOn).toLocaleDateString(); var datearrayNew = newEndData.split("/"); var newdateEnd = datearrayNew[1] + '/' + datearrayNew[0] + '/' + datearrayNew[2]; $scope.schedulerEndOn = newdateEnd; } else { $scope.schedulerStartOn = items.chefJenkScriptTaskObj.cronStart; - $scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd; + $scope.schedulerEndOn = items.chefJenkScriptTaskObj.cronEnd; } - + $scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString(); $scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency; $scope.timeEventType = items.chefJenkScriptTaskObj.startTime; @@ -353,7 +353,7 @@ } else { $scope.validDateRange=false; } - + }; $scope.repeatCount = function(max, step) { @@ -367,30 +367,36 @@ $scope.isDaySelected = { flag:true } - + $scope.daysOfWeek = [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ]; $scope.monthOfYear = [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]; $scope.ok=function(){ $scope.eventParams = { - repeats: $scope.repeatsType, - repeatBy: $scope.repeatBy, - cronStart: $scope.schedulerStartOn, - cronEnd: $scope.schedulerEndOn, - startTime: $scope.timeEventType, - startTimeMinute: $scope.timeEventMinute, - dayOfWeek: $scope.weekOfTheDay, - selectedDayOfTheMonth: $scope.selectedDayOfTheMonth, - monthOfYear: $scope.selectedMonth + cronFrequency: $scope.repeatsType, + cronRepeatEvery: $scope.repeatBy, + cronStartOn: $scope.schedulerStartOn, + cronEndOn: $scope.schedulerEndOn, + cronHour: $scope.timeEventType, + cronMinute: $scope.timeEventMinute, + cronWeekDay: $scope.weekOfTheDay, + cronDate: $scope.selectedDayOfTheMonth, + cronMonth: $scope.selectedMonth }; + var reqBody = { + botScheduler:$scope.eventParams, + isBotScheduled:true + } var param={ url:'/bots/' + $scope.botId + '/scheduler', - reqBody: $scope.eventParams + data: reqBody }; genSevs.promisePut(param).then(function (response) { - $scope.botSummary = response; - $scope.totalSavedTimeForBots = parseInt($scope.botSummary.totalSavedTimeForBots); + if(response){ + toastr.success('BOTs Scheduler successfully updated'); + $modalInstance.dismiss('cancel'); + } }); }; @@ -410,15 +416,15 @@ $scope.initChefGrids = function(){ $scope.taskHistoryChefGridOptions.data='taskHistoryChefData'; $scope.taskHistoryChefGridOptions.columnDefs = [ - { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, - { name:'User',field:'user',cellTooltip: true}, - { name:'Logs',width: 70, - cellTemplate:'
    '}, - { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, - { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + + { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
    '}, + { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + 'NA', cellTooltip: true} ]; }; @@ -443,21 +449,6 @@ $scope.errorMessage = "No Chef History Records found"; $scope.ischefTaskHistoryPageLoading = false; }); - /*workzoneServices.getHistory(items.botId).then(function(response) { - console.log(response); - $timeout(function() { - if(response.data){ - $scope.taskHistoryChefData = response.data; - $scope.ischefTaskHistoryPageLoading = false; - }else if(response){ - $scope.taskHistoryChefData = response; - $scope.ischefTaskHistoryPageLoading = false; - } - },100); - }, function(){ - $scope.errorMessage = "No Chef History Records found"; - $scope.ischefTaskHistoryPageLoading = false; - });*/ }, getExecutionTime: function(endTime, startTime) { $scope.executionTimeinMS = endTime-startTime; @@ -486,15 +477,15 @@ $scope.initJenkinsGrids = function(){ $scope.taskHistoryJenkinsGridOptions.data='taskHistoryJenkinsData'; $scope.taskHistoryJenkinsGridOptions.columnDefs = [ - { name:'Job Number',field:'auditTrailConfig.jenkinsBuildNumber',cellTemplate:'{{row.entity.auditTrailConfig.jenkinsBuildNumber}}', sort:{ direction: 'desc'}, cellTooltip: true}, - { name:'Job Output',cellTemplate:'',cellTooltip: true}, - { name:'Log Info',width: 90,cellTemplate:'',cellTooltip: true}, - { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status.toUpperCase()}}
    '}, - { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}',cellTooltip: true}, - { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}',cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + + { name:'Job Number',field:'auditTrailConfig.jenkinsBuildNumber',cellTemplate:'{{row.entity.auditTrailConfig.jenkinsBuildNumber}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'Job Output',cellTemplate:'',cellTooltip: true}, + { name:'Log Info',width: 90,cellTemplate:'',cellTooltip: true}, + { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status.toUpperCase()}}
    '}, + { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}',cellTooltip: true}, + { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}',cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + 'NA', cellTooltip: true} ]; }; @@ -537,15 +528,15 @@ $scope.initScriptGrids = function(){ $scope.taskHistoryScriptGridOptions.data='taskHistoryScriptData'; $scope.taskHistoryScriptGridOptions.columnDefs = [ - { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, - { name:'User',field:'user',cellTooltip: true}, - { name:'Logs',width: 70, - cellTemplate:'
    '}, - { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, - { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + + { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
    '}, + { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'End Time',field:'endedOn',cellTemplate:'{{row.entity.endedOn | timestampToLocaleTime}}', cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + 'NA', cellTooltip: true} ]; }; @@ -588,15 +579,15 @@ $scope.initBlueprintGrids = function(){ $scope.botHistoryBlueprintGridOptions.data='botHistoryBlueprintData'; $scope.botHistoryBlueprintGridOptions.columnDefs = [ - { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, - { name:'User',field:'user',cellTooltip: true}, - { name:'Logs',width: 70, - cellTemplate:'
    '}, - { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, - { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}', cellTooltip: true}, - { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, - { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, - { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + + { name:'Status',field:'status',cellTemplate:'
    {{row.entity.status}}
    ', cellTooltip: true}, + { name:'User',field:'user',cellTooltip: true}, + { name:'Logs',width: 70, + cellTemplate:'
    '}, + { name:'Start Time',field:'startedOn',cellTemplate:'{{row.entity.startedOn | timestampToLocaleTime}}', sort:{ direction: 'desc'}, cellTooltip: true}, + { name:'End Time',field:'timestampEnded',cellTemplate:'{{row.entity.timestampEnded | timestampToLocaleTime}}', cellTooltip: true}, + { name:'Execution Time',cellTemplate:'{{grid.appScope.getExecutionTime(row.entity.endedOn,row.entity.startedOn)}} mins'}, + { name:'Manual Time',cellTemplate: '{{row.entity.auditTrailConfig.manualExecutionTime}} mins', cellTooltip: true}, + { name:'Saved Time',cellTemplate:'{{grid.appScope.getSavedTime(row.entity.endedOn,row.entity.startedOn)}} mins' + 'NA', cellTooltip: true} ]; }; @@ -675,7 +666,7 @@ items: function() { return { taskId : hist.auditId, - historyId : hist._id, + historyId : hist.auditHistoryId, taskType:hist.auditTrailConfig.executionType }; } 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 e8ce2e69d..892b952dd 100644 --- a/client/cat3/src/partials/sections/dashboard/bots/view/library.html +++ b/client/cat3/src/partials/sections/dashboard/bots/view/library.html @@ -6,8 +6,8 @@ -
    -
    +
    +
    @@ -16,8 +16,8 @@
    - Total Number of BOTs - {{botSummary.totalNoOfBots}} + Total Number of BOTs + {{botSummary.totalNoOfBots}}
    @@ -27,8 +27,8 @@
    - Number of BOTs running - {{botSummary.totalNoOfRunningBots}} + Number of BOTs running + {{botSummary.totalNoOfRunningBots}}
    @@ -38,8 +38,8 @@
    - Total Time saved - {{totalSavedTimeForBots}} mins + Total Time saved + {{totalSavedTimeForBots}} mins
    @@ -49,8 +49,8 @@
    - Number of failed runs - {{botSummary.totalNoOfFailedBots}} + Number of failed runs + {{botSummary.totalNoOfFailedBots}}
    @@ -75,6 +75,6 @@ \ No newline at end of file diff --git a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html index 886049f3c..8987d07e3 100755 --- a/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html +++ b/client/cat3/src/partials/sections/dashboard/design/view/blueprintCreate.html @@ -261,6 +261,7 @@ 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/git-repository-sync/gitRepositorySync.js b/server/app/cronjobs/git-repository-sync/gitRepositorySync.js new file mode 100644 index 000000000..af9089f25 --- /dev/null +++ b/server/app/cronjobs/git-repository-sync/gitRepositorySync.js @@ -0,0 +1,154 @@ + +var logger = require('_pr/logger')(module); +var CatalystCronJob = require('_pr/cronjobs/CatalystCronJob'); +var nodeGit = require('nodegit'); +var promisify = require("promisify-node"); +var fse = promisify(require("fs-extra")); +var path = "/tmp/bot-factory"; +var Promise = require('promise'); + +var gitRepoSync = Object.create(CatalystCronJob); +gitRepoSync.interval = '* * * * *'; +gitRepoSync.execute = gitRepositorySync; + +module.exports = gitRepoSync; + +function gitRepositorySync(){ + + + /*var nodegit = require('nodegit'), + path = require('path'); + + var url = "https://github.com/pazdera/scriptster.git", + local = "./scriptster", + cloneOpts = {}; + + nodegit.Clone(url, local, cloneOpts).then(function (repo) { + console.log("Cloned " + path.basename(url) + " to " + repo.workdir()); + }).catch(function (err) { + console.log(err); + }); + + var cloneOpts = { + fetchOpts: { + callbacks: { + credentials: function(url, userName) { + return nodegit.Cred.sshKeyNew( + userName, + '/Users/radek/.ssh/id_rsa.pub', + '/Users/radek/.ssh/id_rsa', + ""); + } + } + } + };*/ + + var url = "https://github.com/pazdera/scriptster.git", cloneOpts = {},userName ='Durgesh1988'; + + var cloneOpts = { + fetchOpts: { + callbacks: { + credentials: function (url, userName) { + return nodegit.Cred.sshKeyNew( + userName, + '/Users/radek/.ssh/id_rsa.pub', + '/Users/radek/.ssh/id_rsa', + ""); + } + } + } + } + fse.remove(path).then(function() { + var entry; + + nodeGit.Clone( + "https://github.com/RLIndia/botsfactory.git", + path, + cloneOpts) + .then(function(repo) { + console.log("Durgesh"); + console.log(repo); + return repo.getCommit("7d84cc1cf514725702f397119cbe1cc3c3a649a8"); + }) + .then(function(commit) { + return commit.getEntry("README.md"); + }) + .then(function(entryResult) { + entry = entryResult; + return entry.getBlob(); + }) + .done(function(blob) { + console.log(entry.name(), entry.sha(), blob.rawsize() + "b"); + console.log("========================================================\n\n"); + var firstTenLines = blob.toString().split("\n").slice(0, 10).join("\n"); + console.log(firstTenLines); + console.log("..."); + }); + }); + + + + /* nodeGit.Repository.open(path).then(function(repo) { + /!* Get the current branch. *!/ + return repo.getCurrentBranch().then(function(ref) { + console.log("On " + ref.shorthand() + " (" + ref.target() + ")"); + + /!* Get the commit that the branch points at. *!/ + return repo.getBranchCommit(ref.shorthand()); + }).then(function (commit) { + /!* Set up the event emitter and a promise to resolve when it finishes up. *!/ + var hist = commit.history(), + p = new Promise(function(resolve, reject) { + hist.on("end", resolve); + hist.on("error", reject); + }); + hist.start(); + return p; + }).then(function (commits) { + /!* Iterate through the last 10 commits of the history. *!/ + for (var i = 0; i < 10; i++) { + var sha = commits[i].sha().substr(0,7), + msg = commits[i].message().split('\n')[0]; + console.log(sha + " " + msg); + } + }); + }).catch(function (err) { + console.log(err); + }).done(function () { + console.log('Finished'); + });*/ + + /* nodeGit.Repository.open(path).then(function(repo) { + return repo.getCurrentBranch().then(function(ref) { + console.log("On " + ref.shorthand() + " " + ref.target()); + + console.log("Checking out master"); + var checkoutOpts = { + checkoutStrategy: nodeGit.Checkout.STRATEGY.FORCE + }; + console.log(checkoutOpts); + return repo.checkoutBranch("master", checkoutOpts); + }).then(function () { + return repo.getCurrentBranch().then(function(ref) { + console.log("On " + ref.shorthand() + " " + ref.target()); + }); + }); + }).catch(function (err) { + console.log(err); + }).done(function () { + console.log('Finished'); + });*/ + + /*var rr = require("recursive-readdir"); + + rr(path, ["scriptster/.git/!**"], function (err, files) { + for (var i = 0; i < files.length; i++) { + console.log(files[i]); + } + });*/ + +} + + + + diff --git a/server/app/cronjobs/git-repository-sync/package.json b/server/app/cronjobs/git-repository-sync/package.json new file mode 100644 index 000000000..0298e0e19 --- /dev/null +++ b/server/app/cronjobs/git-repository-sync/package.json @@ -0,0 +1,3 @@ +{ + "main":"gitRepositorySync.js" +} \ No newline at end of file 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/lib/utils/apiUtil.js b/server/app/lib/utils/apiUtil.js index 17ef5a022..2c285dbb8 100644 --- a/server/app/lib/utils/apiUtil.js +++ b/server/app/lib/utils/apiUtil.js @@ -75,9 +75,9 @@ var ApiUtil = function() { "cronPattern":scheduler.pattern, "cronStartOn":Date.parse(startOn), "cronEndOn":Date.parse(endOn), - "cronHour":scheduler.cronHour, - "cronMinute":scheduler.cronMinute, - "cronDate":scheduler.cronDate, + "cronHour":scheduler.cronHour ? parseInt(scheduler.cronHour):0, + "cronMinute":scheduler.cronMinute ? parseInt(scheduler.cronMinute):0, + "cronDate":scheduler.cronDate ? parseInt(scheduler.cronDate):0, "cronWeekDay":scheduler.cronWeekDay ? parseInt(scheduler.cronWeekDay):0, "cronMonth":scheduler.cronMonth ? scheduler.cronMonth: null, "cronYear":scheduler.cronYear ? scheduler.cronYear: null diff --git a/server/app/model/audit-trail/base-audit-trail.js b/server/app/model/audit-trail/base-audit-trail.js index f8ef79ee5..53daeb46f 100644 --- a/server/app/model/audit-trail/base-audit-trail.js +++ b/server/app/model/audit-trail/base-audit-trail.js @@ -30,6 +30,11 @@ var AuditTrailSchema = function AuditTrail() { trim:true, required:true }, + auditHistoryId: { + type: String, + trim:true, + required:false + }, masterDetails:{ orgName: { type: String, diff --git a/server/app/model/blueprint/blueprint.js b/server/app/model/blueprint/blueprint.js index c0e9d50df..72bfb2e97 100755 --- a/server/app/model/blueprint/blueprint.js +++ b/server/app/model/blueprint/blueprint.js @@ -496,6 +496,21 @@ BlueprintSchema.statics.createNew = function (blueprintData, callback) { }; +BlueprintSchema.statics.saveCopyBlueprint = function (blueprintData, callback) { + var blueprint = new Blueprints(blueprintData); + blueprint.save(function (err, blueprint) { + if (err) { + logger.error(err); + callback(err, null); + return; + } + logger.debug('save Complete'); + callback(null, blueprint); + }); +}; + + + BlueprintSchema.statics.getBlueprintInfoById = function (id, callback) { logger.debug('finding blueprintInfo by id ===>' + id); @@ -1010,6 +1025,16 @@ BlueprintSchema.statics.getBlueprintsByOrgBgProject = function (jsonData, callba }; +BlueprintSchema.statics.getBlueprintData= function (jsonData, callback) { + this.find(jsonData, function (err, blueprints) { + if (err) { + callback(err, null); + return; + } + callback(null, blueprints); + }); +}; + BlueprintSchema.statics.getAllServiceDeliveryBlueprint = function (serviceDeliveryCheck, callback) { this.find({serviceDeliveryCheck: serviceDeliveryCheck}, function (err, blueprints) { diff --git a/server/app/model/bots/bots.js b/server/app/model/bots/bots.js index e8f72a015..8301ab1de 100644 --- a/server/app/model/bots/bots.js +++ b/server/app/model/bots/bots.js @@ -15,6 +15,7 @@ */ var mongoose = require('mongoose'); +var logger = require('_pr/logger')(module); var ObjectId = require('mongoose').Types.ObjectId; var mongoosePaginate = require('mongoose-paginate'); var Schema = mongoose.Schema; @@ -176,6 +177,10 @@ var BotsSchema = new Schema ({ type: Boolean, default: false }, + version: { + type: Number, + default: 1 + }, }); BotsSchema.plugin(mongoosePaginate); 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_blueprints.js b/server/app/routes/v1.0/routes_blueprints.js index 5f5da4246..7198da90b 100755 --- a/server/app/routes/v1.0/routes_blueprints.js +++ b/server/app/routes/v1.0/routes_blueprints.js @@ -340,21 +340,17 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }); app.post('/blueprints/copy',function(req,res){ - var orgid = req.body.orgid; - var buid = req.body.buid; - var projid = req.body.projid; - var bluepirntIds = req.body.blueprints; - if(!orgid || !buid || !projid || !bluepirntIds){ - logger.error("Could not copy blueprint. Required data missing."); - res.send(500, 'Would require a ORG, BU and Project to copy'); - return; - }else{ - Blueprints.copyByIds(bluepirntIds,orgid,buid,projid,function(err,data){ - res.status('200').send(data); - return; - }); - + var masterDetails = { + orgId:req.body.orgid, + bgId:req.body.buid, + projectId:req.body.projid } + blueprintService.copyBlueprint(req.body.blueprints,masterDetails, function(err, blueprint) { + if(err){ + res.status(err.errCode).send(err.errMessage); + } + res.status(200).send(blueprint); + }); }); //for testing diff --git a/server/app/routes/v1.0/routes_bots.js b/server/app/routes/v1.0/routes_bots.js index 3a0ec1cdb..4c7a108f4 100644 --- a/server/app/routes/v1.0/routes_bots.js +++ b/server/app/routes/v1.0/routes_bots.js @@ -57,9 +57,17 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { }) }); + app.get('/bots/:botId/bots-history/:historyId',function(req,res){ + botsService.getPerticularBotsHistory(req.params.botId,req.params.historyId, function(err,data){ + if (err) { + return res.status(500).send(err); + } else { + return res.status(200).send(data); + } + }) + }); + app.post('/bots/:botId/execute',function(req,res){ - console.log("durgesh"); - console.log(req.body); var reqBody = null; if(req.body.category && req.body.category ==='Blueprints') { if (!req.body.envId) { @@ -127,5 +135,4 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) { } }) }); - }; \ No newline at end of file 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/blueprintService.js b/server/app/services/blueprintService.js index 3a060fddc..88b74aa22 100644 --- a/server/app/services/blueprintService.js +++ b/server/app/services/blueprintService.js @@ -35,7 +35,9 @@ var usersDao = require('_pr/model/users.js'); var auditTrailService = require('_pr/services/auditTrailService'); var bots = require('_pr/model/bots/bots.js'); var botsService = require('_pr/services/botsService.js'); - +var ObjectId = require('mongoose').Types.ObjectId; +var uuid = require('node-uuid'); +var masterUtil = require('_pr/lib/utils/masterUtil.js'); const errorType = 'blueprint'; @@ -93,6 +95,84 @@ blueprintService.deleteServiceDeliveryBlueprint = function deleteServiceDelivery }); }; +blueprintService.copyBlueprint = function copyBlueprint(blueprintId,masterDetails,callback){ + async.waterfall([ + function(next){ + Blueprints.getById(blueprintId,next); + }, + function(blueprint,next){ + if(blueprint && blueprint !== null){ + blueprint.orgId = masterDetails.orgId; + blueprint.bgId = masterDetails.bgId; + blueprint.projectId = masterDetails.projectId; + blueprint.parentId = blueprint._id; + if (blueprint.projectId !== masterDetails.projectId) { + if (blueprint.nexus) { + blueprint.nexus = undefined; + } + if (blueprint.docker) { + blueprint.docker = undefined; + } + } + blueprint._id = new ObjectId(); + masterDetails.name = blueprint.name; + Blueprints.getBlueprintData(masterDetails,function(err,data){ + if(err){ + next({ + errCode:400, + errMessage:'There is no blueprint present corresponding to ' + blueprintId + ' in catalyst' + },null); + }else if(data.length > 0){ + blueprint.name = blueprint.name + '_copy_' + uuid.v4().split('-')[0]; + Blueprints.saveCopyBlueprint(blueprint, next); + }else{ + Blueprints.saveCopyBlueprint(blueprint, next); + } + }) + }else{ + next({ + errCode:400, + errMessage:'There is no blueprint present corresponding to ' + blueprintId + ' in catalyst' + },null); + } + }, + function(blueprints,next){ + if(blueprints){ + if(blueprints.serviceDeliveryCheck === true){ + masterUtil.getParticularProject(masterDetails.projectId, function(err, project) { + if (err) { + logger.error(err); + next(null,blueprints); + } else if (project.length > 0) { + blueprints.orgName = project[0].orgname; + blueprints.bgName = project[0].productgroupname; + blueprints.projectName = project[0].projectname; + botsService.createOrUpdateBots(blueprints, 'Blueprint', blueprints.blueprintType,next); + } else { + logger.debug("Unable to find Project Information from project id:"); + next(null,blueprints); + } + }); + }else{ + next(null,blueprints); + } + }else{ + next({ + errCode:400, + errMessage:'There is no blueprint present corresponding to ' + blueprintId + ' in catalyst' + },null); + } + } + ],function(err,results){ + if(err){ + callback(err,null); + return; + } + callback(null,results); + return; + }) +} + blueprintService.launch = function launch(blueprintId,reqBody, callback) { async.waterfall([ function (next) { @@ -377,79 +457,6 @@ blueprintService.launchBlueprint = function launchBlueprint(blueprint, reqBody, return callback(error, null); } }); - - - - - /*async.waterfall([ - - function(next) { - providerService.getProvider(providerId, next); - }, - function(provider, next) { - switch (networkProfile.type) { - case 'gcp': - var gcpProvider = new gcpProviderModel(provider); - //logger.debug("provider.keyFile: ",JSON.stringify(gcpProvider)); - // Get file from provider decode it and save, after use delete file - // Decode file content with base64 and save. - var base64Decoded = new Buffer(gcpProvider.providerDetails.keyFile, 'base64').toString(); - fs.writeFile('/tmp/' + provider.id + '.json', base64Decoded, next); - var params = { - "projectId": gcpProvider.providerDetails.projectId, - "keyFilename": '/tmp/' + provider.id + '.json' - } - var gcp = new GCP(params); - var launchParams = { - "blueprints": blueprint, - "networkConfig": networkProfile, - "providers": gcpProvider - } - gcp.createVM(launchParams, next); - break; - defaut: break; - } - }, - function(instance, next) { - logger.debug("=============== ", JSON.stringify(instance)); - if (!instance) { - var error = new Error("instance creation failed."); - error.status = 500; - return callback(error, null); - } - var gcpProvider = new gcpProviderModel(instance.provider); - var instanceObj = { - "blueprint": blueprint, - "instance": instance, - "provider": gcpProvider, - "envId": reqBody.envId - } - logger.debug("instanceService: ", JSON.stringify(instanceObj)); - instanceService.createInstance(instanceObj, next); - }, - function(instanceData, next) { - var timestampStarted = new Date().getTime(); - var actionLog = instancesModel.insertBootstrapActionLog(instanceData.id, instanceData.runlist, instanceData.sessionUser, timestampStarted); - var logsReferenceIds = [instanceData.id, actionLog._id]; - logsDao.insertLog({ - referenceId: logsReferenceIds, - err: false, - log: "Starting instance", - timestamp: timestampStarted - }); - instanceService.bootstrapInstance(instanceData, next); - } -], function(err, results) { - if (err) { - logger.error("GCP Blueprint launch failed: " + err); - callback(err); - } else { - // Delete all files after use. - fs.unlink('/tmp/' + provider.id + '.json'); - callback(null, results); - } -}) -*/ } else { var err = new Error("NetworkProfile not configured in Blueprint."); err.status = 404; diff --git a/server/app/services/botsService.js b/server/app/services/botsService.js index 34f850788..6491532f2 100644 --- a/server/app/services/botsService.js +++ b/server/app/services/botsService.js @@ -23,8 +23,6 @@ var taskService = require('_pr/services/taskService.js'); var auditTrailService = require('_pr/services/auditTrailService.js'); var blueprintService = require('_pr/services/blueprintService.js'); var auditTrail = require('_pr/model/audit-trail/audit-trail.js'); -var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); -var cronTab = require('node-crontab'); const errorType = 'botsService'; @@ -101,10 +99,12 @@ botsService.updateBotsScheduler = function updateBotsScheduler(botId,botObj,call bots.getBotsById(botId, function (err, botsData) { if (err) { logger.error(err); - } else if(botData.length > 0){ + } else if(botsData.length > 0){ if (botsData[0].isBotScheduled === true) { + var catalystSync = require('_pr/cronjobs/catalyst-scheduler/catalystScheduler.js'); catalystSync.executeScheduledBots(); } else if (botsData[0].cronJobId && botsData[0].cronJobId !== null) { + var cronTab = require('node-crontab'); cronTab.cancelJob(botsData[0].cronJobId); } else { logger.debug("There is no cron job associated with Bot "); @@ -242,6 +242,35 @@ botsService.getBotsHistory = function getBotsHistory(botId,callback){ }); } +botsService.getPerticularBotsHistory = function getPerticularBotsHistory(botId,historyId,callback){ + async.waterfall([ + function(next){ + bots.getBotsById(botId,next); + }, + function(bots,next){ + if(bots.length > 0){ + var query={ + auditType:'BOTs', + auditId:botId, + auditHistoryId:historyId + }; + auditTrail.getAuditTrails(query,next); + }else{ + next({errCode:400, errMsg:"Bots is not exist in DB"},null) + } + } + ],function(err,results){ + if(err){ + logger.error(err); + callback(err,null); + return; + }else{ + callback(null,results); + return; + } + }); +} + botsService.executeBots = function executeBots(botId,reqBody,callback){ async.waterfall([ function(next){ @@ -250,7 +279,9 @@ botsService.executeBots = function executeBots(botId,reqBody,callback){ function(bots,next){ if(bots.length > 0){ if(bots[0].botLinkedCategory === 'Task'){ - taskService.executeTask(botId,reqBody.userName,reqBody.hostProtocol,reqBody.choiceParam,reqBody.appData,reqBody.paramOptions,reqBody.tagServer, callback); + taskService.executeTask(botId,reqBody.userName ? reqBody.userName : 'system',reqBody.hostProtocol ? reqBody.hostProtocol : '', + reqBody.choiceParam ? reqBody.choiceParam : '',reqBody.appData ? reqBody.appData : '',reqBody.paramOptions ? reqBody.paramOptions : '', + reqBody.tagServer ? reqBody.tagServer : '', callback); }else{ blueprintService.launch(botId,reqBody,callback) } 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 diff --git a/server/app/services/schedulerService.js b/server/app/services/schedulerService.js index 58b8fe4ad..8f7d1df35 100644 --- a/server/app/services/schedulerService.js +++ b/server/app/services/schedulerService.js @@ -46,7 +46,7 @@ var botsDao = require('_pr/model/bots/bots.js'); schedulerService.executeSchedulerForInstances = function executeSchedulerForInstances(instance,callback) { logger.debug("Instance Scheduler is started for Instance. "+instance.platformId); logger.debug("Instance current state is "+instance.instanceState); - var catUser = 'superadmin'; + var catUser = 'system'; if(instance.catUser){ catUser = instance.catUser; } @@ -122,7 +122,7 @@ schedulerService.executeParallelScheduledTasks = function executeParallelSchedul logger.error("Error in updating cron job Ids. "+err); } }) - taskService.executeTask(task._id, "superadmin", "", "", "","","",function(err, historyData) { + taskService.executeTask(task._id, "system", "", "", "","","",function(err, historyData) { if (err === 404) { logger.error("Task not found.", err); return; @@ -142,7 +142,7 @@ schedulerService.executeScheduledBots = function executeScheduledBots(bots,callb var currentDate = new Date(); if(currentDate >= bots.botScheduler.cronEndOn){ crontab.cancelJob(bots.cronJobId); - botsDao.updateBotScheduler(bots._id,function(err, updatedData) { + botsDao.updateBotsScheduler(bots._id,function(err, updatedData) { if (err) { logger.error("Failed to update Bots Scheduler: ", err); callback(err,null); @@ -159,7 +159,7 @@ schedulerService.executeScheduledBots = function executeScheduledBots(bots,callb logger.error("Error in updating cron job Ids. "+err); } }) - botsService.executeBots(bots._id,bots.botsConfig,function(err, historyData) { + botsService.executeBots(bots.botId,bots.botConfig,function(err, historyData) { if (err) { logger.error("Failed to execute Bots.", err); return; @@ -193,7 +193,7 @@ schedulerService.executeSerialScheduledTasks = function executeSerialScheduledTa logger.error("Error in updating cron job Ids. "+err); } }) - taskService.executeTask(task._id, "superadmin", "", "", "","","",function(err, historyData) { + taskService.executeTask(task._id, "system", "", "", "","","",function(err, historyData) { if (err === 404) { logger.error("Task not found.", err); callback(err,null); diff --git a/server/app/services/taskService.js b/server/app/services/taskService.js index 18ce38ea9..795c6f5ee 100644 --- a/server/app/services/taskService.js +++ b/server/app/services/taskService.js @@ -222,6 +222,11 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic if (historyData) { taskRes.historyId = historyData.id; } + auditTrailService.updateAuditTrail('BOTs',auditTrailId,{auditHistoryId:historyData.id},function(err,auditTrail){ + if (err) { + logger.error("Failed to create or update bots Log: ", err); + } + }); callback(null, taskRes); return; });